From mark at klomp.org  Sun Jun  1 08:57:59 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 01 Jun 2008 17:57:59 +0200
Subject: changeset in /hg/icedtea: Merge with IcedTea tip.
In-Reply-To: <hg.7975ee6908a5.1212159189.-6899778133799504387@icedtea.classpath.org>
References: <hg.7975ee6908a5.1212159189.-6899778133799504387@icedtea.classpath.org>
Message-ID: <1212335879.3133.13.camel@dijkstra.wildebeest.org>

Hi Andrew,

On Fri, 2008-05-30 at 14:53 +0000, gnu_andrew at member.fsf.org wrote:
> changeset 7975ee6908a5 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7975ee6908a5
> description:
> 	Merge with IcedTea tip.

Sometimes these merges are confusing. I thought I had already merged
this in this changeset:
http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9fff1dcf5a3
Which strangely is also one of the parents of your changeset.

> diff -r df0892463d09 -r 7975ee6908a5 patches/icedtea-ecj.patch
> --- a/patches/icedtea-ecj.patch	Fri May 30 15:50:34 2008 +0100
> +++ b/patches/icedtea-ecj.patch	Fri May 30 15:52:51 2008 +0100
> @@ -661,15 +661,14 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
>  @@ -649,10 +649,11 @@
>   $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
>   	$(prep-target)
> - 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
>  -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
>  +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)

This part is wrong. That SED line should not be removed. It corrupts the
patch file so that it cannot be applied anymore. The following patch
reinstates it:

2008-06-01  Mark Wielaard  <mark at klomp.org>

    * patches/icedtea-ecj.patch: Correct patch by reinstating
    accidentally removed line.

Cheers,

Mark

diff -r f1c821e52996 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Fri May 30 11:09:57 2008 -0400
+++ b/patches/icedtea-ecj.patch Sun Jun 01 17:56:34 2008 +0200
@@ -661,6 +661,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
 @@ -649,10 +649,11 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
        $(prep-target)
+       $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
 +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
        $(prep-target)




From mark at klomp.org  Sun Jun  1 08:58:40 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 01 Jun 2008 15:58:40 +0000
Subject: changeset in /hg/icedtea: Put accidentially removed line back in...
Message-ID: <hg.6a6228a27e7f.1212335920.-6899778133799504387@icedtea.classpath.org>

changeset 6a6228a27e7f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6a6228a27e7f
description:
	Put accidentially removed line back in patches/icedtea-ecj.patch.

	2008-06-01  Mark Wielaard  <mark at klomp.org>

	       * patches/icedtea-ecj.patch: Correct patch by reinstating
	       accidentally removed line.

diffstat:

2 files changed, 6 insertions(+)
ChangeLog                 |    5 +++++
patches/icedtea-ecj.patch |    1 +

diffs (23 lines):

diff -r f1c821e52996 -r 6a6228a27e7f ChangeLog
--- a/ChangeLog	Fri May 30 11:09:57 2008 -0400
+++ b/ChangeLog	Sun Jun 01 17:57:21 2008 +0200
@@ -1,3 +1,8 @@ 2008-05-30  Lillian Angel  <langel at redha
+2008-06-01  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-ecj.patch: Correct patch by reinstating
+	accidentally removed line.
+
 2008-05-30  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Fixed dist to not include full path to ports, and
diff -r f1c821e52996 -r 6a6228a27e7f patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Fri May 30 11:09:57 2008 -0400
+++ b/patches/icedtea-ecj.patch	Sun Jun 01 17:57:21 2008 +0200
@@ -661,6 +661,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm
 @@ -649,10 +649,11 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
+ 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
 +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
  	$(prep-target)


From gnu_andrew at member.fsf.org  Sun Jun  1 09:45:35 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 1 Jun 2008 17:45:35 +0100
Subject: [patch] Use jar `cat file-list` not gjar -@ stdin extension
In-Reply-To: <1212180666.619.61.camel@dijkstra.wildebeest.org>
References: <1212156783.619.47.camel@dijkstra.wildebeest.org>
	<1ccfd1c10805301139l1e27119cvfb19a0a322bd205c@mail.gmail.com>
	<1212180666.619.61.camel@dijkstra.wildebeest.org>
Message-ID: <17c6771e0806010945h3fa73aa5kb394a631302f0b53@mail.gmail.com>

On 30/05/2008, Mark Wielaard <mark at klomp.org> wrote:
> Hi Martin,
>
>
>  On Fri, 2008-05-30 at 11:39 -0700, Martin Buchholz wrote:
>  > On Fri, May 30, 2008 at 7:13 AM, Mark Wielaard <mark at klomp.org> wrote:
>  > > There was some concern that the command line would have some limit that
>  > > might overflow. But this doesn't seem an issue on modern GNU/Linux (or
>  > > OpenSolaris) systems.
>  >
>  > I share that concern.  Although very recent Linux
>  > kernels might have no command line length limit,
>  > today essentially every OS has such a limit,
>  > and I consider it a bug to depend on its magnitude.
>
>
> Yeah, I agree it isn't the most beautiful thing to do. But there doesn't
>  seem to be another way given that the different jar utility
>  implementations being used for bootstrapping icedtea don't all currently
>  support the same set of options.
>
>  I see I forgot to add the link to the patch that should go into gjar to
>  support the @file arguments like the openjdk jar implementation does:
>  http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.3/debian/patches/libjava-jar.dpatch?view=markup
>
>  When that goes in and we can kind of rely on systems shipping it by
>  default we could reverse this and depend on @file everywhere I hope.
>
>  Cheers,
>
>
>  Mark
>
>

I think there's a better way of patching this bug than implementing
parsing the @file from scratch as the linked patch does.  I'd rather
we reused the existing stdin support by generalising it to read from a
list of files in addition to stdin.

I'll look into rolling a patch for this.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From mark at klomp.org  Sun Jun  1 15:37:05 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 02 Jun 2008 00:37:05 +0200
Subject: OpenJDK 6 b10 source posted
In-Reply-To: <4840AC46.8030409@sun.com>
References: <4840AC46.8030409@sun.com>
Message-ID: <1212359825.3133.84.camel@dijkstra.wildebeest.org>

Hi Joe,

On Fri, 2008-05-30 at 18:39 -0700, Joseph D. Darcy wrote:
> The OpenJDK 6 b10 source is now available at
> 
> http://download.java.net/openjdk/jdk6/

Thanks for releasing this. I have updated icedtea6 to include it.

Are you planning to support a mercurial repo for openjdk6? Although your
release notes below helped a lot, it is still hard work to review all
the changes for integration if all you got is just the diff between two
full versions.

For those interested I posted the b09-b10 diff here:
http://icedtea.classpath.org/~mjw/b09-b10.diff.gz
(Excluding the new/deleted (gervill) files)

Posting individual changes and/or having a public repo might also help
understanding smaller things that you don't explicitly mention in your
release notes like the changes to java.c, MetaData.java or
ChunkedInputStream/test.txt (also removed from the diff since it is
essentially a binary blob).

> A few fixes in the 2D area:
> 
> 6604044: java crashes talking to second X screen
> 6636469: Java Fullscreen Exclusive Mode not working with Xorg server
> 1.3.0 and above

Removed icedtea-xinerama.patch from icedtea6 which did the same thing.

> 6523403: OSS CMM: Need to provide lcms library with PYCC and
> LINEAR_RGB OS ICC profiles
> 
> The last fix was contributed by Andrew Haley and Keith Seitz of Red Hat
> and fixes color management related regression and JCK failures.

Thanks, I removed the icedtea-color-profiles.patch and the overlay.

> The encumbered sound engine has been replaced with Gervill:
> 
> 6702956 OpenJDK: replace encumbered code (software synthesizer)

Very nice. We had good experience with this code in IcedTea.

It wasn't clear precisely which upstream version of Gervill you are
including. It does look like you are missing some fixes Karl and I made
since it got integrated into icedtea. For example you miss the sample
rate conversion support. But it is somewhat hard to see because all the
files got completely reformatted from the upstream sources.

You should be able to find all the changes we made on the mailinglist
(sound-dev, distro-pkg-dev and audio-engine-dev) and of course in
Gervill CVS https://gervill.dev.java.net/source/browse/gervill/ (or
icedtea6 mercurial under overlays).

Could you make the changes you made to the upstream sources available
separate from the changes you made to the indention of the sources for
easy comparison?

For now I kept the current upstream/icedtea version.

> Some progress has been made on addressing the copyright/licensing
> concerns raised by Debian
> (http://mail.openjdk.java.net/pipermail/jdk6-dev/2008-April/000044.html):
> 
> 6695553: Cleanup GPLv2+SPL legal notices in hat sources
> 6703931 Remove jaxws doc-files from the jdk
> 
> Work will continue in this area until all the issues are addressed.

Very nice. I removed the patches/icedtea-hat-spl-gpl.patch.
And this also closes:
- http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142

And I saw soundbank.gm was also removed, which closes:
- http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149

The general tracking bug for hopefully all these issues is:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138

> Mark Wielaard recently proposed publishing regression test results for
> OpenJDK 6
> (http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/001921.html). 
> 
> 
> I'll publish results for b10 later.

That would be cool.

I am also happy to note that Lillian and Tom added jtregcheck to the
Fedora rpm builds in addition to running the Mauve tests. The test
results output (just the jtreg -v1 output for now, not yet the full
JTreport and JTwork output) are then included in the src subpackage rpm
and in the build logs.

Which is great because it also allows us to easily monitor the (zero)
ports that Fedora ships like ppc and ppc64. For an example see:
http://koji.fedoraproject.org/koji/buildinfo?buildID=51083
Click on the build logs (build.log) and search for "JTREG TESTING".
The results still have a bit too many failures because it doesn't
currently provide a Xvfb wrapper like it does for Mauve. But that is in
the works.

Cheers,

Mark


2008-06-01  Mark Wielaard  <mark at klomp.org>

  * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
  (OPENJDK_MD5SUM): Updated.
  (OPENJDK_VERSION): Updated to b10.
  (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between 
  version and date in b10.
  (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
  icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
  * Makefile.in: Regenerated.
  * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
  references in b10.
  * patches/icedtea-gervill.patch: Adjusted to new sound service 
  files in b10.
  * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
  * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
  * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
  * patches/icedtea-color-profiles.patch: Removed.
  * patches/icedtea-hat-spl-gpl.patch: Removed.
  * patches/icedtea-xinerama.patch: Removed.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea6-b10.patch
Type: text/x-patch
Size: 7653 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080602/8b225606/icedtea6-b10.patch 

From mark at klomp.org  Sun Jun  1 15:44:02 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 01 Jun 2008 22:44:02 +0000
Subject: changeset in /hg/icedtea6: Integrate b10.
Message-ID: <hg.37c853f39fe3.1212360242.2873452341184383832@icedtea.classpath.org>

changeset 37c853f39fe3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=37c853f39fe3
description:
	Integrate b10.

	2008-06-01  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
	       (OPENJDK_MD5SUM): Updated.
	       (OPENJDK_VERSION): Updated to b10.
	       (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
	       version and date in b10.
	       (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
	       icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
	       * Makefile.in: Regenerated.
	       * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
	       references in b10.
	       * patches/icedtea-gervill.patch: Adjusted to new sound service
	       files in b10.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
	       * patches/icedtea-color-profiles.patch: Removed.
	       * patches/icedtea-hat-spl-gpl.patch: Removed.
	       * patches/icedtea-xinerama.patch: Removed.

diffstat:

8 files changed, 49 insertions(+), 2311 deletions(-)
ChangeLog                            |   21 
Makefile.am                          |   11 
Makefile.in                          |   13 
patches/icedtea-color-profiles.patch |   29 
patches/icedtea-copy-plugs.patch     |   41 
patches/icedtea-gervill.patch        |   28 
patches/icedtea-hat-spl-gpl.patch    | 2133 ----------------------------------
patches/icedtea-xinerama.patch       |   84 -

diffs (truncated from 2509 to 500 lines):

diff -r cebc828cf765 -r 37c853f39fe3 ChangeLog
--- a/ChangeLog	Fri May 30 15:39:55 2008 +0200
+++ b/ChangeLog	Mon Jun 02 00:35:24 2008 +0200
@@ -1,3 +1,24 @@ 2008-05-30  Mark Wielaard  <mark at klomp.o
+2008-06-01  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
+	(OPENJDK_MD5SUM): Updated.
+	(OPENJDK_VERSION): Updated to b10.
+	(OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
+	version and date in b10.
+	(ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
+	icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Adjusted to remove sound
+	references in b10.
+	* patches/icedtea-gervill.patch: Adjusted to new sound service
+	files in b10.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
+	* patches/icedtea-color-profiles.patch: Removed.
+	* patches/icedtea-hat-spl-gpl.patch: Removed.
+	* patches/icedtea-xinerama.patch: Removed.
+
 2008-05-30  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.am
--- a/Makefile.am	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.am	Mon Jun 02 00:35:24 2008 +0200
@@ -1,6 +1,6 @@ OPENJDK_DATE = 11_apr_2008
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -200,7 +200,7 @@ if USE_ALT_OPENJDK_SRC_ZIP
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 else
-  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 endif
 
 stamps/download.stamp:
@@ -303,16 +303,13 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.in
--- a/Makefile.in	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.in	Mon Jun 02 00:35:24 2008 +0200
@@ -249,9 +249,9 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -360,7 +360,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 
 # Download OpenJDK sources.
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -409,14 +409,13 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-color-profiles.patch
--- a/patches/icedtea-color-profiles.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Changeset: 804b0757d801
-# Author:    prr
-# Date:      2008-04-24 11:58 -0700
-# URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801
-# 
-# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
-# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix.
-# Reviewed-by: jgodinez, avu, prr
-# Contributed-by: aph at redhat.com
-#
-# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/
-
---- openjdk/jdk/make/sun/cmm/Makefile.orig	2008-04-27 23:59:37.000000000 +0200
-+++ openjdk/jdk/make/sun/cmm/Makefile	2008-04-27 23:59:45.000000000 +0200
-@@ -41,12 +41,8 @@
- ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
- 
- iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
--	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
--
--ifndef OPENJDK
--iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
--	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
--endif
-+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
- 
- $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-copy-plugs.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -33,9 +33,9 @@ diff -urN openjdk.orig/jdk/src/share/cla
  
                  Type[] paramTypes = constr.getGenericParameterTypes();
                  if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
-@@ -51,28 +51,19 @@
+--- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig	2008-05-30 09:50:36.000000000 +0200
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-01 23:18:11.000000000 +0200
+@@ -49,33 +49,30 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -64,10 +64,6 @@ diff -urN openjdk.orig/jdk/src/share/cla
 -com/sun/jmx/snmp/daemon/WaitQ.class
 +com/sun/jmx/snmp/daemon/SnmpSession.class
  
- PLUG_SOUND_CLASS_NAMES = \
- com/sun/media/sound/AbstractPlayer.class \
-@@ -128,8 +119,14 @@
- 
  # Class list temp files (used by both import and export of plugs)
  
 +PLUG_GNU_CLASS_NAMES = gnu
@@ -77,14 +73,14 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +PLUG_NETX_CLASS_NAMES = net
 +
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound
-+PLUG_CLASS_AREAS = jmf sound gnu javax netx
+-PLUG_CLASS_AREAS = jmf
++PLUG_CLASS_AREAS = jmf gnu javax netx
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -152,6 +149,21 @@
- 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
- 	  $(ECHO) "$$i" >> $@ ; \
+@@ -93,11 +90,32 @@
+ 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
+ 	  $(ECHO) "$$i" >> $@; \
  	done
 +$(PLUG_TEMPDIR)/gnu.clist:
 +	@$(prep-target)
@@ -104,9 +100,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
-@@ -159,6 +171,12 @@
- 	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
@@ -117,7 +111,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -188,9 +206,9 @@
+@@ -125,9 +143,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -129,10 +123,10 @@ diff -urN openjdk.orig/jdk/src/share/cla
  endef # import-binary-plug-classes
  
  else # IMPORT_BINARY_PLUGS
-@@ -220,12 +238,21 @@
+@@ -153,11 +171,20 @@
+ 
+ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
- import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
 +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
@@ -143,12 +137,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
  # Import all classes from the jar file
  
  import-binary-plug-jar: \
- 	     import-binary-plug-jmf-classes \
--	     import-binary-plug-sound-classes
-+	     import-binary-plug-sound-classes \
+-	     import-binary-plug-jmf-classes
++	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes \
 +	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes \
++	     import-binary-plug-netx-classes
  
- # Import native libraries
+ # Binary plug start/complete messages
  
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-gervill.patch
--- a/patches/icedtea-gervill.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-gervill.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -1,33 +1,7 @@
 # Adds the provides defined by gervill (and removes non-existing ones).
 # Gervill can be found in the overlays under
 # openjdk/jdk/src/share/classes/com/sun/media/sound
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.orig	2008-04-30 16:12:37.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider	2008-04-30 16:06:18.000000000 +0200
-@@ -1,5 +1,5 @@
- # Providers for midi devices
--com.sun.media.sound.MixerSynthProvider
- com.sun.media.sound.RealTimeSequencerProvider
- com.sun.media.sound.MidiOutDeviceProvider
- com.sun.media.sound.MidiInDeviceProvider
-+com.sun.media.sound.SoftProvider
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.orig	2008-04-30 16:13:18.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader	2008-04-30 16:07:16.000000000 +0200
-@@ -1,2 +1,6 @@
- # Providers for Soundbanks
--com.sun.media.sound.HsbParser
-+com.sun.media.sound.PATSoundbankReader
-+com.sun.media.sound.DLSSoundbankReader
-+com.sun.media.sound.JARSoundbankReader
-+com.sun.media.sound.AudioFileSoundbankReader
-+com.sun.media.sound.SF2SoundbankReader
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.orig	2008-04-30 16:13:58.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader	2008-04-30 16:01:27.000000000 +0200
-@@ -2,3 +2,5 @@
- com.sun.media.sound.AuFileReader
- com.sun.media.sound.AiffFileReader
- com.sun.media.sound.WaveFileReader
-+com.sun.media.sound.WaveFloatFileReader
-+com.sun.media.sound.SoftMidiAudioFileReader
+# (This currently overrides the one from b10 because we track Gervill CVS)
 --- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
 @@ -2,3 +2,4 @@
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-hat-spl-gpl.patch
--- a/patches/icedtea-hat-spl-gpl.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2133 +0,0 @@
-Changeset: d70a63c92b49
-Author:    ohair
-Date:      2008-04-30 17:34 -0700
-URL:       http://hg.openjdk.java.net/jdk7/build/jdk/rev/d70a63c92b49
-
-6695553: Cleanup GPLv2+SPL legal notices in hat sources
-Summary: Just correcting the legal notices on the HAT sources.
-Reviewed-by: alanb
-
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -23,18 +23,10 @@
-  * have any questions.
-  */
- 
--
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Wed Apr 30 17:34:41 2008 -0700
-@@ -27,19 +27,9 @@
- 
- <!-- 
- 
-- The contents of this file are subject to the Sun Public License
-- Version 1.0 (the "License"); you may not use this file except in
-- compliance with the License. A copy of the License is available at
-- http://www.sun.com/, and in the file LICENSE.html in the
-- doc directory.
-- 
-  The Original Code is HAT. The Initial Developer of the
-  Original Code is Bill Foote, with contributions from others
-- at JavaSoft/Sun. Portions created by Bill Foote and others
-- at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- 
-- In addition to the formal license, I ask that you don't
-- change the history or donations files without permission.
-+ at JavaSoft/Sun.
- 
- -->
- 
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@


From bugzilla-daemon at icedtea.classpath.org  Sun Jun  1 15:59:19 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 01 Jun 2008 22:59:19 +0000
Subject: [Bug 142] corrupt and/or files which cannot be built from the source
	files
Message-ID: <E1K2wWF-0005h7-UN@icedtea.classpath.org>

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


mark at klomp.org changed:

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




------- Comment #2 from mark at klomp.org  2008-06-01 22:59 -------
These got removed in b10 which was integrated into icedtea6 (rev 37c853f39fe3)


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


From bugzilla-daemon at icedtea.classpath.org  Sun Jun  1 15:59:20 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 01 Jun 2008 22:59:20 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1K2wWG-0005hM-Rw@icedtea.classpath.org>

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


Bug 138 depends on bug 142, which changed state.

Bug 142 Summary: corrupt and/or files which cannot be built from the source files
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |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 Jun  1 15:59:54 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 01 Jun 2008 22:59:54 +0000
Subject: [Bug 149] soundbank.gm binary file included in sources
Message-ID: <E1K2wWo-0005hk-Rw@icedtea.classpath.org>

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


mark at klomp.org changed:

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




------- Comment #2 from mark at klomp.org  2008-06-01 22:59 -------
This file got removed from b10 which was integrated into icedtea6 (rev
37c853f39fe3).


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


From bugzilla-daemon at icedtea.classpath.org  Sun Jun  1 15:59:55 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 01 Jun 2008 22:59:55 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1K2wWp-0005ht-9F@icedtea.classpath.org>

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


Bug 138 depends on bug 149, which changed state.

Bug 149 Summary: soundbank.gm binary file included in sources
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |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 gnu_andrew at member.fsf.org  Sun Jun  1 20:11:46 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 2 Jun 2008 04:11:46 +0100
Subject: FYI: Final changes to IcedTea(7) prior to release
Message-ID: <20080602031146.GA7662@rivendell.middle-earth.co.uk>

This patch bumps the version number and corrects a
few issues I found running make dist and make distcheck for the
release, namely:

	* The existence of both a ports target and a ports
  	  directory causes the OpenJDK to be downloaded.
	  I've renamed the ports target to hotspot-ports,
	  which seems the least intrusive fix.
	* icedtea-ecj.patch should be referred to as
	  $(srcdir)/icedtea-ecj.patch for out-of-dir builds
	  (which includes make distcheck).  Lillian reverted
	  this with her last patch, because abs_top_srcdir
	  doesn't work with dist.  srcdir thankfully still
	  works with dist and allows out-of-dir builds to
	  complete (srcdir being stripped by the distdir target).

Release announcement and tarball to appear shortly... :)

ChangeLog:

2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Fix location of icedtea-ecj.patch for out-of-dir
	and make distcheck builds, and rename ports target to
	hotspot-ports to stop make dist downloading the JDK.
	* Makefile.in: Regenerated.
	* NEWS: Add release news.
	* configure: Regenerated.
	* configure.ac: Bump version number to 1.7.
 
-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 6a6228a27e7f Makefile.am
--- a/Makefile.am	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.am	Mon Jun 02 04:04:19 2008 +0100
@@ -455,7 +455,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -1056,9 +1056,9 @@ tools: stamps/tools.stamp
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
+hotspot-ports: stamps/ports.stamp
 
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 
diff -r 6a6228a27e7f Makefile.in
--- a/Makefile.in	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.in	Mon Jun 02 04:04:19 2008 +0100
@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	$(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -1496,9 +1496,9 @@ tools: stamps/tools.stamp
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
+hotspot-ports: stamps/ports.stamp
 
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 
diff -r 6a6228a27e7f NEWS
--- a/NEWS	Sun Jun 01 17:57:21 2008 +0200
+++ b/NEWS	Mon Jun 02 04:04:19 2008 +0100
@@ -1,36 +1,98 @@ New in release 1.2 (2008-05-28)
-New in release 1.2 (2008-05-28)
+New in release 1.7 (2008-06-02)
 
-- Updated to b09 build.
-- Added the the lcms library with PYCC and LINEAR_RGB ICC
-  profiles.
-- Integrated Gervill to provide midi support.
-- JTreg integrated.
-- javaws/NetX fixes:
-  -improved security, namely catching Socket permissions during    
-  runtime
-  -implemented the remaining JNLP services api (PrintService, 
-  JNLPRandomAccessFile)
-  -applet focusing bug fixed
-- sparc/sparc64 port
-- Desktop file integration.
-- Various zero fixes.
-- Sound fixes.
-- Font fixes.
-- Several other bug fixes.
+  IcedTea is based on the hard work of a lot of people that contributed to
+  IcedTea6 and OpenJDK. The following noteworthy changes were added in
+  this release:
 
-New in release 1.1 (2008-04-04)
+  - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias
+   Klose integrated it into IcedTea.
+  - Keith Seiths and Andrew Haley made fixes to the awt color package so
+   that it now provides the lcms library with PYCC and LINEAR_RGB ICC
+   profiles, fixing several applications that did complex color
+   transformations.
+  - Karl Helgason wrote a midi software synthesizer called Gervill that
+   is now integrated in IcedTea so that javax.sound.midi support works
+   now. Mark Wielaard integrated it and made some fixes so that it works
+   better with javax.sound.sampled.
+  - Jonathan Gibbons released a free version of jtreg, which was imported
+   into IcedTea by Mark Wielaard so that a make check now runs all the
+   functional unit tests integrated into OpenJDK.
+  - Joshua Sumali made lots of fixes to the javaws/netx support. Including
+   improved security, namely catching Socket permissions during runtime,
+   implementing the remaining JNLP services api (PrintService and
+   JNLPRandomAccessFile), and applet focusing bug fixes, so now netx
+   plays nice with gcjwebplugin.
+  - Kelly O'Hair resolved the license issues with the (j)hat tool which is
+   now integrated.
+  - Lillian Angel and Tom Fitzsimmons added several .desktop files for
+   the various tools included for better GNU/Linux desktop integration.
+  - Thomas Fitzsimmons rewrote the cacert support to resolve issues with
+   applications like Glashfish and Eclipse which access the keystore
+   directly.
+  - Lillian Angel made lots of bug fixes to the packaging and integration
+   support, include improving the font support.
+  - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks
+   to Andrew John Hughes.
+  - Andrew also did all the work to make sure IcedTea[7] is now based on
+   OpenJDK7 b26 as released by Xiomara Jayasena.
+  - Thomas Fitzsimmons rewrote the certificate keystore support.
+  - Christian Thalinger made various cacao integration fixes.
 
-- Zero builds on any architecture.
-- New features added to NetX:
-   - Certificate fingerprints now show as part 
-     of certificate details.
-   - gcjwebplugin can now run applets through NetX, 
-     taking advantage of NetX's sandboxing and application security.
-   - User trusted certificates can be managed by passing the -viewer 
-     option to NetX. 
-- Updated to b08.
+New in release 1.6 (2008-02-13)
+
+- Zero-assembler implemented.
+- Netx support added. Still a work-in-progress.
+- Updated to build with gcc 4.3.
+- Many bug fixes.
+
+New in release 1.5 (2008-01-03)
+
+- ppc/ppc64 support.
+- ecj bootstrapping re-implemented.
+- Updated to OpenJDK b24 build (now uses mercurial).
+- System libraries (libpng, libjpeg, zlib, giflib) are used 
+instead of OpenJDK's implementations.
 - Several bug fixes.
 
-New in release 1.0 (2008-02-15)
+New in release 1.4 (2007-10-12)
 
-- Initial release
+* Updated to OpenJDK b21 build (README and INSTALL updated accordingly).
+* Now using SSL/Crypto support included in b21, OpenSSL certs
+still read directly.
+* TZdata fix: uses System's timezone data.
+* Memory issue fix: maximum PermGen space set to 128M and MaxHeap
+to 512M.
+* Xinerama fix: uses system installed library instead.
+* DebugInfo fix: generates full debuginfo, regardless of
+optimization.
+* Fixed JConsole crash.
+* Several other bug fixes.
+
+New in release 1.3 (2007-08-29)
+
+* Updated to OpenJDK b18 build.
+* Web browser plugin support using gcjwebplugin.
+* Now using Font supported included in b18.
+* Graphics fixes.
+* SSL/Crypto fixes.
+* Refactored build process.
+
+New in release 1.2 (2007-08-01)
+
+* Updated to OpenJDK b16 build.
+* Freetype font support fully replacing the encumbered libt2k.
+* Path widening imported from GNU Classpath.
+* Window decorations on x86_64 fixed.
+* Bug fixes in various graphics classes.
+* Anti-aliasing support explicitly disabled (instead of crashing).
+* OpenSSL certs read directly
+* Various crypto bug fixes.
+
+New in release 1.1 (2007-07-12)
+
+* Color management and raster fixes for compatibility with LittleCMS.
+* Debuginfo is always generated.
+* Initial work to satisfy libt2k requirement with Freetype.
+* The GNU Crypto security providers have been imported from GNU
+  Classpath.
+* IcedTls security provider.
diff -r 6a6228a27e7f configure
--- a/configure	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure	Mon Jun 02 04:04:19 2008 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea 1.6.
+# Generated by GNU Autoconf 2.61 for icedtea 1.7.
 #
 # Report bugs to <fitzsim at redhat.com>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='icedtea'
 PACKAGE_TARNAME='icedtea'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='icedtea 1.6'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='icedtea 1.7'
 PACKAGE_BUGREPORT='fitzsim at redhat.com'
 
 ac_default_prefix=bootstrap
@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icedtea 1.6 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icedtea 1.6:";;
+     short | recursive ) echo "Configuration of icedtea 1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icedtea configure 1.6
+icedtea configure 1.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1586,7 @@ This file contains any messages produced
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icedtea $as_me 1.6, which was
+It was created by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2276,7 +2276,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icedtea'
- VERSION='1.6'
+ VERSION='1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12709,7 +12709,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icedtea $as_me 1.6, which was
+This file was extended by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12756,7 +12756,7 @@ _ACEOF
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-icedtea config.status 1.6
+icedtea config.status 1.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 6a6228a27e7f configure.ac
--- a/configure.ac	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure.ac	Mon Jun 02 04:04:19 2008 +0100
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.6], [fitzsim at redhat.com])
+AC_INIT([icedtea], [1.7], [fitzsim at redhat.com])
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST

From gnu_andrew at member.fsf.org  Sun Jun  1 20:13:11 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 02 Jun 2008 03:13:11 +0000
Subject: changeset in /hg/icedtea: Bump to 1.7 and fix make dist and out-...
Message-ID: <hg.8bbc4ffe2c7c.1212376391.-6899778133799504387@icedtea.classpath.org>

changeset 8bbc4ffe2c7c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8bbc4ffe2c7c
description:
	Bump to 1.7 and fix make dist and out-of-dir builds.

diffstat:

6 files changed, 122 insertions(+), 49 deletions(-)
ChangeLog    |   11 +++++
Makefile.am  |    8 +--
Makefile.in  |    8 +--
NEWS         |  122 +++++++++++++++++++++++++++++++++++++++++++---------------
configure    |   20 ++++-----
configure.ac |    2 

diffs (295 lines):

diff -r 6a6228a27e7f -r 8bbc4ffe2c7c ChangeLog
--- a/ChangeLog	Sun Jun 01 17:57:21 2008 +0200
+++ b/ChangeLog	Mon Jun 02 04:13:01 2008 +0100
@@ -1,3 +1,14 @@ 2008-06-01  Mark Wielaard  <mark at klomp.o
+2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Fix location of icedtea-ecj.patch for out-of-dir
+	and make distcheck builds, and rename ports target to
+	hotspot-ports to stop make dist downloading the JDK.
+	* Makefile.in: Regenerated.
+	* NEWS: Add release news.
+	* configure: Regenerated.
+	* configure.ac: Bump version number to 1.7.
+
 2008-06-01  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-ecj.patch: Correct patch by reinstating
diff -r 6a6228a27e7f -r 8bbc4ffe2c7c Makefile.am
--- a/Makefile.am	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.am	Mon Jun 02 04:13:01 2008 +0100
@@ -455,7 +455,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -1056,9 +1056,9 @@ tools: stamps/tools.stamp
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
-
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports: stamps/ports.stamp
+
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 
diff -r 6a6228a27e7f -r 8bbc4ffe2c7c Makefile.in
--- a/Makefile.in	Sun Jun 01 17:57:21 2008 +0200
+++ b/Makefile.in	Mon Jun 02 04:13:01 2008 +0100
@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	$(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -1496,9 +1496,9 @@ tools: stamps/tools.stamp
 
 tools-class-files: stamps/tools-class-files.stamp
 
-ports: stamps/ports.stamp
-
-ports-ecj: stamps/ports-ecj.stamp
+hotspot-ports: stamps/ports.stamp
+
+hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 
diff -r 6a6228a27e7f -r 8bbc4ffe2c7c NEWS
--- a/NEWS	Sun Jun 01 17:57:21 2008 +0200
+++ b/NEWS	Mon Jun 02 04:13:01 2008 +0100
@@ -1,36 +1,98 @@ New in release 1.2 (2008-05-28)
-New in release 1.2 (2008-05-28)
+New in release 1.7 (2008-06-02)
 
-- Updated to b09 build.
-- Added the the lcms library with PYCC and LINEAR_RGB ICC
-  profiles.
-- Integrated Gervill to provide midi support.
-- JTreg integrated.
-- javaws/NetX fixes:
-  -improved security, namely catching Socket permissions during    
-  runtime
-  -implemented the remaining JNLP services api (PrintService, 
-  JNLPRandomAccessFile)
-  -applet focusing bug fixed
-- sparc/sparc64 port
-- Desktop file integration.
-- Various zero fixes.
-- Sound fixes.
-- Font fixes.
-- Several other bug fixes.
+  IcedTea is based on the hard work of a lot of people that contributed to
+  IcedTea6 and OpenJDK. The following noteworthy changes were added in
+  this release:
 
-New in release 1.1 (2008-04-04)
+  - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias
+   Klose integrated it into IcedTea.
+  - Keith Seiths and Andrew Haley made fixes to the awt color package so
+   that it now provides the lcms library with PYCC and LINEAR_RGB ICC
+   profiles, fixing several applications that did complex color
+   transformations.
+  - Karl Helgason wrote a midi software synthesizer called Gervill that
+   is now integrated in IcedTea so that javax.sound.midi support works
+   now. Mark Wielaard integrated it and made some fixes so that it works
+   better with javax.sound.sampled.
+  - Jonathan Gibbons released a free version of jtreg, which was imported
+   into IcedTea by Mark Wielaard so that a make check now runs all the
+   functional unit tests integrated into OpenJDK.
+  - Joshua Sumali made lots of fixes to the javaws/netx support. Including
+   improved security, namely catching Socket permissions during runtime,
+   implementing the remaining JNLP services api (PrintService and
+   JNLPRandomAccessFile), and applet focusing bug fixes, so now netx
+   plays nice with gcjwebplugin.
+  - Kelly O'Hair resolved the license issues with the (j)hat tool which is
+   now integrated.
+  - Lillian Angel and Tom Fitzsimmons added several .desktop files for
+   the various tools included for better GNU/Linux desktop integration.
+  - Thomas Fitzsimmons rewrote the cacert support to resolve issues with
+   applications like Glashfish and Eclipse which access the keystore
+   directly.
+  - Lillian Angel made lots of bug fixes to the packaging and integration
+   support, include improving the font support.
+  - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks
+   to Andrew John Hughes.
+  - Andrew also did all the work to make sure IcedTea[7] is now based on
+   OpenJDK7 b26 as released by Xiomara Jayasena.
+  - Thomas Fitzsimmons rewrote the certificate keystore support.
+  - Christian Thalinger made various cacao integration fixes.
 
-- Zero builds on any architecture.
-- New features added to NetX:
-   - Certificate fingerprints now show as part 
-     of certificate details.
-   - gcjwebplugin can now run applets through NetX, 
-     taking advantage of NetX's sandboxing and application security.
-   - User trusted certificates can be managed by passing the -viewer 
-     option to NetX. 
-- Updated to b08.
+New in release 1.6 (2008-02-13)
+
+- Zero-assembler implemented.
+- Netx support added. Still a work-in-progress.
+- Updated to build with gcc 4.3.
+- Many bug fixes.
+
+New in release 1.5 (2008-01-03)
+
+- ppc/ppc64 support.
+- ecj bootstrapping re-implemented.
+- Updated to OpenJDK b24 build (now uses mercurial).
+- System libraries (libpng, libjpeg, zlib, giflib) are used 
+instead of OpenJDK's implementations.
 - Several bug fixes.
 
-New in release 1.0 (2008-02-15)
+New in release 1.4 (2007-10-12)
 
-- Initial release
+* Updated to OpenJDK b21 build (README and INSTALL updated accordingly).
+* Now using SSL/Crypto support included in b21, OpenSSL certs
+still read directly.
+* TZdata fix: uses System's timezone data.
+* Memory issue fix: maximum PermGen space set to 128M and MaxHeap
+to 512M.
+* Xinerama fix: uses system installed library instead.
+* DebugInfo fix: generates full debuginfo, regardless of
+optimization.
+* Fixed JConsole crash.
+* Several other bug fixes.
+
+New in release 1.3 (2007-08-29)
+
+* Updated to OpenJDK b18 build.
+* Web browser plugin support using gcjwebplugin.
+* Now using Font supported included in b18.
+* Graphics fixes.
+* SSL/Crypto fixes.
+* Refactored build process.
+
+New in release 1.2 (2007-08-01)
+
+* Updated to OpenJDK b16 build.
+* Freetype font support fully replacing the encumbered libt2k.
+* Path widening imported from GNU Classpath.
+* Window decorations on x86_64 fixed.
+* Bug fixes in various graphics classes.
+* Anti-aliasing support explicitly disabled (instead of crashing).
+* OpenSSL certs read directly
+* Various crypto bug fixes.
+
+New in release 1.1 (2007-07-12)
+
+* Color management and raster fixes for compatibility with LittleCMS.
+* Debuginfo is always generated.
+* Initial work to satisfy libt2k requirement with Freetype.
+* The GNU Crypto security providers have been imported from GNU
+  Classpath.
+* IcedTls security provider.
diff -r 6a6228a27e7f -r 8bbc4ffe2c7c configure
--- a/configure	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure	Mon Jun 02 04:13:01 2008 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea 1.6.
+# Generated by GNU Autoconf 2.61 for icedtea 1.7.
 #
 # Report bugs to <fitzsim at redhat.com>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='icedtea'
 PACKAGE_TARNAME='icedtea'
-PACKAGE_VERSION='1.6'
-PACKAGE_STRING='icedtea 1.6'
+PACKAGE_VERSION='1.7'
+PACKAGE_STRING='icedtea 1.7'
 PACKAGE_BUGREPORT='fitzsim at redhat.com'
 
 ac_default_prefix=bootstrap
@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icedtea 1.6 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icedtea 1.6:";;
+     short | recursive ) echo "Configuration of icedtea 1.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icedtea configure 1.6
+icedtea configure 1.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1586,7 @@ This file contains any messages produced
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icedtea $as_me 1.6, which was
+It was created by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2276,7 +2276,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icedtea'
- VERSION='1.6'
+ VERSION='1.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12709,7 +12709,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icedtea $as_me 1.6, which was
+This file was extended by icedtea $as_me 1.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12756,7 +12756,7 @@ _ACEOF
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-icedtea config.status 1.6
+icedtea config.status 1.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 6a6228a27e7f -r 8bbc4ffe2c7c configure.ac
--- a/configure.ac	Sun Jun 01 17:57:21 2008 +0200
+++ b/configure.ac	Mon Jun 02 04:13:01 2008 +0100
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.6], [fitzsim at redhat.com])
+AC_INIT([icedtea], [1.7], [fitzsim at redhat.com])
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST


From gnu_andrew at member.fsf.org  Sun Jun  1 20:22:26 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 2 Jun 2008 04:22:26 +0100
Subject: IcedTea 1.7 released!
Message-ID: <17c6771e0806012022n6f84a07bxaa7ac90bdb7a358@mail.gmail.com>

We are proud to announce the release of IcedTea 1.7.

The IcedTea project provides a harness to build the source code from
OpenJDK (http://openjdk.java.net) using Free Software build tools and
provides replacements libraries for the binary plugs with code from the
GNU Classpath project. More information on IcedTea can be found at
http://icedtea.classpath.org


What's New?
-----------------
  IcedTea is based on the hard work of a lot of people that contributed to
  IcedTea6 (see the recent announcement of 1.2) and OpenJDK. The following
  noteworthy changes are included in this release (summarised by Mark
  Wielaard):

  - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias
   Klose integrated it into IcedTea.
  - Keith Seiths and Andrew Haley made fixes to the awt color package so
   that it now provides the lcms library with PYCC and LINEAR_RGB ICC
   profiles, fixing several applications that did complex color
   transformations.
  - Karl Helgason wrote a midi software synthesizer called Gervill that
   is now integrated in IcedTea so that javax.sound.midi support works
   now. Mark Wielaard integrated it and made some fixes so that it works
   better with javax.sound.sampled.
  - Jonathan Gibbons released a free version of jtreg, which was imported
   into IcedTea by Mark Wielaard so that a make check now runs all the
   functional unit tests integrated into OpenJDK.
  - Joshua Sumali made lots of fixes to the javaws/netx support. Including
   improved security, namely catching Socket permissions during runtime,
   implementing the remaining JNLP services api (PrintService and
   JNLPRandomAccessFile), and applet focusing bug fixes, so now netx
   plays nice with gcjwebplugin.
  - Kelly O'Hair resolved the license issues with the (j)hat tool which is
   now integrated.
  - Lillian Angel and Tom Fitzsimmons added several .desktop files for
   the various tools included for better GNU/Linux desktop integration.
  - Thomas Fitzsimmons rewrote the cacert support to resolve issues with
   applications like Glashfish and Eclipse which access the keystore
   directly.
  - Lillian Angel made lots of bug fixes to the packaging and integration
   support, include improving the font support.
  - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks
   to Andrew John Hughes.
  - Andrew also did all the work to make sure IcedTea[7] is now based on
   OpenJDK7 b26 as released by Xiomara Jayasena.
  - Thomas Fitzsimmons rewrote the certificate keystore support.
  - Christian Thalinger made various cacao integration fixes.

-----------------

The tarball can be downloaded here:

http://icedtea.classpath.org/download/source/icedtea-1.7.tar.gz

The following people helped with this release:
Lillian Angel, Gary Benson, Thomas Fitzsimmons, Andrew Haley, Andrew
John Hughes, Matthias Klose, Dan Munckton, Parag Nemade, Keith Seitz,
Joshua Sumali, Christian Thalinger, Mark Wielaard, Yi Zhan

We would also like to thank the bug reporters and testers!

Full build requirements and instructions can be found in the INSTALL
file in the top-level directory of the release.  However,

$ ./configure
$ make

should be a good start.

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Sun Jun  1 20:31:23 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 02 Jun 2008 03:31:23 +0000
Subject: changeset in /hg/icedtea: Added tag icedtea-1.7 for changeset 8b...
Message-ID: <hg.79a70e3a3d61.1212377483.-6899778133799504387@icedtea.classpath.org>

changeset 79a70e3a3d61 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=79a70e3a3d61
description:
	Added tag icedtea-1.7 for changeset 8bbc4ffe2c7c

diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r 8bbc4ffe2c7c -r 79a70e3a3d61 .hgtags
--- a/.hgtags	Mon Jun 02 04:13:01 2008 +0100
+++ b/.hgtags	Mon Jun 02 04:30:31 2008 +0100
@@ -8,3 +8,4 @@ 38e6eb354632588f5ac8dbcd69229ebd031f57cb
 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0
 a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1
 871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2
+8bbc4ffe2c7c542f9aa7d26f823e50f0dd036ce9 icedtea-1.7


From gnu_andrew at member.fsf.org  Sun Jun  1 20:35:00 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 2 Jun 2008 04:35:00 +0100
Subject: FYI: Bump version to 1.8-pre for next release.
Message-ID: <20080602033500.GA10112@rivendell.middle-earth.co.uk>

This bumps IcedTea's version number to 1.8-pre
so we can prepare for the next release.

ChangeLog:

2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* NEWS: Add news stub for next release.
	* configure: Regenerated.
	* configure.ac: Bump version number to 1.8-pre.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 79a70e3a3d61 NEWS
--- a/NEWS	Mon Jun 02 04:30:31 2008 +0100
+++ b/NEWS	Mon Jun 02 04:33:00 2008 +0100
@@ -1,3 +1,5 @@ New in release 1.7 (2008-06-02)
+New in release 1.8 (XXXX-XX-XX)
+
 New in release 1.7 (2008-06-02)
 
   IcedTea is based on the hard work of a lot of people that contributed to
diff -r 79a70e3a3d61 configure
--- a/configure	Mon Jun 02 04:30:31 2008 +0100
+++ b/configure	Mon Jun 02 04:33:00 2008 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea 1.7.
+# Generated by GNU Autoconf 2.61 for icedtea 1.8-pre.
 #
 # Report bugs to <fitzsim at redhat.com>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='icedtea'
 PACKAGE_TARNAME='icedtea'
-PACKAGE_VERSION='1.7'
-PACKAGE_STRING='icedtea 1.7'
+PACKAGE_VERSION='1.8-pre'
+PACKAGE_STRING='icedtea 1.8-pre'
 PACKAGE_BUGREPORT='fitzsim at redhat.com'
 
 ac_default_prefix=bootstrap
@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icedtea 1.7 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.8-pre to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icedtea 1.7:";;
+     short | recursive ) echo "Configuration of icedtea 1.8-pre:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icedtea configure 1.7
+icedtea configure 1.8-pre
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1586,7 @@ This file contains any messages produced
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icedtea $as_me 1.7, which was
+It was created by icedtea $as_me 1.8-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2276,7 +2276,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icedtea'
- VERSION='1.7'
+ VERSION='1.8-pre'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12709,7 +12709,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icedtea $as_me 1.7, which was
+This file was extended by icedtea $as_me 1.8-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12756,7 +12756,7 @@ _ACEOF
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-icedtea config.status 1.7
+icedtea config.status 1.8-pre
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 79a70e3a3d61 configure.ac
--- a/configure.ac	Mon Jun 02 04:30:31 2008 +0100
+++ b/configure.ac	Mon Jun 02 04:33:00 2008 +0100
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.7], [fitzsim at redhat.com])
+AC_INIT([icedtea], [1.8-pre], [fitzsim at redhat.com])
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST

From gnu_andrew at member.fsf.org  Sun Jun  1 20:35:09 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 02 Jun 2008 03:35:09 +0000
Subject: changeset in /hg/icedtea: Bump version to 1.8-pre.
Message-ID: <hg.d097426f525a.1212377709.-6899778133799504387@icedtea.classpath.org>

changeset d097426f525a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d097426f525a
description:
	Bump version to 1.8-pre.

diffstat:

3 files changed, 13 insertions(+), 11 deletions(-)
NEWS         |    2 ++
configure    |   20 ++++++++++----------
configure.ac |    2 +-

diffs (104 lines):

diff -r 79a70e3a3d61 -r d097426f525a NEWS
--- a/NEWS	Mon Jun 02 04:30:31 2008 +0100
+++ b/NEWS	Mon Jun 02 04:33:20 2008 +0100
@@ -1,3 +1,5 @@ New in release 1.7 (2008-06-02)
+New in release 1.8 (XXXX-XX-XX)
+
 New in release 1.7 (2008-06-02)
 
   IcedTea is based on the hard work of a lot of people that contributed to
diff -r 79a70e3a3d61 -r d097426f525a configure
--- a/configure	Mon Jun 02 04:30:31 2008 +0100
+++ b/configure	Mon Jun 02 04:33:20 2008 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea 1.7.
+# Generated by GNU Autoconf 2.61 for icedtea 1.8-pre.
 #
 # Report bugs to <fitzsim at redhat.com>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='icedtea'
 PACKAGE_TARNAME='icedtea'
-PACKAGE_VERSION='1.7'
-PACKAGE_STRING='icedtea 1.7'
+PACKAGE_VERSION='1.8-pre'
+PACKAGE_STRING='icedtea 1.8-pre'
 PACKAGE_BUGREPORT='fitzsim at redhat.com'
 
 ac_default_prefix=bootstrap
@@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures icedtea 1.7 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.8-pre to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1414,7 +1414,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of icedtea 1.7:";;
+     short | recursive ) echo "Configuration of icedtea 1.8-pre:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-icedtea configure 1.7
+icedtea configure 1.8-pre
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1586,7 +1586,7 @@ This file contains any messages produced
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by icedtea $as_me 1.7, which was
+It was created by icedtea $as_me 1.8-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2276,7 +2276,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icedtea'
- VERSION='1.7'
+ VERSION='1.8-pre'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12709,7 +12709,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by icedtea $as_me 1.7, which was
+This file was extended by icedtea $as_me 1.8-pre, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12756,7 +12756,7 @@ _ACEOF
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-icedtea config.status 1.7
+icedtea config.status 1.8-pre
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 79a70e3a3d61 -r d097426f525a configure.ac
--- a/configure.ac	Mon Jun 02 04:30:31 2008 +0100
+++ b/configure.ac	Mon Jun 02 04:33:20 2008 +0100
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.7], [fitzsim at redhat.com])
+AC_INIT([icedtea], [1.8-pre], [fitzsim at redhat.com])
 AM_INIT_AUTOMAKE([tar-pax])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST


From gnu_andrew at member.fsf.org  Sun Jun  1 20:35:10 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 02 Jun 2008 03:35:10 +0000
Subject: changeset in /hg/icedtea: Add ChangeLog for previous commit.
Message-ID: <hg.910a55ae501d.1212377710.-6899778133799504387@icedtea.classpath.org>

changeset 910a55ae501d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=910a55ae501d
description:
	Add ChangeLog for previous commit.

diffstat:

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

diffs (13 lines):

diff -r d097426f525a -r 910a55ae501d ChangeLog
--- a/ChangeLog	Mon Jun 02 04:33:20 2008 +0100
+++ b/ChangeLog	Mon Jun 02 04:34:01 2008 +0100
@@ -1,3 +1,9 @@ 2008-06-02  Andrew John Hughes  <gnu_and
+2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* NEWS: Add news stub for next release.
+	* configure: Regenerated.
+	* configure.ac: Bump version number to 1.8-pre.
+
 2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:


From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 03:52:08 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 10:52:08 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K37e4-0006Mz-KH@icedtea.classpath.org>

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





------- Comment #4 from doko at ubuntu.com  2008-06-02 10:52 -------
while jscheme-5.0.0 does have a conforming license, it doesn't build from
source with openjdk6:

jlib/Swing.java:5765: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
        (args.nth(1) instanceof java.awt.Dialog$ModalityType))) 
                                        ^
jlib/Swing.java:5782: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
        (args.nth(2) instanceof java.awt.Dialog$ModalityType))) 
                                        ^
jlib/Swing.java:5791: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
        (args.nth(2) instanceof java.awt.Dialog$ModalityType) &&
                                        ^
jlib/Swing.java:5838: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
            (java.awt.Dialog$ModalityType) args.nth(1) ); 
                     ^
jlib/Swing.java:5845: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
            (java.awt.Dialog$ModalityType) args.nth(2) ); 
                     ^
jlib/Swing.java:5849: cannot find symbol
symbol  : class Dialog$ModalityType
location: package java.awt
            (java.awt.Dialog$ModalityType) args.nth(2),
                     ^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
6 errors


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


From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 04:19:08 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 11:19:08 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K384C-0006Nv-MF@icedtea.classpath.org>

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





------- Comment #5 from aph at redhat.com  2008-06-02 11:19 -------
Shouldn't these be java.awt.Dialog.ModalityType ?

The spec says

ststic class Dialog.ModalityType
          Modal dialogs block all input to some top-level windows.


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


From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 04:54:17 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 11:54:17 +0000
Subject: [Bug 153] New: Class library tests should be less specific and ensure
	correctness
Message-ID: <E1K38cD-0006Ol-6P@icedtea.classpath.org>

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

           Summary: Class library tests should be less specific and ensure
                    correctness
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: gnu_andrew at member.fsf.org


At present we test for a class library to use for the build with:

  --with-libgcj-jar       specify location of the libgcj 4.3.0 jar

This will actually now pick up both 4.3.0 and 4.1.2.  The latter is
Fedora-specific.  The upstream 4.1.2 is not capable of being used (lacking 1.5
features) and the test generates false positives on Debian stable and Gentoo.

The titling of the option is also too specific.  glibj.zip from GNU Classpath
is also capable of fulfilling this dependency.  Indeed, libgcj.jar is largely
composed of GNU Classpath classes.

I'd suggest an option like --with-classlib-jar followed by a test to ensure
that the required classes are actually present.  A 1.5 test already exists in
GNU Classpath and could be altered to suit this purpose.


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


From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 04:57:18 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 11:57:18 +0000
Subject: [Bug 154] New: Hidden GCJ HOME dependency misleading
Message-ID: <E1K38f8-0006Os-Sv@icedtea.classpath.org>

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

           Summary: Hidden GCJ HOME dependency misleading
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: gnu_andrew at member.fsf.org


The build relies on an option called --with-gcj-home to provide libjvm.  This
is not included in the output of configure. Thus, the first time it may be
found to be wrong is in make:

/usr/lib/jvm/java-gcj  cannot be found. Try reconfiguring with 
--with-gcj-home=/path/to/java-gcj-devel

The option is also misleading.  The required structure is not a GCC/GCJ install
but an installation of gcj-java-compat.  What this option is really looking for
is a JDK-like structure.  As a result, it could also be used for javac and the
class library, but isn't.


-- 
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 Joe.Darcy at Sun.COM  Mon Jun  2 10:19:44 2008
From: Joe.Darcy at Sun.COM (Joseph D. Darcy)
Date: Mon, 02 Jun 2008 10:19:44 -0700
Subject: OpenJDK 6 b10 source posted
In-Reply-To: <1212359825.3133.84.camel@dijkstra.wildebeest.org>
References: <4840AC46.8030409@sun.com>
	<1212359825.3133.84.camel@dijkstra.wildebeest.org>
Message-ID: <48442BB0.90802@sun.com>

Mark Wielaard wrote:
> Hi Joe,
> 
> On Fri, 2008-05-30 at 18:39 -0700, Joseph D. Darcy wrote:
>> The OpenJDK 6 b10 source is now available at
>>
>> http://download.java.net/openjdk/jdk6/
> 
> Thanks for releasing this. I have updated icedtea6 to include it.
> 
> Are you planning to support a mercurial repo for openjdk6?

Yes, a mercurial repo for OpenJDK 6 should be up and running withing a 
month or two.

> Although your
> release notes below helped a lot, it is still hard work to review all
> the changes for integration if all you got is just the diff between two
> full versions.

Agreed.

> For those interested I posted the b09-b10 diff here:
> http://icedtea.classpath.org/~mjw/b09-b10.diff.gz
> (Excluding the new/deleted (gervill) files)
> 
> Posting individual changes and/or having a public repo might also help
> understanding smaller things that you don't explicitly mention in your
> release notes like the changes to java.c, MetaData.java or
> ChunkedInputStream/test.txt (also removed from the diff since it is
> essentially a binary blob).
> 
>> A few fixes in the 2D area:
>>
>> 6604044: java crashes talking to second X screen
>> 6636469: Java Fullscreen Exclusive Mode not working with Xorg server
>> 1.3.0 and above
> 
> Removed icedtea-xinerama.patch from icedtea6 which did the same thing.
> 
>> 6523403: OSS CMM: Need to provide lcms library with PYCC and
>> LINEAR_RGB OS ICC profiles
>>
>> The last fix was contributed by Andrew Haley and Keith Seitz of Red Hat
>> and fixes color management related regression and JCK failures.
> 
> Thanks, I removed the icedtea-color-profiles.patch and the overlay.
> 
>> The encumbered sound engine has been replaced with Gervill:
>>
>> 6702956 OpenJDK: replace encumbered code (software synthesizer)
> 
> Very nice. We had good experience with this code in IcedTea.
> 
> It wasn't clear precisely which upstream version of Gervill you are
> including. It does look like you are missing some fixes Karl and I made
> since it got integrated into icedtea. For example you miss the sample
> rate conversion support. But it is somewhat hard to see because all the
> files got completely reformatted from the upstream sources.
> 
> You should be able to find all the changes we made on the mailinglist
> (sound-dev, distro-pkg-dev and audio-engine-dev) and of course in
> Gervill CVS https://gervill.dev.java.net/source/browse/gervill/ (or
> icedtea6 mercurial under overlays).
> 
> Could you make the changes you made to the upstream sources available
> separate from the changes you made to the indention of the sources for
> easy comparison?

I'll forward this request to the engineer who did the Gervill integration.

> For now I kept the current upstream/icedtea version.
> 
>> Some progress has been made on addressing the copyright/licensing
>> concerns raised by Debian
>> (http://mail.openjdk.java.net/pipermail/jdk6-dev/2008-April/000044.html):
>>
>> 6695553: Cleanup GPLv2+SPL legal notices in hat sources
>> 6703931 Remove jaxws doc-files from the jdk
>>
>> Work will continue in this area until all the issues are addressed.
> 
> Very nice. I removed the patches/icedtea-hat-spl-gpl.patch.
> And this also closes:
> - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142
> 
> And I saw soundbank.gm was also removed, which closes:
> - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149
> 
> The general tracking bug for hopefully all these issues is:
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138
> 
>> Mark Wielaard recently proposed publishing regression test results for
>> OpenJDK 6
>> (http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/001921.html). 
>>

Thanks for the update on incorporating the changes in b10.

>> I'll publish results for b10 later.
> 
> That would be cool.

Yes; however, my own work on OpenJDK 6 will be delayed for a while since 
I am out of the office for a death in the family.

Regards,

-Joe

> I am also happy to note that Lillian and Tom added jtregcheck to the
> Fedora rpm builds in addition to running the Mauve tests. The test
> results output (just the jtreg -v1 output for now, not yet the full
> JTreport and JTwork output) are then included in the src subpackage rpm
> and in the build logs.
> 
> Which is great because it also allows us to easily monitor the (zero)
> ports that Fedora ships like ppc and ppc64. For an example see:
> http://koji.fedoraproject.org/koji/buildinfo?buildID=51083
> Click on the build logs (build.log) and search for "JTREG TESTING".
> The results still have a bit too many failures because it doesn't
> currently provide a Xvfb wrapper like it does for Mauve. But that is in
> the works.
> 
> Cheers,
> 
> Mark
> 
> 
> 2008-06-01  Mark Wielaard  <mark at klomp.org>
> 
>   * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
>   (OPENJDK_MD5SUM): Updated.
>   (OPENJDK_VERSION): Updated to b10.
>   (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between 
>   version and date in b10.
>   (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
>   icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
>   * Makefile.in: Regenerated.
>   * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
>   references in b10.
>   * patches/icedtea-gervill.patch: Adjusted to new sound service 
>   files in b10.
>   * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
>   * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
>   * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
>   * patches/icedtea-color-profiles.patch: Removed.
>   * patches/icedtea-hat-spl-gpl.patch: Removed.
>   * patches/icedtea-xinerama.patch: Removed.
> 
> 



From psj at familyjenner.co.uk  Mon Jun  2 12:01:37 2008
From: psj at familyjenner.co.uk (Paul Jenner)
Date: Mon, 02 Jun 2008 20:01:37 +0100
Subject: OpenJDK 6 b10 source posted
In-Reply-To: <1212359825.3133.84.camel@dijkstra.wildebeest.org>
References: <4840AC46.8030409@sun.com>
	<1212359825.3133.84.camel@dijkstra.wildebeest.org>
Message-ID: <1212433297.7582.4.camel@localhost.localdomain>

Hi Mark.

On Mon, 2008-06-02 at 00:37 +0200, Mark Wielaard wrote:
> > The encumbered sound engine has been replaced with Gervill:
> > 
> > 6702956 OpenJDK: replace encumbered code (software synthesizer)
> 
> Very nice. We had good experience with this code in IcedTea.

Does that mean the libjsoundhs.so library target can go from
Makefile.am?

Presumably if/when the OpenJDK6 Gervill is imported to Icedtea, the
files under rt/com/sun/media/sound/ could also go?

I think that would only leave the SNMP stuff and the libdcpr.so library
target (is this used since the replacement of Ductus?) from the original
binary plugs replacements - way to go!

Paul

-- 
Paul Jenner <psj at familyjenner.co.uk>



From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 13:26:56 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 20:26:56 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K3GcK-0006mi-1t@icedtea.classpath.org>

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





------- Comment #6 from doko at ubuntu.com  2008-06-02 20:26 -------
> Shouldn't these be java.awt.Dialog.ModalityType ?

probably yes, but this .java file is generated.


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


From mark at klomp.org  Mon Jun  2 13:29:22 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 02 Jun 2008 22:29:22 +0200
Subject: OpenJDK 6 b10 source posted
In-Reply-To: <1212433297.7582.4.camel@localhost.localdomain>
References: <4840AC46.8030409@sun.com>
	<1212359825.3133.84.camel@dijkstra.wildebeest.org>
	<1212433297.7582.4.camel@localhost.localdomain>
Message-ID: <1212438562.3187.6.camel@hermans.wildebeest.org>

Hi Paul,

On Mon, 2008-06-02 at 20:01 +0100, Paul Jenner wrote:
> On Mon, 2008-06-02 at 00:37 +0200, Mark Wielaard wrote:
> > > The encumbered sound engine has been replaced with Gervill:
> > > 
> > > 6702956 OpenJDK: replace encumbered code (software synthesizer)
> > 
> > Very nice. We had good experience with this code in IcedTea.
> 
> Does that mean the libjsoundhs.so library target can go from
> Makefile.am?

Yes, support for jsoundhs has been removed.

> Presumably if/when the OpenJDK6 Gervill is imported to Icedtea, the
> files under rt/com/sun/media/sound/ could also go?

I believe they (and other classes there) already can, I have been
lazy/hesitant to remove them to not accidentally break anybodies
bootstrap. But none of these classes are used, the code under overlays/
from the Gervill project is used in its place.

> I think that would only leave the SNMP stuff

Yes :)

> and the libdcpr.so library
> target (is this used since the replacement of Ductus?) from the original
> binary plugs replacements - way to go!

dcpr should never be used, that is all replaced by pisces.

I guess we really should do some spring cleaning :)

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Mon Jun  2 14:22:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Jun 2008 21:22:49 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K3HUP-0006p5-Nn@icedtea.classpath.org>

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





------- Comment #7 from gnu_andrew at member.fsf.org  2008-06-02 21:22 -------
I've looked over the one scheme file which seems to be the problem.  It seems
simple enough to port over to pure Java and I'm happy to do this.


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun  3 03:14:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Jun 2008 10:14:43 +0000
Subject: [Bug 155] New: Eclipse crashes in [libxul.so+0x9c753c]
Message-ID: <E1K3TXP-0007ak-Gr@icedtea.classpath.org>

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

           Summary: Eclipse crashes in [libxul.so+0x9c753c]
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mcepl at redhat.com


Using RSSOwl I got the attached log, which instructs me to file a bug here.
This is Fedora Rawhide.

[matej at hubmaier ~]$ java -version
java version "1.6.0"
OpenJDK  Runtime Environment (build 1.6.0-b09)
OpenJDK 64-Bit Server VM (build 1.6.0-b09, mixed mode)
[matej at hubmaier ~]$ rpm -qf $(readlink -f $(which java))
java-1.6.0-openjdk-1.6.0.0-0.14.b09.fc10.x86_64
[matej at hubmaier ~]$ rpm -qf $(readlink -f $(which eclipse))
eclipse-platform-3.3.2-12.fc9.x86_64
[matej at hubmaier ~]$ 

RSSOwl is 2.0.0alpha via Update Manager


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun  3 03:16:12 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Jun 2008 10:16:12 +0000
Subject: [Bug 155] Eclipse crashes in [libxul.so+0x9c753c]
Message-ID: <E1K3TYq-0007aq-5K@icedtea.classpath.org>

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





------- Comment #1 from mcepl at redhat.com  2008-06-03 10:16 -------
Created an attachment (id=73)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=73&action=view)
error log from Eclipse


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun  3 03:42:01 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Jun 2008 10:42:01 +0000
Subject: [Bug 155] Eclipse crashes in [libxul.so+0x9c753c]
Message-ID: <E1K3Txp-0007bu-Q4@icedtea.classpath.org>

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





------- Comment #2 from aph at redhat.com  2008-06-03 10:42 -------
Looks very similar to

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


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun  3 05:13:09 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Jun 2008 12:13:09 +0000
Subject: [Bug 156] New: Eclipse crashes in [libglib-2.0.so.0+0x54f39]
	g_slice_alloc+0x139
Message-ID: <E1K3VO1-0007eq-Hd@icedtea.classpath.org>

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

           Summary: Eclipse crashes in  [libglib-2.0.so.0+0x54f39]
                    g_slice_alloc+0x139
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mcepl at redhat.com


(continuation of bug 155 -- I got two logs out of two runnings of RSSOwl).
The all packages and everything is the same as in bug 155, but the log is
different.


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun  3 05:13:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Jun 2008 12:13:43 +0000
Subject: [Bug 156] Eclipse crashes in [libglib-2.0.so.0+0x54f39]
	g_slice_alloc+0x139
Message-ID: <E1K3VOZ-0007ev-CA@icedtea.classpath.org>

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





------- Comment #1 from mcepl at redhat.com  2008-06-03 12:13 -------
Created an attachment (id=74)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=74&action=view)
log


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


From mark at klomp.org  Wed Jun  4 02:25:24 2008
From: mark at klomp.org (Mark Wielaard)
Date: Wed, 04 Jun 2008 11:25:24 +0200
Subject: OpenJDK 6 b10 source posted
In-Reply-To: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>
References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>
Message-ID: <1212571525.3172.11.camel@dijkstra.wildebeest.org>

Hi Karl,

On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
> Mark Wielaard wrote:
> > It wasn't clear precisely which upstream version of Gervill you are
> > including. It does look like you are missing some fixes Karl and I made
> > since it got integrated into icedtea. For example you miss the sample
> > rate conversion support. But it is somewhat hard to see because all the
> > files got completely reformatted from the upstream sources.
> 
> They are using Gervill 0.9 source dump with these fixes (which are also in current cvs):
>   - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm
>   - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info
>   - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator
>   - Fix: Remove redundant constant variable in ModelByteBufferWaveTable

Thanks for checking. These are all in the icedtea gervill overlay also.
I'll make sure to upgrade to the latest CVS version in which I see you
fixed some of the other issues I reported.

> The code was also slightly reformatted:
> a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
> sources);
> b) line indention (to make lines no longer than 80 symbols);
> c) tabs to spaces conversion;
> 
> I will look into to reformat newest Gervill CVS code the same way.

That would be great. Since 0.9 there have been lots of changes and fixes
(which is why icedtea tracks your CVS tree and didn't use the old 0.9
code). Would it be a good idea to do a new version upgrade after syncing
the sources and reformatting to celebrate the inclusion?

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Wed Jun  4 14:13:19 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 04 Jun 2008 21:13:19 +0000
Subject: [Bug 139] no source included for maf-1_0.jar, jlfgr-1_0.jar
Message-ID: <E1K40IJ-00017c-1B@icedtea.classpath.org>

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





------- Comment #4 from kelly.ohair at sun.com  2008-06-04 21:13 -------
Filed Sun bug 6710791 on this issue


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


From bugzilla-daemon at icedtea.classpath.org  Wed Jun  4 14:16:00 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 04 Jun 2008 21:16:00 +0000
Subject: [Bug 144] jvmtiLib.xsl and archDesc.cpp generate files with SUN
	PROPRIETARY/CONFIDENTIAL notices (openjdk6 only)
Message-ID: <E1K40Ku-00017v-W5@icedtea.classpath.org>

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





------- Comment #1 from kelly.ohair at sun.com  2008-06-04 21:16 -------
Created Sun bug 6601377 on this issue


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


From kalli at midverk.is  Wed Jun  4 18:56:18 2008
From: kalli at midverk.is (Karl Helgason)
Date: Thu, 5 Jun 2008 01:56:18 +0000
Subject: SV: OpenJDK 6 b10 source posted
In-Reply-To: <1212571525.3172.11.camel@dijkstra.wildebeest.org>
References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>,
	<1212571525.3172.11.camel@dijkstra.wildebeest.org>
Message-ID: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE2@mail.midverk.is>

Hi Mark,

I have reformatted the Gervill CVS code.
It should be possible now to make diffs between them easily.

cheers,
Karl

________________________________________
Fr?: Mark Wielaard [mark at klomp.org]
Sent: 4. j?n? 2008 09:25
Vi?takandi: Karl Helgason
Afrit: jdk6-dev at openjdk.java.net; distro-pkg-dev at openjdk.java.net
Efni: Re: OpenJDK 6 b10 source posted

Hi Karl,

On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
> Mark Wielaard wrote:
> > It wasn't clear precisely which upstream version of Gervill you are
> > including. It does look like you are missing some fixes Karl and I made
> > since it got integrated into icedtea. For example you miss the sample
> > rate conversion support. But it is somewhat hard to see because all the
> > files got completely reformatted from the upstream sources.
>
> They are using Gervill 0.9 source dump with these fixes (which are also in current cvs):
>   - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm
>   - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info
>   - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator
>   - Fix: Remove redundant constant variable in ModelByteBufferWaveTable

Thanks for checking. These are all in the icedtea gervill overlay also.
I'll make sure to upgrade to the latest CVS version in which I see you
fixed some of the other issues I reported.

> The code was also slightly reformatted:
> a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
> sources);
> b) line indention (to make lines no longer than 80 symbols);
> c) tabs to spaces conversion;
>
> I will look into to reformat newest Gervill CVS code the same way.

That would be great. Since 0.9 there have been lots of changes and fixes
(which is why icedtea tracks your CVS tree and didn't use the old 0.9
code). Would it be a good idea to do a new version upgrade after syncing
the sources and reformatting to celebrate the inclusion?

Cheers,

Mark



No virus found in this incoming message.
Checked by AVG.
Version: 7.5.524 / Virus Database: 269.24.6/1480 - Release Date: 3.6.2008 07:00



From bugzilla-daemon at icedtea.classpath.org  Thu Jun  5 18:53:35 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 06 Jun 2008 01:53:35 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K4R95-0002vd-B9@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED




------- Comment #8 from gnu_andrew at member.fsf.org  2008-06-06 01:53 -------
Replacement started here:

http://fuseyism.com/hg/jscheme/

It can already generate the first ten or so lines of the class file.  Should
hopefully be finished tomorrow.


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


From mark at klomp.org  Sun Jun  8 15:02:47 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 08 Jun 2008 22:02:47 +0000
Subject: changeset in /hg/icedtea6: Import Gervill CVS fixes.
Message-ID: <hg.94f0c8f3a4aa.1212962567.2873452341184383832@icedtea.classpath.org>

changeset 94f0c8f3a4aa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=94f0c8f3a4aa
description:
	Import Gervill CVS fixes.

	2008-08-08  Mark Wielaard  <mark at klomp.org>

	       * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	       Import Gervill fixes from CVS. See CHANGES.txt.
	       * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.

	- Cleanup: Make inner classes static
	           AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
	           AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
	           AudioFloatFormatConverter.AudioFloatInputStreamResampler
	           SimpleInstrument.SimpleInstrumentPart
	           SoftChorus.VariableDelay
	           SoftChorus.LFODelay
	           SoftMixingDataLine.AudioFloatInputStreamResampler
	           SoftMixingSourceDataLine.NonBlockingFloatInputStream
	           SoftReverb.AllPass
	           SoftReverb.Comb
	           SoftReverb.Delay
	- Cleanup: Remove unused fields in:
	           SoftSincResampler.din, SoftLanczosResampler.din,
	           SoftMainMixer.finetuning,  SoftMainMixer.coarsetuning
	           SoftJitterCorrector.JitterStream.nullbuff,
	           SoftAbstractResampler.ModelAbstractResampler.loopread
	           SoftAbstractResampler.ModelAbstractResampler.streammarked
	- Cleanup: Remove dead code from FFT.
	- Cleanup: Make constant fields in SoftFilter final.
	- Cleanup: Let SoftSynthesizer.info be final.
	- Cleanup: Let SoftProvider.info be final.
	- Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer
	       causes random hangs in SoftSynthesizer.open jtreg test.
	       This happens when the synthesizer is opened and right after closed.
	       This will not happen if there is a delay between open and close call.
	- Fix: ModelByteBufferAudioFileSoundbankReader,
	       SoftAudioPusher, SoftJitterCorrector
	       don't ignore stream.read return value.
	- Fix: NullPointerException in
	       SoftSynthesizer.unloadInstrument if instrument = null
	- Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream.
	- Fix: Futile attempts to guard buffers variable in SoftJitterCorrector.
	- Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read
	       when reading from stream.
	       JTreg tests where created to test for this.

diffstat:

49 files changed, 844 insertions(+), 203 deletions(-)
ChangeLog                                                                                              |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java               |   80 +++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java                    |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java              |   12 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt                                 |   37 +++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                           |   60 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java                     |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                                    |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java                     |   32 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java                        |    9 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java               |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java                        |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt                                  |    3 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                             |   49 +++-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                           |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java                       |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java                  |    5 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java                        |   10 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                             |    4 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                             |   26 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java                         |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java                    |   21 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java                   |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                          |    4 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java                     |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java                        |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java                |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java               |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                           |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                             |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java                      |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java                        |   13 -
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java             |   52 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java      |   63 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java     |  119 ++++++++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java              |   54 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java             |   52 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java      |   63 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java     |  119 ++++++++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java              |   54 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java                |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java           |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java      |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java             |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java        |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java          |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java     |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java                         |   20 +

diffs (truncated from 1938 to 500 lines):

diff -r e4b644655e78 -r 94f0c8f3a4aa ChangeLog
--- a/ChangeLog	Sun Jun 08 18:51:47 2008 +0200
+++ b/ChangeLog	Sun Jun 08 21:21:14 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill fixes from CVS. See CHANGES.txt.
+	* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
+
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (ZERO_PATCHES): Add
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
@@ -26,6 +26,7 @@ package com.sun.media.sound;
 package com.sun.media.sound;
 
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +42,7 @@ import javax.sound.sampled.UnsupportedAu
 /**
  * Soundbank reader that uses audio files as soundbanks.
  * 
- * @version %I%, %E% 
+ * @version %I%, %E%
  * @author Karl Helgason
  * 
  */
@@ -81,34 +82,32 @@ public class AudioFileSoundbankReader ex
 			throws InvalidMidiDataException, IOException {
 
 		try {
-			try {
-				byte[] buffer;
-				if (ais.getFrameLength() == -1) {
-					ByteArrayOutputStream baos = new ByteArrayOutputStream();
-					byte[] buff = new byte[1024 - (1024 % ais.getFormat().getFrameSize())];
-					int ret;
-					while ((ret = ais.read(buff)) != -1)
-						baos.write(buff, 0, ret);
-					ais.close();
-					buffer = baos.toByteArray();
-				} else {
-					buffer = new byte[(int) (ais.getFrameLength() * ais
-							.getFormat().getFrameSize())];
-					ais.read(buffer);
-				}
-				ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-						new ModelByteBuffer(buffer), ais.getFormat(), -4800);
-				ModelPerformer performer = new ModelPerformer();
-				;
-				performer.getOscillators().add(osc);
+			byte[] buffer;
+			if (ais.getFrameLength() == -1) {
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buff = new byte[1024 - (1024 % ais.getFormat()
+						.getFrameSize())];
+				int ret;
+				while ((ret = ais.read(buff)) != -1)
+					baos.write(buff, 0, ret);
+				ais.close();
+				buffer = baos.toByteArray();
+			} else {
+				buffer = new byte[(int) (ais.getFrameLength() * ais.getFormat()
+						.getFrameSize())];
+				new DataInputStream(ais).readFully(buffer);
+			}
+			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+					new ModelByteBuffer(buffer), ais.getFormat(), -4800);
+			ModelPerformer performer = new ModelPerformer();
+			;
+			performer.getOscillators().add(osc);
 
-				SimpleSoundbank sbk = new SimpleSoundbank();
-				SimpleInstrument ins = new SimpleInstrument();
-				ins.add(performer);
-				sbk.addInstrument(ins);
-				return sbk;
-			} finally {
-			}
+			SimpleSoundbank sbk = new SimpleSoundbank();
+			SimpleInstrument ins = new SimpleInstrument();
+			ins.add(performer);
+			sbk.addInstrument(ins);
+			return sbk;
 		} catch (Exception e) {
 			return null;
 		}
@@ -117,18 +116,18 @@ public class AudioFileSoundbankReader ex
 	public Soundbank getSoundbank(File file) throws InvalidMidiDataException,
 			IOException {
 
-		try {									
-				AudioInputStream ais = AudioSystem.getAudioInputStream(file);
-				ais.close();
-				ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+		try {
+			AudioInputStream ais = AudioSystem.getAudioInputStream(file);
+			ais.close();
+			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
 					new ModelByteBuffer(file, 0, file.length()), -4800);
-				ModelPerformer performer = new ModelPerformer();				
-				performer.getOscillators().add(osc);
-				SimpleSoundbank sbk = new SimpleSoundbank();
-				SimpleInstrument ins = new SimpleInstrument();
-				ins.add(performer);
-				sbk.addInstrument(ins);
-				return sbk;							
+			ModelPerformer performer = new ModelPerformer();
+			performer.getOscillators().add(osc);
+			SimpleSoundbank sbk = new SimpleSoundbank();
+			SimpleInstrument ins = new SimpleInstrument();
+			ins.add(performer);
+			sbk.addInstrument(ins);
+			return sbk;
 		} catch (UnsupportedAudioFileException e1) {
 			return null;
 		} catch (IOException e) {
@@ -136,6 +135,5 @@ public class AudioFileSoundbankReader ex
 		}
 
 	}
-	
-	
+
 }
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 21:21:14 2008 +0200
@@ -923,7 +923,7 @@ public abstract class AudioFloatConverte
 				if (format.getSampleSizeInBits() <= 8)
 					conv = new AudioFloatConversion8S();
 				else if (format.getSampleSizeInBits() > 8
-						& format.getSampleSizeInBits() <= 16)
+						&& format.getSampleSizeInBits() <= 16)
 					conv = new AudioFloatConversion16SL();
 				else if (format.getSampleSizeInBits() > 16
 						&& format.getSampleSizeInBits() <= 24)
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java	Sun Jun 08 21:21:14 2008 +0200
@@ -47,7 +47,7 @@ import javax.sound.sampled.spi.FormatCon
 
 public class AudioFloatFormatConverter extends FormatConversionProvider {
 
-	private class AudioFloatFormatConverterInputStream extends InputStream
+	private static class AudioFloatFormatConverterInputStream extends InputStream
 	{
 		private AudioFloatConverter converter;
 		private AudioFloatInputStream stream;
@@ -109,7 +109,7 @@ public class AudioFloatFormatConverter e
 		
 	}
 	
-	private class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream
+	private static class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream
 	{
 		
 		private int targetChannels;
@@ -217,7 +217,7 @@ public class AudioFloatFormatConverter e
 		
 	}
 	
-	private class AudioFloatInputStreamResampler extends AudioFloatInputStream
+	private static class AudioFloatInputStreamResampler extends AudioFloatInputStream
 	{
 		
 		private AudioFloatInputStream ais;
@@ -476,16 +476,16 @@ public class AudioFloatFormatConverter e
 	}	
 
 	public Encoding[] getSourceEncodings() {
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public Encoding[] getTargetEncodings() {
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public Encoding[] getTargetEncodings(AudioFormat sourceFormat) {
 		if(AudioFloatConverter.getConverter(sourceFormat) == null) return new Encoding[0]; 
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public AudioFormat[] getTargetFormats(Encoding targetEncoding, AudioFormat sourceFormat) {
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Sun Jun 08 21:21:14 2008 +0200
@@ -1,3 +1,39 @@
+  - Cleanup: Make inner classes static 
+              AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
+              AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
+              AudioFloatFormatConverter.AudioFloatInputStreamResampler
+              SimpleInstrument.SimpleInstrumentPart
+              SoftChorus.VariableDelay
+              SoftChorus.LFODelay
+              SoftMixingDataLine.AudioFloatInputStreamResampler
+              SoftMixingSourceDataLine.NonBlockingFloatInputStream
+              SoftReverb.AllPass
+              SoftReverb.Comb
+              SoftReverb.Delay
+  - Cleanup: Remove unused fields in:
+              SoftSincResampler.din, SoftLanczosResampler.din, 
+              SoftMainMixer.finetuning,  SoftMainMixer.coarsetuning
+              SoftJitterCorrector.JitterStream.nullbuff, 
+              SoftAbstractResampler.ModelAbstractResampler.loopread
+              SoftAbstractResampler.ModelAbstractResampler.streammarked
+  - Cleanup: Remove dead code from FFT.
+  - Cleanup: Make constant fields in SoftFilter final.
+  - Cleanup: Let SoftSynthesizer.info be final.
+  - Cleanup: Let SoftProvider.info be final.
+  - Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer 
+         causes random hangs in SoftSynthesizer.open jtreg test.
+         This happens when the synthesizer is opened and right after closed.
+         This will not happen if there is a delay between open and close call.
+  - Fix: ModelByteBufferAudioFileSoundbankReader, 
+         SoftAudioPusher, SoftJitterCorrector
+          don't ignore stream.read return value.
+  - Fix: NullPointerException in 
+         SoftSynthesizer.unloadInstrument if instrument = null       
+  - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream.
+  - Fix: Futile attempts to guard buffers variable in SoftJitterCorrector.
+  - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read 
+         when reading from stream.
+         JTreg tests where created to test for this.
   - Added: Software Mixing Mixer
   - Removed: PATSoundBankReader removed because no format license is available.
              It is also undocumented format. 
@@ -22,6 +58,7 @@
          If illegal notenumber was used in NoteOn/NoteOff
          a ArrayOutOfIndex exception was thrown.
          
+Version 1.0 (released in OpenJDK 6 b10)
   - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm
   - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info
   - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java	Sun Jun 08 21:21:14 2008 +0200
@@ -111,6 +111,10 @@ public class DLSSoundbank implements Sou
 			return d;
 		}
 		
+		public int hashCode() {
+			return (int)i1;
+		}
+				
 		public boolean equals(Object obj) {
 			if(!(obj instanceof DLSID)) return false;
 			DLSID t = (DLSID)obj;
@@ -230,15 +234,15 @@ public class DLSSoundbank implements Sou
 					if(!readCdlChunk(chunk))
 						throw new RIFFInvalidFormatException("DLS file isn't supported!");
 				}
-				if (chunk.getFormat().equals("colh")) {
+				//if (chunk.getFormat().equals("colh")) {
 					// - skipped because we will load the entire bank into memory
 					// long instrumentcount = chunk.readUnsignedInt();
 					// System.out.println("instrumentcount = "+ instrumentcount);					
-				}
-				if (chunk.getFormat().equals("ptbl")) {
+				//}
+				//if (chunk.getFormat().equals("ptbl")) {
 					// Pool Table Chunk
 					// - skipped because we will load the entire bank into memory
-				}	
+				//}	
 				if (chunk.getFormat().equals("vers")) {
 					major = chunk.readUnsignedInt();
 					minor = chunk.readUnsignedInt();
@@ -300,80 +304,80 @@ public class DLSSoundbank implements Sou
 			case DLS_CDL_AND:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) & (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_OR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) | (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_XOR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) ^ (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) ^ (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_ADD:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x+y ));
+				stack.push(Long.valueOf( x+y ));
 				break;
 			case DLS_CDL_SUBTRACT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x-y ));
+				stack.push(Long.valueOf( x-y ));
 				break;
 			case DLS_CDL_MULTIPLY:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x*y ));
+				stack.push(Long.valueOf( x*y ));
 				break;
 			case DLS_CDL_DIVIDE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x/y ));
+				stack.push(Long.valueOf( x/y ));
 				break;
 			case DLS_CDL_LOGICAL_AND:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) & (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_LOGICAL_OR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) | (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_LT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x < y) ?1:0));
+				stack.push(Long.valueOf( (x < y) ?1:0));
 				break;				
 			case DLS_CDL_LE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x <= y) ?1:0));
+				stack.push(Long.valueOf( (x <= y) ?1:0));
 				break;				
 			case DLS_CDL_GT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x > y) ?1:0));
+				stack.push(Long.valueOf( (x > y) ?1:0));
 				break;				
 			case DLS_CDL_GE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x >= y) ?1:0));
+				stack.push(Long.valueOf( (x >= y) ?1:0));
 				break;				
 			case DLS_CDL_EQ:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x == y) ?1:0));
+				stack.push(Long.valueOf( (x == y) ?1:0));
 				break;		
 			case DLS_CDL_NOT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long((x==0)?1:0));
+				stack.push(Long.valueOf((x==0)?1:0));
 				break;
 			case DLS_CDL_CONST:
-				stack.push(new Long(riff.readUnsignedInt()));
+				stack.push(Long.valueOf(riff.readUnsignedInt()));
 				break;
 			case DLS_CDL_QUERY:
 				uuid = DLSID.read(riff);
@@ -381,7 +385,7 @@ public class DLSSoundbank implements Sou
 				break;				
 			case DLS_CDL_QUERYSUPPORTED:
 				uuid = DLSID.read(riff);
-				stack.push(new Long(cdlIsQuerySupported(uuid)?1:0));
+				stack.push(Long.valueOf(cdlIsQuerySupported(uuid)?1:0));
 				break;				
 			default:
 				break;
@@ -527,7 +531,7 @@ public class DLSSoundbank implements Sou
 				if(format.equals("dlid"))
 				{
 					instrument.guid = new byte[16];
-					chunk.read(instrument.guid);	
+					chunk.readFully(instrument.guid);	
 				}
 				if(format.equals("insh"))
 				{
@@ -559,7 +563,7 @@ public class DLSSoundbank implements Sou
 		long size = riff.readUnsignedInt();
 		long count = riff.readUnsignedInt();
 		
-		if(size - 8 != 0) riff.skip(size - 8);
+		if(size - 8 != 0) riff.skipBytes(size - 8);
 
 		for (int i = 0; i < count; i++) {
 			
@@ -579,7 +583,7 @@ public class DLSSoundbank implements Sou
 		long size = riff.readUnsignedInt();
 		long count = riff.readUnsignedInt();
 		
-		if(size - 8 != 0) riff.skip(size - 8);
+		if(size - 8 != 0) riff.skipBytes(size - 8);
 
 		for (int i = 0; i < count; i++) {
 			
@@ -686,7 +690,7 @@ public class DLSSoundbank implements Sou
 		
 		if(size > 20)
 		{
-			riff.skip(size - 20);
+			riff.skipBytes(size - 20);
 		}
 		
 		for (int i = 0; i < loops; i++) {
@@ -698,7 +702,7 @@ public class DLSSoundbank implements Sou
 			sampleOptions.loops.add(loop);
 			if(size2 > 16)
 			{
-				riff.skip(size2 - 16);
+				riff.skipBytes(size2 - 16);
 			}			
 		}
 	}
@@ -776,7 +780,7 @@ public class DLSSoundbank implements Sou
 				if(format.equals("dlid"))
 				{
 					sample.guid = new byte[16];
-					chunk.read(sample.guid);	
+					chunk.readFully(sample.guid);	
 				}	
 
 				if(format.equals("fmt "))
@@ -936,7 +940,7 @@ public class DLSSoundbank implements Sou
 		List<Long> offsettable = new ArrayList<Long>(); 
 		for (DLSSample sample : samples) 
 		{
-			offsettable.add(new Long(wvpl.getFilePointer() - off));
+			offsettable.add(Long.valueOf(wvpl.getFilePointer() - off));
 			writeSample(wvpl.writeList("wave"), sample);
 		}
 		
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java	Sun Jun 08 21:21:14 2008 +0200
@@ -49,7 +49,7 @@ import com.sun.media.sound.SF2Soundbank;
  */ 
 public class EmergencySoundbank {
 	
-	public static String[] general_midi_instruments = { 
+	private final static String[] general_midi_instruments = { 
 	"Acoustic Grand Piano",
 	"Bright Acoustic Piano",
 	"Electric Grand Piano",
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java	Sun Jun 08 21:21:14 2008 +0200
@@ -158,7 +158,6 @@ public final class FFT {
 	private final static void calcF2E(int fftFrameSize, double[] data, int i,
 			int nstep, double[] w) {
 		int jmax = nstep;
-		nstep <<= 1;
 		for (int n = 0; n < jmax; n += 2) {
 			double wr = w[i++];
 			double wi = w[i++];
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
@@ -82,23 +82,29 @@ public class JARSoundbankReader extends 
 		URLClassLoader ucl = URLClassLoader.newInstance(new URL[] {url});
 		InputStream stream = ucl.getResourceAsStream("META-INF/services/javax.sound.midi.Soundbank");
 		if(stream == null) return null;
-		BufferedReader r = new BufferedReader(new InputStreamReader(stream));
-		String line = r.readLine();
-		while (line != null) {
-			if (!line.startsWith("#")) {
-				try {
-					Class c = Class.forName(line.trim(), true, ucl);
-					Object o = c.newInstance();
-					if (o instanceof Soundbank) {
-						soundbanks.add((Soundbank)o);
+		try
+		{
+			BufferedReader r = new BufferedReader(new InputStreamReader(stream));
+			String line = r.readLine();
+			while (line != null) {
+				if (!line.startsWith("#")) {
+					try {
+						Class c = Class.forName(line.trim(), true, ucl);
+						Object o = c.newInstance();
+						if (o instanceof Soundbank) {
+							soundbanks.add((Soundbank)o);
+						}
+					} catch (Exception e) {
+						e.printStackTrace();


From mark at klomp.org  Sun Jun  8 15:02:49 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 08 Jun 2008 22:02:49 +0000
Subject: changeset in /hg/icedtea6: Import Gervill CVS source reformatting.
Message-ID: <hg.5a126447fc2c.1212962569.2873452341184383832@icedtea.classpath.org>

changeset 5a126447fc2c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5a126447fc2c
description:
	Import Gervill CVS source reformatting.

	2008-06-08  Mark Wielaard  <mark at klomp.org>

	        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	        Import Gervill CVS source reformatting.

diffstat:

101 files changed, 24535 insertions(+), 25117 deletions(-)
ChangeLog                                                                                    |    5 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java     |  166 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java          | 2014 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java    | 1067 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java        |  488 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java             |  130 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java |   97 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java                      |  206 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java                |  798 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java                 |  607 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java                    |  238 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java                    |  195 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java                |  103 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java             |  139 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                 | 2564 ++--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java           |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java           | 5456 ++++------
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                          | 1500 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java         |   70 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java       |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java           |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java    |  186 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java      |  375 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java              |  641 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java     |  550 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java            |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java         |  254 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java             |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java          |   57 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java                |   75 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java              |  296 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java              |  241 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java    |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java        |   94 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java              |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java        |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java                   |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java               |  237 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java                  |  193 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java        |  148 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java       |  245 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java               |   54 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java               |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java     |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java   |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                   |  599 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java                   |  666 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java              |   53 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java                | 1687 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java          |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java                     |  135 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java               |   69 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java                 |  175 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java                    |  316 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java                    |  403 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                 | 1923 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java           |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java             |  282 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java              |  182 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java        |  731 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java              |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java           |   22 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java              |  101 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java                  | 2949 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java             |  336 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                   |  650 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java                  |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java           |  110 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java        |  572 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                   | 1199 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java               |   85 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java          |  483 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java         |  155 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java                  |  287 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java          |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java         |  146 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java   |  184 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                | 1848 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java      |  324 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java               |  985 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java           |  947 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java          |  435 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java              |  865 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java      |   47 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java     |  948 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java                | 1460 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java           |   60 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java                  |   14 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                 |   29 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java                 |   88 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java                |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java        |    9 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                   |  896 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java             |   41 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java            |  193 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java              | 1897 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java                   |  443 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java                    | 1720 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java     |  566 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java          |  213 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java          |  188 

diffs (truncated from 51710 to 500 lines):

diff -r 94f0c8f3a4aa -r 5a126447fc2c ChangeLog
--- a/ChangeLog	Sun Jun 08 21:21:14 2008 +0200
+++ b/ChangeLog	Sun Jun 08 22:27:05 2008 +0200
@@ -1,3 +1,8 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill CVS source reformatting.
+
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
diff -r 94f0c8f3a4aa -r 5a126447fc2c overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 22:27:05 2008 +0200
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.media.sound;
 
 import java.io.ByteArrayOutputStream;
@@ -42,98 +41,91 @@ import javax.sound.sampled.UnsupportedAu
 /**
  * Soundbank reader that uses audio files as soundbanks.
  * 
- * @version %I%, %E%
  * @author Karl Helgason
- * 
  */
 public class AudioFileSoundbankReader extends SoundbankReader {
 
-	public Soundbank getSoundbank(URL url) throws InvalidMidiDataException,
-			IOException {
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(url);
-			Soundbank sbk = getSoundbank(ais);
-			ais.close();
-			return sbk;
-		} catch (UnsupportedAudioFileException e) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-	}
+    public Soundbank getSoundbank(URL url) 
+            throws InvalidMidiDataException, IOException {
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(url);
+            Soundbank sbk = getSoundbank(ais);
+            ais.close();
+            return sbk;
+        } catch (UnsupportedAudioFileException e) {
+            return null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
 
-	public Soundbank getSoundbank(InputStream stream)
-			throws InvalidMidiDataException, IOException {
+    public Soundbank getSoundbank(InputStream stream)
+            throws InvalidMidiDataException, IOException {
+        stream.mark(512);
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(stream);
+            Soundbank sbk = getSoundbank(ais);
+            if (sbk != null)
+                return sbk;
+        } catch (UnsupportedAudioFileException e) {
+        } catch (IOException e) {
+        }
+        stream.reset();
+        return null;
+    }
 
-		stream.mark(512);
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(stream);
-			Soundbank sbk = getSoundbank(ais);
-			if (sbk != null)
-				return sbk;
-		} catch (UnsupportedAudioFileException e) {
-		} catch (IOException e) {
-		}
-		stream.reset();
-		return null;
-	}
+    public Soundbank getSoundbank(AudioInputStream ais)
+            throws InvalidMidiDataException, IOException {
+        try {
+            byte[] buffer;
+            if (ais.getFrameLength() == -1) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buff = new byte[1024 
+                        - (1024 % ais.getFormat().getFrameSize())];
+                int ret;
+                while ((ret = ais.read(buff)) != -1) {
+                    baos.write(buff, 0, ret);
+                }
+                ais.close();
+                buffer = baos.toByteArray();
+            } else {
+                buffer = new byte[(int) (ais.getFrameLength() 
+                                    * ais.getFormat().getFrameSize())];
+                new DataInputStream(ais).readFully(buffer);
+            }
+            ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+                    new ModelByteBuffer(buffer), ais.getFormat(), -4800);
+            ModelPerformer performer = new ModelPerformer();
+            performer.getOscillators().add(osc);
 
-	public Soundbank getSoundbank(AudioInputStream ais)
-			throws InvalidMidiDataException, IOException {
+            SimpleSoundbank sbk = new SimpleSoundbank();
+            SimpleInstrument ins = new SimpleInstrument();
+            ins.add(performer);
+            sbk.addInstrument(ins);
+            return sbk;
+        } catch (Exception e) {
+            return null;
+        }
+    }
 
-		try {
-			byte[] buffer;
-			if (ais.getFrameLength() == -1) {
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				byte[] buff = new byte[1024 - (1024 % ais.getFormat()
-						.getFrameSize())];
-				int ret;
-				while ((ret = ais.read(buff)) != -1)
-					baos.write(buff, 0, ret);
-				ais.close();
-				buffer = baos.toByteArray();
-			} else {
-				buffer = new byte[(int) (ais.getFrameLength() * ais.getFormat()
-						.getFrameSize())];
-				new DataInputStream(ais).readFully(buffer);
-			}
-			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-					new ModelByteBuffer(buffer), ais.getFormat(), -4800);
-			ModelPerformer performer = new ModelPerformer();
-			;
-			performer.getOscillators().add(osc);
-
-			SimpleSoundbank sbk = new SimpleSoundbank();
-			SimpleInstrument ins = new SimpleInstrument();
-			ins.add(performer);
-			sbk.addInstrument(ins);
-			return sbk;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public Soundbank getSoundbank(File file) throws InvalidMidiDataException,
-			IOException {
-
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(file);
-			ais.close();
-			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-					new ModelByteBuffer(file, 0, file.length()), -4800);
-			ModelPerformer performer = new ModelPerformer();
-			performer.getOscillators().add(osc);
-			SimpleSoundbank sbk = new SimpleSoundbank();
-			SimpleInstrument ins = new SimpleInstrument();
-			ins.add(performer);
-			sbk.addInstrument(ins);
-			return sbk;
-		} catch (UnsupportedAudioFileException e1) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-
-	}
-
+    public Soundbank getSoundbank(File file) 
+            throws InvalidMidiDataException, IOException {
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(file);
+            ais.close();
+            ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+                    new ModelByteBuffer(file, 0, file.length()), -4800);
+            ModelPerformer performer = new ModelPerformer();
+            performer.getOscillators().add(osc);
+            SimpleSoundbank sbk = new SimpleSoundbank();
+            SimpleInstrument ins = new SimpleInstrument();
+            ins.add(performer);
+            sbk.addInstrument(ins);
+            return sbk;
+        } catch (UnsupportedAudioFileException e1) {
+            return null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
 }
diff -r 94f0c8f3a4aa -r 5a126447fc2c overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 21:21:14 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 22:27:05 2008 +0200
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.media.sound;
 
 import java.nio.ByteBuffer;
@@ -37,1006 +36,1023 @@ import javax.sound.sampled.AudioFormat.E
  * This class is used to convert between 8,16,24,32,32+ bit signed/unsigned
  * big/litle endian fixed/floating point byte buffers and float buffers.
  * 
- * @version %I%, %E%
  * @author Karl Helgason
  */
-
 public abstract class AudioFloatConverter {
 
-	public static final Encoding PCM_FLOAT = new Encoding("PCM_FLOAT");
-	
-	/***************************************************************************
-	 * 
-	 * LSB Filter, used filter least significant byte in samples arrays.
-	 * 
-	 * Is used filter out data in lsb byte 
-	 * when SampleSizeInBits is not dividable by 8.
-	 * 
-	 **************************************************************************/
-	
-	private static class AudioFloatLSBFilter extends AudioFloatConverter {
-		
-		private AudioFloatConverter converter;
-		final private int offset;
-		final private int stepsize;
-		final private byte mask;		
-		private byte[] mask_buffer;
-		
-		public AudioFloatLSBFilter(AudioFloatConverter converter, AudioFormat format)
-		{
-			int bits = format.getSampleSizeInBits();
-			boolean bigEndian = format.isBigEndian();
-			this.converter = converter;
-			stepsize = (bits + 7) / 8;
-			offset = bigEndian?(stepsize - 1):0;
-			int lsb_bits = bits % 8;
-			if(lsb_bits == 0) mask = (byte)0x00;
-			else if(lsb_bits == 1) mask = (byte)0x80;
-			else if(lsb_bits == 2) mask = (byte)0xC0;
-			else if(lsb_bits == 3) mask = (byte)0xE0;
-			else if(lsb_bits == 4) mask = (byte)0xF0;
-			else if(lsb_bits == 5) mask = (byte)0xF8;
-			else if(lsb_bits == 6) mask = (byte)0xFC;
-			else if(lsb_bits == 7) mask = (byte)0xFE;
-			else mask = (byte)0xFF;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, byte[] out_buff, int out_offset) {
-			byte[] ret = converter.toByteArray(in_buff, in_offset, in_len, out_buff, out_offset);
-			
-			int out_offset_end = in_len*stepsize;
-			for (int i = out_offset+offset; i < out_offset_end; i+=stepsize) {
-				out_buff[i] = (byte)(out_buff[i] & mask); 
-			}
-			
-			return ret;
-		}
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset, float[] out_buff, int out_offset, int out_len) {
-			if(mask_buffer == null || mask_buffer.length < in_buff.length)
-				mask_buffer = new byte[in_buff.length];
-			System.arraycopy(in_buff, 0, mask_buffer, 0, in_buff.length);
-			int in_offset_end = out_len*stepsize;
-			for (int i = in_offset+offset; i < in_offset_end; i+=stepsize) {
-				mask_buffer[i] = (byte)(mask_buffer[i] & mask); 
-			}
-			float[] ret = converter.toFloatArray(mask_buffer, in_offset, out_buff, out_offset, out_len);
-			return ret;
-		}
-		
-	}
-	
-	/***************************************************************************
-	 * 
-	 * 64 bit float, little/big-endian
-	 * 
-	 **************************************************************************/
-
-	// PCM 64 bit float, little-endian
-	private static class AudioFloatConversion64L extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		DoubleBuffer floatbuffer = null;
-		double[] double_buff = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			if(double_buff == null || double_buff.length < out_len+out_offset)
-				double_buff = new double[out_len+out_offset];
-			floatbuffer.get(double_buff, out_offset, out_len);
-			int out_offset_end = out_offset + out_len;
-			for (int i = out_offset; i < out_offset_end; i++) {
-				out_buff[i] = (float)double_buff[i];
-			}
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			if(double_buff == null || double_buff.length < in_offset+in_len)
-				double_buff = new double[in_offset+in_len];
-			int in_offset_end = in_offset+in_len;
-			for (int i = in_offset; i < in_offset_end; i++) {
-				double_buff[i] = in_buff[i];
-			}			
-			floatbuffer.put(double_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	// PCM 64 bit float, big-endian
-	private static class AudioFloatConversion64B extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		DoubleBuffer floatbuffer = null;
-		double[] double_buff = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			if(double_buff == null || double_buff.length < out_len+out_offset)
-				double_buff = new double[out_len+out_offset];
-			floatbuffer.get(double_buff, out_offset, out_len);
-			int out_offset_end = out_offset + out_len;
-			for (int i = out_offset; i < out_offset_end; i++) {
-				out_buff[i] = (float)double_buff[i];
-			}
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			if(double_buff == null || double_buff.length < in_offset+in_len)
-				double_buff = new double[in_offset+in_len];
-			int in_offset_end = in_offset+in_len;
-			for (int i = in_offset; i < in_offset_end; i++) {
-				double_buff[i] = in_buff[i];
-			}						
-			floatbuffer.put(double_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	/***************************************************************************
-	 * 
-	 * 32 bit float, little/big-endian
-	 * 
-	 **************************************************************************/
-
-	// PCM 32 bit float, little-endian
-	private static class AudioFloatConversion32L extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		FloatBuffer floatbuffer = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			floatbuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			floatbuffer.put(in_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	// PCM 32 bit float, big-endian
-	private static class AudioFloatConversion32B extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		FloatBuffer floatbuffer = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			floatbuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			floatbuffer.put(in_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	/***************************************************************************
-	 * 
-	 * 8 bit signed/unsigned
-	 * 
-	 **************************************************************************/
-
-	// PCM 8 bit, signed
-	private static class AudioFloatConversion8S extends AudioFloatConverter {
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int ix = in_offset;
-			int ox = out_offset;
-			for (int i = 0; i < out_len; i++)
-				out_buff[ox++] = in_buff[ix++] * (1.0f / 127.0f);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int ix = in_offset;
-			int ox = out_offset;
-			for (int i = 0; i < in_len; i++)
-				out_buff[ox++] = (byte) (in_buff[ix++] * 127.0f);
-			return out_buff;
-		}
-	}
-
-	// PCM 8 bit, unsigned
-	private static class AudioFloatConversion8U extends AudioFloatConverter {


From mark at klomp.org  Sun Jun  8 15:02:45 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 08 Jun 2008 22:02:45 +0000
Subject: changeset in /hg/icedtea6: Add hotspot eclipse crasher patch fix...
Message-ID: <hg.e4b644655e78.1212962565.2873452341184383832@icedtea.classpath.org>

changeset e4b644655e78 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e4b644655e78
description:
	Add hotspot eclipse crasher patch fix for sun bu #6614100.

	2008-06-08  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (ZERO_PATCHES): Add
	       patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
	       (NON_ZERO_PATCHES): New patch list.
	       (ZERO_PATCHES_COND): Use new NON_ZERO_PATCHES list when necessary.
	       * Makefile.in: Regenerate.
	       * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
	       * patches/icedtea-eclipse-hotspot-6614100-6b06.patch: New patch.

diffstat:

5 files changed, 159 insertions(+), 5 deletions(-)
ChangeLog                                          |   10 ++
Makefile.am                                        |    9 +-
Makefile.in                                        |   12 ++-
patches/icedtea-eclipse-hotspot-6614100-6b06.patch |   56 ++++++++++++++
patches/icedtea-eclipse-hotspot-6614100-7b24.patch |   77 ++++++++++++++++++++

diffs (203 lines):

diff -r 37c853f39fe3 -r e4b644655e78 ChangeLog
--- a/ChangeLog	Mon Jun 02 00:35:24 2008 +0200
+++ b/ChangeLog	Sun Jun 08 18:51:47 2008 +0200
@@ -1,3 +1,13 @@ 2008-06-01  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (ZERO_PATCHES): Add
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
+	(NON_ZERO_PATCHES): New patch list.
+	(ZERO_PATCHES_COND): Use new NON_ZERO_PATCHES list when necessary.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
+	* patches/icedtea-eclipse-hotspot-6614100-6b06.patch: New patch.
+
 2008-06-01  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
diff -r 37c853f39fe3 -r e4b644655e78 Makefile.am
--- a/Makefile.am	Mon Jun 02 00:35:24 2008 +0200
+++ b/Makefile.am	Sun Jun 08 18:51:47 2008 +0200
@@ -259,12 +259,17 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
 
 if ZERO_BUILD
   ZERO_PATCHES_COND = $(ZERO_PATCHES)
 else
-  ZERO_PATCHES_COND = 
+  ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
 endif
 
 ICEDTEA_PATCHES = \
diff -r 37c853f39fe3 -r e4b644655e78 Makefile.in
--- a/Makefile.in	Mon Jun 02 00:35:24 2008 +0200
+++ b/Makefile.in	Sun Jun 08 18:51:47 2008 +0200
@@ -378,9 +378,15 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
diff -r 37c853f39fe3 -r e4b644655e78 patches/icedtea-eclipse-hotspot-6614100-6b06.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-eclipse-hotspot-6614100-6b06.patch	Sun Jun 08 18:51:47 2008 +0200
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User never
+# Date 1212727493 25200
+# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
+# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
+6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
+Reviewed-by: kvn, jrose, rasbold
+
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
+@@ -1551,45 +1551,6 @@
+     if (opt != NULL)  return opt;
+   }
+ 
+-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
+-    // Try to undo Phi of AddP:
+-    //   (Phi (AddP base base y) (AddP base2 base2 y))
+-    // becomes:
+-    //   newbase := (Phi base base2)
+-    //   (AddP newbase newbase y)
+-    //
+-    // This occurs as a result of unsuccessful split_thru_phi and
+-    // interferes with taking advantage of addressing modes.  See the
+-    // clone_shift_expressions code in matcher.cpp
+-    Node* addp = in(1);
+-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
+-    Node* y = addp->in(AddPNode::Offset);
+-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
+-      // make sure that all the inputs are similar to the first one,
+-      // i.e. AddP with base == address and same offset as first AddP
+-      bool doit = true;
+-      for (uint i = 2; i < req(); i++) {
+-        if (in(i) == NULL ||
+-            in(i)->Opcode() != Op_AddP ||
+-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
+-            in(i)->in(AddPNode::Offset) != y) {
+-          doit = false;
+-          break;
+-        }
+-        // Accumulate type for resulting Phi
+-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
+-      }
+-      if (doit) {
+-        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
+-        for (uint i = 1; i < req(); i++) {
+-          base->init_req(i, in(i)->in(AddPNode::Base));
+-        }
+-        phase->is_IterGVN()->register_new_node_with_optimizer(base);
+-        return new (phase->C, 4) AddPNode(base, base, y);
+-      }
+-    }
+-  }
+-
+   // Split phis through memory merges, so that the memory merges will go away.
+   // Piggy-back this transformation on the search for a unique input....
+   // It will be as if the merged memory is the unique value of the phi.
diff -r 37c853f39fe3 -r e4b644655e78 patches/icedtea-eclipse-hotspot-6614100-7b24.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-eclipse-hotspot-6614100-7b24.patch	Sun Jun 08 18:51:47 2008 +0200
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User never
+# Date 1212727493 25200
+# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
+# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
+6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
+Reviewed-by: kvn, jrose, rasbold
+
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	Thu Jun 05 15:43:18 2008 -0700
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	Thu Jun 05 21:44:53 2008 -0700
+@@ -1621,64 +1621,6 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bo
+     if (opt != NULL)  return opt;
+   }
+ 
+-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
+-    // Try to undo Phi of AddP:
+-    //   (Phi (AddP base base y) (AddP base2 base2 y))
+-    // becomes:
+-    //   newbase := (Phi base base2)
+-    //   (AddP newbase newbase y)
+-    //
+-    // This occurs as a result of unsuccessful split_thru_phi and
+-    // interferes with taking advantage of addressing modes.  See the
+-    // clone_shift_expressions code in matcher.cpp
+-    Node* addp = in(1);
+-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
+-    Node* y = addp->in(AddPNode::Offset);
+-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
+-      // make sure that all the inputs are similar to the first one,
+-      // i.e. AddP with base == address and same offset as first AddP
+-      bool doit = true;
+-      for (uint i = 2; i < req(); i++) {
+-        if (in(i) == NULL ||
+-            in(i)->Opcode() != Op_AddP ||
+-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
+-            in(i)->in(AddPNode::Offset) != y) {
+-          doit = false;
+-          break;
+-        }
+-        // Accumulate type for resulting Phi
+-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
+-      }
+-      Node* base = NULL;
+-      if (doit) {
+-        // Check for neighboring AddP nodes in a tree.
+-        // If they have a base, use that it.
+-        for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) {
+-          Node* u = this->fast_out(k);
+-          if (u->is_AddP()) {
+-            Node* base2 = u->in(AddPNode::Base);
+-            if (base2 != NULL && !base2->is_top()) {
+-              if (base == NULL)
+-                base = base2;
+-              else if (base != base2)
+-                { doit = false; break; }
+-            }
+-          }
+-        }
+-      }
+-      if (doit) {
+-        if (base == NULL) {
+-          base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
+-          for (uint i = 1; i < req(); i++) {
+-            base->init_req(i, in(i)->in(AddPNode::Base));
+-          }
+-          phase->is_IterGVN()->register_new_node_with_optimizer(base);
+-        }
+-        return new (phase->C, 4) AddPNode(base, base, y);
+-      }
+-    }
+-  }
+-
+   // Split phis through memory merges, so that the memory merges will go away.
+   // Piggy-back this transformation on the search for a unique input....
+   // It will be as if the merged memory is the unique value of the phi.
+


From mark at klomp.org  Sun Jun  8 15:23:48 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 09 Jun 2008 00:23:48 +0200
Subject: New Gervill imported (Was: OpenJDK 6 b10 source posted)
In-Reply-To: <1212571525.3172.11.camel@dijkstra.wildebeest.org>
References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>
	<1212571525.3172.11.camel@dijkstra.wildebeest.org>
Message-ID: <1212963828.3111.23.camel@dijkstra.wildebeest.org>

Hi Karl,

On Wed, 2008-06-04 at 11:25 +0200, Mark Wielaard wrote:
> On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote:
> Thanks for checking. These are all in the icedtea gervill overlay also.
> I'll make sure to upgrade to the latest CVS version in which I see you
> fixed some of the other issues I reported.
> 
> > The code was also slightly reformatted:
> > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK
> > sources);
> > b) line indention (to make lines no longer than 80 symbols);
> > c) tabs to spaces conversion;
> > 
> > I will look into to reformat newest Gervill CVS code the same way.
> 
> That would be great. Since 0.9 there have been lots of changes and fixes
> (which is why icedtea tracks your CVS tree and didn't use the old 0.9
> code). Would it be a good idea to do a new version upgrade after syncing
> the sources and reformatting to celebrate the inclusion?

Thanks a lot for you fixes and the reformatting. I imported the new
Gervill from CVS in two parts. First everything up to June 1st. Second
the reformatting itself. That way it should be easy to follow what
changed.

2008-08-08  Mark Wielaard  <mark at klomp.org>

       * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
       Import Gervill fixes from CVS. See CHANGES.txt.
       * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.

        - Cleanup: Make inner classes static
        
        AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
        
        AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
        
        AudioFloatFormatConverter.AudioFloatInputStreamResampler
                 SimpleInstrument.SimpleInstrumentPart
                 SoftChorus.VariableDelay
                 SoftChorus.LFODelay
                 SoftMixingDataLine.AudioFloatInputStreamResampler
                 SoftMixingSourceDataLine.NonBlockingFloatInputStream
                 SoftReverb.AllPass
                 SoftReverb.Comb
                 SoftReverb.Delay
        - Cleanup: Remove unused fields in:
                 SoftSincResampler.din, SoftLanczosResampler.din,
                 SoftMainMixer.finetuning,  SoftMainMixer.coarsetuning
                 SoftJitterCorrector.JitterStream.nullbuff,
                 SoftAbstractResampler.ModelAbstractResampler.loopread
        
        SoftAbstractResampler.ModelAbstractResampler.streammarked
        - Cleanup: Remove dead code from FFT.
        - Cleanup: Make constant fields in SoftFilter final.
        - Cleanup: Let SoftSynthesizer.info be final.
        - Cleanup: Let SoftProvider.info be final.
        - Fix: Unnecessary call to sourceDataLine.drain() in
        SoftSynthesizer
               causes random hangs in SoftSynthesizer.open jtreg test.
               This happens when the synthesizer is opened and right
        after closed.
               This will not happen if there is a delay between open and
        close call.
        - Fix: ModelByteBufferAudioFileSoundbankReader,
               SoftAudioPusher, SoftJitterCorrector
               don't ignore stream.read return value.
        - Fix: NullPointerException in
               SoftSynthesizer.unloadInstrument if instrument = null
        - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close
        stream.
        - Fix: Futile attempts to guard buffers variable in
        SoftJitterCorrector.
        - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use
        readfully instead of read
               when reading from stream.
               JTreg tests where created to test for this.

I like these cleanups. Your fix for the jtreg resources was nicer than
mine, so I dropped the icedtea one. I did take your change to the tests
needing a samplerate and controlrate argument to init the SoftLimiter to
just pass the constant values 44100 and 147. I also made the
SoftSynthesizer.getControlRate() protected again. I can kind of
understand using these constants in the tests. Although I find getting
them from the synthesizer nicer.

Is there a reason the control rate is always hardcoded to 147? There
actually doesn't seem to be any way to change it since the property info
always sets it explicitly.

With this there are only a few minor differences left between gervill
CVS and the icedtea overlay. I have attached the diff.


2008-06-08  Mark Wielaard  <mark at klomp.org>

        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
        Import Gervill CVS source reformatting.

For the interested I have attached the current diff between the
gervil/cvs/icedtea/overlay version and what is in openjdk6-b10.
(Note that line endings are different, openjdk6 uses CRLF, which is
disregarded when creating the diff.)

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gervill-icedtea-changes.diff
Type: text/x-patch
Size: 3012 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080609/3db18327/gervill-icedtea-changes.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-gervil-openjdk-b10.diff.gz
Type: application/x-gzip
Size: 14642 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080609/3db18327/icedtea-gervil-openjdk-b10.diff.gz 

From mark at klomp.org  Sun Jun  8 15:40:54 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 09 Jun 2008 00:40:54 +0200
Subject: Add hotspot eclipse crasher patch
Message-ID: <1212964854.3111.36.camel@dijkstra.wildebeest.org>

Hi,

This adds the hotspot eclipse crasher patch that many people seem to
have encountered.
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100

Since our build selects a different hotspot depending on whether we
build with zero or not there are two copies of the patch (unfortunately
all files were reformatted between the 6b06 and 7b24 hotspot).

2008-06-08  Mark Wielaard  <mark at klomp.org>

   * Makefile.am (ZERO_PATCHES): Add
   patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
   (NON_ZERO_PATCHES): New patch list.
   (ZERO_PATCHES_COND): Use new NON_ZERO_PATCHES list when necessary.
   * Makefile.in: Regenerate.
   * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
   * patches/icedtea-eclipse-hotspot-6614100-6b06.patch: New patch.

Extra testing appreciated. This should make the eclipse workarounds that
some distros are adding (-XX:CompileCommand=exclude,...) unnecessary.

If there are other crasher bug fixes since hotspot 6b06 and/or 7b24 that
would benefit a lot of people please point them out, test them and
suggest them for inclusion.

Thanks,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: eclipse-hotspot-crasher.patch
Type: text/x-patch
Size: 7544 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080609/1867d446/eclipse-hotspot-crasher.patch 

From bugzilla-daemon at icedtea.classpath.org  Sun Jun  8 16:38:46 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 08 Jun 2008 23:38:46 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1K5UTG-00086w-4g@icedtea.classpath.org>

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





------- Comment #9 from gnu_andrew at member.fsf.org  2008-06-08 23:38 -------
This is now complete.  I'll roll it into a patch against IcedTea shortly.


-- 
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 dennis at ausil.us  Sun Jun  8 17:22:35 2008
From: dennis at ausil.us (Dennis Gilmore)
Date: Sun, 8 Jun 2008 19:22:35 -0500
Subject: [patch] updated sparc support
Message-ID: <200806081922.41672.dennis@ausil.us>

The attached patches allow openjdk to build for both sparc64 and sparc32 on 
linux.  they were written by Tom "spot" Callaway.

As a breakdown, here is what these patches do (they should all be
applicable upstream):

java-1.6.0-openjdk-sparc-ptracefix.patch:
 Rather than source asm-sparc/ptrace.h (on pure 32bit sparc userland,  
 asm-sparc/ doesn't exist, only asm/), I simply include the pt_regs 
 struct that sparc and sparc64 use. Only affects sparc and sparc64.

java-1.6.0-openjdk-sparc-trapsfix.patch:
 On pure 32bit sparc userland (kernel-headers.sparc), asm-sparc/ 
 doesn't exist, but asm/ does. On pure 64bit sparc64 userland 
 (kernel-headers.sparc64), asm-sparc and asm-sparc64 exist. Still with 
 me? :) We need the traps define from asm-sparc on both sparc and 
 sparc64 compiles (there is no traps.h in asm-sparc64), so this patch
 fixes it such that we get the right header included in both scenarios. 
 Only affects sparc and sparc64. 

java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch:
 Sun uses the term "sparcv9" to describe a 64bit sparc environment.  
 This is ok on Solaris, but on Linux, we use "sparc64" to describe a 
 64bit sparc environment. For 99% of the uses inside openJDK this is 
 fine, but when bootstrapping off gcj, it makes symlinks to a 
 non-existent jvm dir called "sparcv9". This patch adds another 
 configure variable called "JRE_ARCH_DIR" which is the same as 
 "INSTALL_ARCH_DIR" for all other arches except sparcv9 (where   
 JRE_ARCH_DIR is set to sparc64). This patch might need to be 
 conditionalized for bootstrapping only, not sure yet as I haven't  
 done a non-bootstrap build for sparc64 yet. No behavior change for 
 non-sparc/sparc64 architectures.

java-1.6.0-openjdk-sparc64-linux.patch:
 Adds a sparcv9.make makefile for 64bit (sparc64). Fixes two bugs  
 inside c1_LIRGenerator_sparc.cpp, one where int conversion wasn't 
 correct on sparc64 and one where it called non-existant functions on 
 sparc64. store_mem_reg and load_mem_reg might be defined for Solaris, 
 but I couldn't find them defined in the source tree at all, so I \ 
 assumed they were not-yet-implemented. Fixed 
 hotspot/build/linux/makefiles/defs.make to more cleanly handle 
 sparc/sparc64 cases. Only affects sparc and sparc64.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch
Type: text/x-diff
Size: 3465 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080608/3e3d25a2/java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: java-1.6.0-openjdk-sparc-ptracefix.patch
Type: text/x-diff
Size: 1099 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080608/3e3d25a2/java-1.6.0-openjdk-sparc-ptracefix.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: java-1.6.0-openjdk-sparc64-linux.patch
Type: text/x-diff
Size: 3860 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080608/3e3d25a2/java-1.6.0-openjdk-sparc64-linux.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: java-1.6.0-openjdk-sparc-trapsfix.patch
Type: text/x-diff
Size: 984 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080608/3e3d25a2/java-1.6.0-openjdk-sparc-trapsfix.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080608/3e3d25a2/attachment.bin 

From gnu_andrew at member.fsf.org  Sun Jun  8 18:15:13 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 9 Jun 2008 02:15:13 +0100
Subject: FYI: Port out-of-dir build fixes from IcedTea to IcedTea6
Message-ID: <20080609011513.GA32479@rivendell.middle-earth.co.uk>

This adds the out-of-dir build fixes I made to IcedTea
to the IcedTea6 tree.

ChangeLog:

2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am: Fix implicit directory paths
	and use of abs_top_srcdir where abs_top_builddir is
	meant, so build works outside the source directory.
	Also ensure JAVAC is unset during the OpenJDK build.
	* Makefile.in: Regenerated.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 5a126447fc2c Makefile.am
--- a/Makefile.am	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.am	Mon Jun 09 02:12:45 2008 +0100
@@ -53,13 +53,13 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 if CORE_BUILD
@@ -81,7 +81,7 @@ ICEDTEA_ENV = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -102,7 +102,8 @@ ICEDTEA_ENV = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -126,9 +127,9 @@ env:
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -138,7 +139,7 @@ ICEDTEA_ENV_ECJ = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -165,7 +166,8 @@ ICEDTEA_ENV_ECJ = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -225,18 +227,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -344,10 +346,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -367,10 +369,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -380,7 +382,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -399,24 +401,24 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -447,7 +449,7 @@ clean-patch-ecj:
 # 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
+	ln -s $(abs_top_builddir)/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
@@ -523,16 +525,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f $(abs_top_builddir)/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; \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f $(abs_top_builddir)/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; \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
@@ -592,10 +594,10 @@ icedtea: stamps/bootstrap-directory-syml
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -615,10 +617,10 @@ icedtea-debug: stamps/bootstrap-director
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
@@ -758,34 +760,34 @@ OPENJDK_SOURCEPATH_DIRS = \
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
+
 	mkdir -p stamps
 	touch stamps/hotspot-tools-copy-source-files.stamp
 
@@ -799,12 +801,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -832,13 +834,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	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; \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
- 
+
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
@@ -846,15 +848,15 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
-	cp -r rt/net/sourceforge/jnlp/resources \
+	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch stamps/rt-class-files.stamp
@@ -882,7 +884,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 # extras -- used to create about.jar for javaws.
 extra-source-files.txt:
-	find extra -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -891,7 +893,7 @@ stamps/extra-class-files.stamp: extra-so
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
- 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -899,7 +901,7 @@ stamps/extra-class-files.stamp: extra-so
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
-	cp -r extra/net/sourceforge/jnlp/about/resources \
+	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
 	touch $@
diff -r 5a126447fc2c Makefile.in
--- a/Makefile.in	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.in	Mon Jun 09 02:12:45 2008 +0100
@@ -270,16 +270,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 
 ICEDTEA_BOOT_DIR = \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -294,7 +294,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -312,15 +312,15 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
@@ -328,7 +328,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/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)" \
@@ -352,7 +352,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -818,18 +818,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -853,10 +853,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -875,10 +875,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -888,7 +888,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -907,18 +907,18 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
@@ -952,7 +952,7 @@ clean-patch-ecj:
 # 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
+	ln -s $(abs_top_builddir)/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
@@ -1015,16 +1015,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f $(abs_top_builddir)/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; \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	if test -f $(abs_top_builddir)/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; \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
@@ -1062,10 +1062,10 @@ icedtea: stamps/bootstrap-directory-syml
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -1085,10 +1085,10 @@ icedtea-debug: stamps/bootstrap-director
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
@@ -1198,28 +1198,28 @@ clean-copy:
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
 
-	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
 
-	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
 
-	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
@@ -1239,12 +1239,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -1272,13 +1272,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	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; \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
@@ -1286,15 +1286,15 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
-	cp -r rt/net/sourceforge/jnlp/resources \
+	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch stamps/rt-class-files.stamp
@@ -1322,7 +1322,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 # extras -- used to create about.jar for javaws.
 extra-source-files.txt:
-	find extra -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -1331,7 +1331,7 @@ stamps/extra-class-files.stamp: extra-so
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
- 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -1339,7 +1339,7 @@ stamps/extra-class-files.stamp: extra-so
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
-	cp -r extra/net/sourceforge/jnlp/about/resources \
+	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
 	touch $@

From gnu_andrew at member.fsf.org  Sun Jun  8 18:15:54 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 09 Jun 2008 01:15:54 +0000
Subject: changeset in /hg/icedtea6: Allow build to take place outside the...
Message-ID: <hg.f05bf5526474.1212974154.2873452341184383832@icedtea.classpath.org>

changeset f05bf5526474 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f05bf5526474
description:
	Allow build to take place outside the source directory.

diffstat:

3 files changed, 136 insertions(+), 126 deletions(-)
ChangeLog   |    8 +++
Makefile.am |  134 +++++++++++++++++++++++++++++------------------------------
Makefile.in |  120 ++++++++++++++++++++++++++--------------------------

diffs (truncated from 704 to 500 lines):

diff -r 5a126447fc2c -r f05bf5526474 ChangeLog
--- a/ChangeLog	Sun Jun 08 22:27:05 2008 +0200
+++ b/ChangeLog	Mon Jun 09 02:15:28 2008 +0100
@@ -1,3 +1,11 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Fix implicit directory paths
+	and use of abs_top_srcdir where abs_top_builddir is
+	meant, so build works outside the source directory.
+	Also ensure JAVAC is unset during the OpenJDK build.
+	* Makefile.in: Regenerated.
+	
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
diff -r 5a126447fc2c -r f05bf5526474 Makefile.am
--- a/Makefile.am	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.am	Mon Jun 09 02:15:28 2008 +0100
@@ -53,13 +53,13 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 if CORE_BUILD
@@ -81,7 +81,7 @@ ICEDTEA_ENV = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -102,7 +102,8 @@ ICEDTEA_ENV = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -126,9 +127,9 @@ env:
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -138,7 +139,7 @@ ICEDTEA_ENV_ECJ = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -165,7 +166,8 @@ ICEDTEA_ENV_ECJ = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -225,18 +227,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -344,10 +346,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -367,10 +369,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -380,7 +382,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -399,24 +401,24 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -447,7 +449,7 @@ clean-patch-ecj:
 # 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
+	ln -s $(abs_top_builddir)/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
@@ -523,16 +525,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	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 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; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
@@ -592,10 +594,10 @@ icedtea: stamps/bootstrap-directory-syml
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -615,10 +617,10 @@ icedtea-debug: stamps/bootstrap-director
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
@@ -758,34 +760,34 @@ OPENJDK_SOURCEPATH_DIRS = \
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
+
 	mkdir -p stamps
 	touch stamps/hotspot-tools-copy-source-files.stamp
 
@@ -799,12 +801,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -832,13 +834,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	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
- 
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
@@ -846,15 +848,15 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
-	cp -r rt/net/sourceforge/jnlp/resources \
+	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch stamps/rt-class-files.stamp
@@ -882,7 +884,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 # extras -- used to create about.jar for javaws.
 extra-source-files.txt:
-	find extra -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -891,7 +893,7 @@ stamps/extra-class-files.stamp: extra-so
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
- 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -899,7 +901,7 @@ stamps/extra-class-files.stamp: extra-so
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
-	cp -r extra/net/sourceforge/jnlp/about/resources \
+	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
 	touch $@
diff -r 5a126447fc2c -r f05bf5526474 Makefile.in
--- a/Makefile.in	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.in	Mon Jun 09 02:15:28 2008 +0100
@@ -270,16 +270,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 
 ICEDTEA_BOOT_DIR = \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -294,7 +294,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -312,15 +312,15 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
@@ -328,7 +328,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/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)" \
@@ -352,7 +352,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -818,18 +818,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -853,10 +853,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -875,10 +875,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -888,7 +888,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp


From jsumali at redhat.com  Mon Jun  9 13:15:52 2008
From: jsumali at redhat.com (Joshua Sumali)
Date: Mon, 09 Jun 2008 20:15:52 +0000
Subject: changeset in /hg/icedtea6: 2008-06-09  Joshua Sumali  <jsumali@r...
Message-ID: <hg.f1c286afb8fa.1213042552.2873452341184383832@icedtea.classpath.org>

changeset f1c286afb8fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f1c286afb8fa
description:
	2008-06-09  Joshua Sumali  <jsumali at redhat.com>

	        * rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
	        starting the application.
	        * rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
	        dashes in xml comments.
	        (sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
	        (expectedInput(String, char)): New method.

diffstat:

3 files changed, 146 insertions(+), 6 deletions(-)
ChangeLog                                  |    9 ++
rt/net/sourceforge/jnlp/Parser.java        |   23 ++++-
rt/net/sourceforge/nanoxml/XMLElement.java |  120 +++++++++++++++++++++++++++-

diffs (216 lines):

diff -r f05bf5526474 -r f1c286afb8fa ChangeLog
--- a/ChangeLog	Mon Jun 09 02:15:28 2008 +0100
+++ b/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
@@ -1,3 +1,12 @@ 2008-06-09  Andrew John Hughes  <gnu_and
+2008-06-09  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
+	starting the application.
+	* rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
+	dashes in xml comments.
+	(sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
+	(expectedInput(String, char)): New method.
+
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am: Fix implicit directory paths
diff -r f05bf5526474 -r f1c286afb8fa rt/net/sourceforge/jnlp/Parser.java
--- a/rt/net/sourceforge/jnlp/Parser.java	Mon Jun 09 02:15:28 2008 +0100
+++ b/rt/net/sourceforge/jnlp/Parser.java	Mon Jun 09 16:15:29 2008 -0400
@@ -946,10 +946,27 @@ class Parser {
             */
 
             /* NANO */
-            XMLElement xml = new XMLElement();
-            xml.parseFromReader(new InputStreamReader(input));
+            final XMLElement xml = new XMLElement();
+            final PipedInputStream pin = new PipedInputStream();
+            final PipedOutputStream pout = new PipedOutputStream(pin);
+            final InputStreamReader isr = new InputStreamReader(input);
+            
+            // Clean the jnlp xml file of all comments before passing
+            // it to the parser.
+            new Thread(
+                new Runnable(){
+                    public void run(){
+                        (new XMLElement()).sanitizeInput(isr, pout);
+                        try {
+                            pout.close();
+                        } catch (IOException ioe) {
+                            ioe.printStackTrace();
+                        }
+                    }
+                }
+            ).start();
+            xml.parseFromReader(new InputStreamReader(pin));
             Node jnlpNode = new Node(xml);
-
             return jnlpNode;
         }
         catch(Exception ex) {
diff -r f05bf5526474 -r f1c286afb8fa rt/net/sourceforge/nanoxml/XMLElement.java
--- a/rt/net/sourceforge/nanoxml/XMLElement.java	Mon Jun 09 02:15:28 2008 +0100
+++ b/rt/net/sourceforge/nanoxml/XMLElement.java	Mon Jun 09 16:15:29 2008 -0400
@@ -32,6 +32,8 @@ package net.sourceforge.nanoxml;
 
 import java.io.*;
 import java.util.*;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
 
 /**
@@ -195,6 +197,10 @@ public class XMLElement
      */
     private char charReadTooMuch;
 
+    /**
+     * Character read too much for the comment remover.
+     */
+    private char sanitizeCharReadTooMuch;
 
     /**
      * The reader provided by the caller of the parse method.
@@ -532,7 +538,7 @@ public class XMLElement
             char ch = this.scanWhitespace();
 
             if (ch != '<') {
-                throw this.expectedInput("<");
+                throw this.expectedInput("<", ch);
             }
 
             ch = this.readChar();
@@ -815,10 +821,24 @@ public class XMLElement
             } else {
                 dashesToRead = 2;
             }
-        }
+
+            // Be more tolerant of extra -- (double dashes)
+            // in comments.
+            if (dashesToRead == 0) {
+                ch = this.readChar();
+                if (ch == '>') {
+                    return;
+                } else {
+                    dashesToRead = 2;
+                    this.unreadChar(ch);
+                }
+            }
+        }
+        /*
         if (this.readChar() != '>') {
             throw this.expectedInput(">");
         }
+        */
     }
 
 
@@ -1185,6 +1205,23 @@ public class XMLElement
         return new XMLParseException(this.getName(), this.parserLineNr, msg);
     }
 
+    /**
+     * Creates a parse exception for when the next character read is not
+     * the character that was expected.
+     *
+     * @param charSet The set of characters (in human readable form) that was
+     *                expected.
+     * @param ch The character that was received instead.
+     * </dl><dl><dt><b>Preconditions:</b></dt><dd>
+     * <ul><li><code>charSet != null</code>
+     *     <li><code>charSet.length() &gt; 0</code>
+     * </ul></dd></dl>
+     */
+    protected XMLParseException expectedInput(String charSet, char ch)
+    {
+        String msg = "Expected: '" + charSet +"'" + " but got: '" + ch + "'";
+        return new XMLParseException(this.getName(), this.parserLineNr, msg);
+    }
 
     /**
      * Creates a parse exception for when an entity could not be resolved.
@@ -1201,5 +1238,82 @@ public class XMLElement
         String msg = "Unknown or invalid entity: &" + name + ";";
         return new XMLParseException(this.getName(), this.parserLineNr, msg);
     }
-    
+
+    /**
+     * Reads an xml file and removes the comments, leaving only relevant
+     * xml code.
+     *
+     * @param isr The reader of the InputStream containing the xml.
+     * @param pout The PipedOutputStream that will be receiving the filtered
+     *             xml file.
+     */
+    public void sanitizeInput(InputStreamReader isr, PipedOutputStream pout) {
+        try {
+            PrintStream out = new PrintStream(pout);
+
+            this.sanitizeCharReadTooMuch = '\0';
+            this.reader = isr;
+            this.parserLineNr = 0;
+            int newline = 2;
+
+            while(true) {
+                char ch;
+                if (this.sanitizeCharReadTooMuch != '\0') {
+                    ch = this.sanitizeCharReadTooMuch;
+                    this.sanitizeCharReadTooMuch = '\0';
+                } else {
+
+                    int i = this.reader.read();
+                    if (i == -1) {
+                        out.flush();
+                        break;
+                    } else if (i == 10) {
+                        ch = '\n';
+                    } else {
+                        ch = (char) i;
+                    }
+                }
+
+                char next;
+                int i = this.reader.read();
+                if (i == -1) {
+                    out.flush();
+                    break;
+                } else if (i == 10) {
+                    next = '\n';
+                } else {
+                    next = (char) i;
+                }
+
+                this.sanitizeCharReadTooMuch = next;
+
+                // If the next char is a ? or !, then we've hit a special tag,
+                // and should skip it.
+                if (next == '!' || next == '?') {
+                    this.skipSpecialTag(0);
+                    this.sanitizeCharReadTooMuch = '\0';
+                }
+                // Otherwise we haven't hit a comment, and we should write ch.
+                else {
+                    out.print(ch);
+                    if (JNLPRuntime.isDebug()) {
+                        if (ch == 10) {
+                            System.out.println();
+                            System.out.print("line: " + newline + " ");
+                            newline++;
+                        } else {
+                            System.out.print(ch);
+                        }
+                    }
+                }
+            }
+
+            out.close();
+            isr.close();
+        } catch (Exception e) {
+            // Print the stack trace here -- xml.parseFromReader() will
+            // throw the ParseException if something goes wrong.
+            e.printStackTrace();
+        }
+    }
 }


From gnu_andrew at member.fsf.org  Mon Jun  9 19:18:36 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 10 Jun 2008 03:18:36 +0100
Subject: RFC: JScheme fix (PR icedtea/140)
Message-ID: <17c6771e0806091918t48b52e22r34164b4ee718124e@mail.gmail.com>

The attached patch removes the dependency on JScheme, replacing the
Scheme script with a Java equivalent.

I've bootstrapped this on x86_64.  Okay to commit?

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jscheme_fix.diff
Type: text/x-patch
Size: 71683 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080610/0aee6fea/jscheme_fix.diff 

From doko at ubuntu.com  Tue Jun 10 01:12:27 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Tue, 10 Jun 2008 10:12:27 +0200
Subject: [patch] updated sparc support
In-Reply-To: <200806081922.41672.dennis@ausil.us>
References: <200806081922.41672.dennis@ausil.us>
Message-ID: <484E376B.80801@ubuntu.com>

Checking in the following patch:

2008-06-10  Tom Callaway <tcallawa at redhat.com>
            Dennis Gilmore <dennis at ausil.us>

        * patches/icedtea-sparc64-linux.patch,
        patches/icedtea-sparc-ptracefix.patch,
        patches/icedtea-sparc-trapsfix.patch: New.
        * Makefile.am (ICEDTEA_PATCHES): Add above patches.
        * Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
        symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
        * acinclude.m4: Set JRE_ARCH_DIR.
        * Makefile.in, configure: Regenerate.

The patches itself are unmodified, but have to be mentioned in Makefile.am; the
changes to the configure script had to go to acinclude.m4.

  Matthias

Dennis Gilmore schrieb:
> The attached patches allow openjdk to build for both sparc64 and sparc32 on 
> linux.  they were written by Tom "spot" Callaway.
> 
> As a breakdown, here is what these patches do (they should all be
> applicable upstream):
> 
> java-1.6.0-openjdk-sparc-ptracefix.patch:
>  Rather than source asm-sparc/ptrace.h (on pure 32bit sparc userland,  
>  asm-sparc/ doesn't exist, only asm/), I simply include the pt_regs 
>  struct that sparc and sparc64 use. Only affects sparc and sparc64.
> 
> java-1.6.0-openjdk-sparc-trapsfix.patch:
>  On pure 32bit sparc userland (kernel-headers.sparc), asm-sparc/ 
>  doesn't exist, but asm/ does. On pure 64bit sparc64 userland 
>  (kernel-headers.sparc64), asm-sparc and asm-sparc64 exist. Still with 
>  me? :) We need the traps define from asm-sparc on both sparc and 
>  sparc64 compiles (there is no traps.h in asm-sparc64), so this patch
>  fixes it such that we get the right header included in both scenarios. 
>  Only affects sparc and sparc64. 
> 
> java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch:
>  Sun uses the term "sparcv9" to describe a 64bit sparc environment.  
>  This is ok on Solaris, but on Linux, we use "sparc64" to describe a 
>  64bit sparc environment. For 99% of the uses inside openJDK this is 
>  fine, but when bootstrapping off gcj, it makes symlinks to a 
>  non-existent jvm dir called "sparcv9". This patch adds another 
>  configure variable called "JRE_ARCH_DIR" which is the same as 
>  "INSTALL_ARCH_DIR" for all other arches except sparcv9 (where   
>  JRE_ARCH_DIR is set to sparc64). This patch might need to be 
>  conditionalized for bootstrapping only, not sure yet as I haven't  
>  done a non-bootstrap build for sparc64 yet. No behavior change for 
>  non-sparc/sparc64 architectures.
> 
> java-1.6.0-openjdk-sparc64-linux.patch:
>  Adds a sparcv9.make makefile for 64bit (sparc64). Fixes two bugs  
>  inside c1_LIRGenerator_sparc.cpp, one where int conversion wasn't 
>  correct on sparc64 and one where it called non-existant functions on 
>  sparc64. store_mem_reg and load_mem_reg might be defined for Solaris, 
>  but I couldn't find them defined in the source tree at all, so I \ 
>  assumed they were not-yet-implemented. Fixed 
>  hotspot/build/linux/makefiles/defs.make to more cleanly handle 
>  sparc/sparc64 cases. Only affects sparc and sparc64.

we now patch this file twice; maybe needs a cleanup.


From doko at ubuntu.com  Tue Jun 10 01:13:19 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Tue, 10 Jun 2008 08:13:19 +0000
Subject: changeset in /hg/icedtea6: 2008-06-10  Tom Callaway <tcallawa@re...
Message-ID: <hg.931f7730ecf9.1213085599.2873452341184383832@icedtea.classpath.org>

changeset 931f7730ecf9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=931f7730ecf9
description:
	2008-06-10  Tom Callaway <tcallawa at redhat.com>
	            Dennis Gilmore <dennis at ausil.us>

	        * patches/icedtea-sparc64-linux.patch,
	        patches/icedtea-sparc-ptracefix.patch,
	        patches/icedtea-sparc-trapsfix.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add above patches.
	        * Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
	        symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
	        * acinclude.m4: Set JRE_ARCH_DIR.
	        * Makefile.in, configure: Regenerate.

diffstat:

8 files changed, 198 insertions(+), 3 deletions(-)
ChangeLog                             |   12 ++++
Makefile.am                           |   10 +++
Makefile.in                           |   12 +++-
acinclude.m4                          |   10 +++
configure                             |    9 +++
patches/icedtea-sparc-ptracefix.patch |   34 ++++++++++++
patches/icedtea-sparc-trapsfix.patch  |   21 +++++++
patches/icedtea-sparc64-linux.patch   |   93 +++++++++++++++++++++++++++++++++

diffs (311 lines):

diff -r f1c286afb8fa -r 931f7730ecf9 ChangeLog
--- a/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
+++ b/ChangeLog	Tue Jun 10 10:13:20 2008 +0200
@@ -1,3 +1,15 @@ 2008-06-09  Joshua Sumali  <jsumali at redh
+2008-06-10  Tom Callaway <tcallawa at redhat.com>
+	    Dennis Gilmore <dennis at ausil.us>
+
+	* patches/icedtea-sparc64-linux.patch,
+	patches/icedtea-sparc-ptracefix.patch,
+	patches/icedtea-sparc-trapsfix.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
+	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+	* acinclude.m4: Set JRE_ARCH_DIR.
+	* Makefile.in, configure: Regenerate.
+
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r f1c286afb8fa -r 931f7730ecf9 Makefile.am
--- a/Makefile.am	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.am	Tue Jun 10 10:13:20 2008 +0200
@@ -318,6 +318,9 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
@@ -511,8 +514,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r f1c286afb8fa -r 931f7730ecf9 Makefile.in
--- a/Makefile.in	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.in	Tue Jun 10 10:13:20 2008 +0200
@@ -138,6 +138,7 @@ JAVA = @JAVA@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
 LDFLAGS = @LDFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -421,7 +422,9 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
@@ -1001,8 +1004,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r f1c286afb8fa -r 931f7730ecf9 acinclude.m4
--- a/acinclude.m4	Mon Jun 09 16:15:29 2008 -0400
+++ b/acinclude.m4	Tue Jun 10 10:13:20 2008 +0200
@@ -4,22 +4,32 @@ AC_DEFUN([SET_ARCH_DIRS],
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
+  AC_SUBST(JRE_ARCH_DIR)
 ])
 
 AC_DEFUN([FIND_JAVAC],
diff -r f1c286afb8fa -r 931f7730ecf9 configure
--- a/configure	Mon Jun 09 16:15:29 2008 -0400
+++ b/configure	Tue Jun 10 10:13:20 2008 +0200
@@ -5966,18 +5966,27 @@ fi
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
 
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc-ptracefix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-ptracefix.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,34 @@
+diff -up openjdk/hotspot/agent/src/os/linux/libproc.h.BAD openjdk/hotspot/agent/src/os/linux/libproc.h
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.BAD	2008-05-29 19:03:34.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/libproc.h	2008-05-29 19:01:45.000000000 -0400
+@@ -34,14 +34,25 @@
+ 
+ #if defined(sparc) || defined(sparcv9)
+ /*
+-  If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+-  otherwise it should be from /usr/include/asm-sparc
+-  These two files define pt_regs structure differently
++  Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h
+ */ 
+ #ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
++struct pt_regs {
++	unsigned long u_regs[16]; /* globals and ins */
++	unsigned long tstate;
++	unsigned long tpc;
++	unsigned long tnpc;
++	unsigned int y;
++	unsigned int fprs;
++};
+ #else
+-#include "asm-sparc/ptrace.h"
++struct pt_regs {
++	unsigned long psr;
++	unsigned long pc;
++	unsigned long npc;
++	unsigned long y;
++	unsigned long u_regs[16]; /* globals and ins */
++};
+ #endif
+ 
+ #endif //sparc or sparcv9
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc-trapsfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,21 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD	2008-05-28 11:49:06.000000000 -0500
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	2008-05-28 11:51:56.000000000 -0500
+@@ -25,7 +25,16 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_assembler_linux_sparc.cpp.incl"
+ 
+-#include <asm-sparc/traps.h>
++/* Headers for 32bit sparc with a 32bit userland end up in asm/
++ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
++ * There is no traps.h in asm-sparc64/
++ */
++
++#if defined(__sparc__) && defined(__arch64__)
++# include <asm-sparc/traps.h>
++#else 
++# include <asm/traps.h>
++#endif
+ 
+ bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+   // Since the linux kernel resides at the low end of
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc64-linux.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc64-linux.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,93 @@
+diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD	2008-05-29 15:48:44.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-05-29 15:48:39.000000000 -0400
+@@ -0,0 +1,27 @@
++#
++# Copyright 1999-2005 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.
++#
++# 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.
++#  
++#
++
++# TLS helper, assembled from .s file
++# Not included in includeDB because it has no dependencies
++Obj_Files += linux_sparc.o
+diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD	2008-05-29 16:25:10.000000000 -0400
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-29 16:32:11.000000000 -0400
+@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
+ 
+ void LIRGenerator::increment_counter(address counter, int step) {
+   LIR_Opr pointer = new_register(T_INT);
+-  __ move(LIR_OprFact::intConst((int)counter), pointer);
++  __ move(LIR_OprFact::intConst((int)*counter), pointer);
+   LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
+   increment_counter(addr, step);
+ }
+@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+ 
+ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+                                         CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ store_mem_reg(value, address, info);
+-#else
+   __ volatile_store_mem_reg(value, address, info);
+-#endif
+ }
+ 
+ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+                                        CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ load_mem_reg(address, result, info);
+-#else
+   __ volatile_load_mem_reg(address, result, info);
+-#endif
+ }
+ 
+ 
+diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk/hotspot/build/linux/makefiles/defs.make.BAD	2008-05-30 07:03:37.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-30 07:03:45.000000000 -0400
+@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
+   HS_ARCH         = ia64
+ endif
+ 
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
+   HS_ARCH            = sparc
+ endif
+ 
++# sparc
++ifeq ($(ARCH), sparc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-sparc
++  VM_PLATFORM      = linux_sparc
++  HS_ARCH          = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)


From doko at ubuntu.com  Tue Jun 10 01:39:11 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Tue, 10 Jun 2008 08:39:11 +0000
Subject: changeset in /hg/icedtea6: 2008-06-10  Matthias Klose  <doko@ubu...
Message-ID: <hg.7f5d247e2da8.1213087151.2873452341184383832@icedtea.classpath.org>

changeset 7f5d247e2da8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f5d247e2da8
description:
	2008-06-10  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-no-bcopy.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add patch.
	        * Makefile.in: Regenerate.

diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                      |    6 ++++++
Makefile.am                    |    1 +
Makefile.in                    |    3 ++-
patches/icedtea-no-bcopy.patch |   20 ++++++++++++++++++++

diffs (61 lines):

diff -r 931f7730ecf9 -r 7f5d247e2da8 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:13:20 2008 +0200
+++ b/ChangeLog	Tue Jun 10 10:39:13 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-10  Tom Callaway <tcallawa at redha
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
 2008-06-10  Tom Callaway <tcallawa at redhat.com>
 	    Dennis Gilmore <dennis at ausil.us>
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.am	Tue Jun 10 10:39:13 2008 +0200
@@ -322,6 +322,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.in	Tue Jun 10 10:39:13 2008 +0200
@@ -425,7 +425,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r 931f7730ecf9 -r 7f5d247e2da8 patches/icedtea-no-bcopy.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch	Tue Jun 10 10:39:13 2008 +0200
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~	2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+ 
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro


From doko at ubuntu.com  Tue Jun 10 01:40:01 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Tue, 10 Jun 2008 10:40:01 +0200
Subject: bcopy, bzero, bcmp
In-Reply-To: <4814CE7C.80808@sun.com>
References: <1209313542.3103.30.camel@dijkstra.wildebeest.org>
	<4814CE7C.80808@sun.com>
Message-ID: <484E3DE1.9000609@ubuntu.com>

Kelly O'Hair schrieb:
> Same thing might be said of bcmp, bzero, stricmp, and strcasecmp.
> Looks like this is just old BSDism cruft that could be deleted.
> (BSD didn't have the mem*() functions as I recall).
> 
> It's possible that some other .so might depend on having this
> extern in libjvm.so, but that strikes me as bad news and if someone
> is depending on it, they should be taken out and shot or something. ;^)
> 
> -kto
> 
> Mark Wielaard wrote:
>> Hi,
>>
>> Another patch that all distros seem to apply is one to remove the
>> redefine of bcopy in openjdk/hotspot/src/share/vm/libadt/port.hpp.
>>
>> -#undef bcopy
>> -inline void bcopy(const void *s, void *d, size_t len) {
>> memmove(d,s,len); }
>> +//#undef bcopy
>> +//inline void bcopy(const void *s, void *d, size_t len) {
>> memmove(d,s,len); }
>>
>> Now I cannot find any usage of bcopy (or bzero, or bcmp) in hotspot, so
>> the above seems not to actually do anything. But I was wondering why the
>> above might be necessary.
>>
>> Cheers,
>>
>> Mark

In file included from ../generated/incls/_precompiled.incl:271:
/usr/include/bits/string3.h:90: error: 'void bcopy(const void*, void*, size_t)'
previously defined here

Did see the above error, did checkin the attached patch in icedtea6.

  Matthias

-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-no-bcopy.patch
Type: text/x-diff
Size: 792 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080610/20445bc5/icedtea-no-bcopy.patch 

From doko at ubuntu.com  Tue Jun 10 02:41:59 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Tue, 10 Jun 2008 09:41:59 +0000
Subject: changeset in /hg/icedtea6: - Fix typo in icedtea-sparc64-linux p...
Message-ID: <hg.5e8339d7f686.1213090919.2873452341184383832@icedtea.classpath.org>

changeset 5e8339d7f686 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5e8339d7f686
description:
	- Fix typo in icedtea-sparc64-linux patch name

diffstat:

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

diffs (24 lines):

diff -r 7f5d247e2da8 -r 5e8339d7f686 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:39:13 2008 +0200
+++ b/Makefile.am	Tue Jun 10 11:42:05 2008 +0200
@@ -318,7 +318,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
-	patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
diff -r 7f5d247e2da8 -r 5e8339d7f686 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:39:13 2008 +0200
+++ b/Makefile.in	Tue Jun 10 11:42:05 2008 +0200
@@ -422,7 +422,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc.patch patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \


From langel at redhat.com  Tue Jun 10 07:21:17 2008
From: langel at redhat.com (Lillian Angel)
Date: Tue, 10 Jun 2008 14:21:17 +0000
Subject: changeset in /hg/icedtea6: 2008-06-10  Lillian Angel  <langel@re...
Message-ID: <hg.c400aa599d8b.1213107677.2873452341184383832@icedtea.classpath.org>

changeset c400aa599d8b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c400aa599d8b
description:
	2008-06-10  Lillian Angel  <langel at redhat.com>

	        * Makefile.in: Regenerated.
	        * aclocal.m4: Likewise.
	        * configure: Likewise.
	        * generated/sun/misc/Version.java: Likewise.
	        * generated/sun/tools/jconsole/Version.java: Likewise.

diffstat:

6 files changed, 312 insertions(+), 378 deletions(-)
ChangeLog                                 |    8 
Makefile.in                               |    3 
aclocal.m4                                |   22 
configure                                 |  651 ++++++++++++-----------------
generated/sun/misc/Version.java           |    4 
generated/sun/tools/jconsole/Version.java |    2 

diffs (truncated from 1329 to 500 lines):

diff -r 5e8339d7f686 -r c400aa599d8b ChangeLog
--- a/ChangeLog	Tue Jun 10 11:42:05 2008 +0200
+++ b/ChangeLog	Tue Jun 10 10:21:11 2008 -0400
@@ -1,3 +1,11 @@ 2008-06-10  Matthias Klose  <doko at ubuntu
+2008-06-10  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* generated/sun/misc/Version.java: Likewise.
+	* generated/sun/tools/jconsole/Version.java: Likewise.
+
 2008-06-10  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-no-bcopy.patch: New.
diff -r 5e8339d7f686 -r c400aa599d8b Makefile.in
--- a/Makefile.in	Tue Jun 10 11:42:05 2008 +0200
+++ b/Makefile.in	Tue Jun 10 10:21:11 2008 -0400
@@ -422,7 +422,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
diff -r 5e8339d7f686 -r c400aa599d8b aclocal.m4
--- a/aclocal.m4	Tue Jun 10 11:42:05 2008 +0200
+++ b/aclocal.m4	Tue Jun 10 10:21:11 2008 -0400
@@ -87,16 +87,14 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -140,9 +138,9 @@ if test $pkg_failed = yes; then
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -r 5e8339d7f686 -r c400aa599d8b configure
--- a/configure	Tue Jun 10 11:42:05 2008 +0200
+++ b/configure	Tue Jun 10 10:21:11 2008 -0400
@@ -734,6 +734,7 @@ PARALLEL_JOBS
 PARALLEL_JOBS
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
+JRE_ARCH_DIR
 JAVA
 JAVAC
 JAVAH
@@ -5992,6 +5993,7 @@ fi
 
 
 
+
 if test "${with_openjdk}" == true
 then
   JAVA=$SYSTEM_OPENJDK_DIR/bin/java
@@ -10231,11 +10233,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XPROTO" >&5
 echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_CFLAGS"; then
-        pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XPROTO_CFLAGS"; then
+    pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10245,15 +10246,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_LIBS"; then
-        pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XPROTO_LIBS"; then
+    pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10263,9 +10262,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10278,9 +10276,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
         else
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XPROTO_PKG_ERRORS" >&5
@@ -10313,11 +10311,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XT" >&5
 echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_CFLAGS"; then
-        pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XT_CFLAGS"; then
+    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10327,15 +10324,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_LIBS"; then
-        pkg_cv_XT_LIBS="$XT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XT_LIBS"; then
+    pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10345,9 +10340,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10360,9 +10354,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
         else
-	        XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XT_PKG_ERRORS" >&5
@@ -10395,11 +10389,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XP" >&5
 echo $ECHO_N "checking for XP... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_CFLAGS"; then
-        pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XP_CFLAGS"; then
+    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10409,15 +10402,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_LIBS"; then
-        pkg_cv_XP_LIBS="$XP_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XP_LIBS"; then
+    pkg_cv_XP_LIBS="$XP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10427,9 +10418,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10442,9 +10432,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
         else
-	        XP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XP_PKG_ERRORS" >&5
@@ -10477,11 +10467,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for X11" >&5
 echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_CFLAGS"; then
-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$X11_CFLAGS"; then
+    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10491,15 +10480,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_LIBS"; then
-        pkg_cv_X11_LIBS="$X11_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$X11_LIBS"; then
+    pkg_cv_X11_LIBS="$X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10509,9 +10496,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10524,9 +10510,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
@@ -10559,11 +10545,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XINERAMA" >&5
 echo $ECHO_N "checking for XINERAMA... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_CFLAGS"; then
-        pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XINERAMA_CFLAGS"; then
+    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10573,15 +10558,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_LIBS"; then
-        pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XINERAMA_LIBS"; then
+    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10591,9 +10574,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10606,9 +10588,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
         else
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XINERAMA_PKG_ERRORS" >&5
@@ -10642,11 +10624,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for LIBPNG" >&5
 echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_CFLAGS"; then
-        pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_CFLAGS"; then
+    pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10656,15 +10637,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_LIBS"; then
-        pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBPNG_LIBS"; then
+    pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10674,9 +10653,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10689,9 +10667,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng" 2>&1`
         else
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBPNG_PKG_ERRORS" >&5
@@ -10725,11 +10703,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XTST" >&5
 echo $ECHO_N "checking for XTST... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_CFLAGS"; then
-        pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XTST_CFLAGS"; then
+    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5
   ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
   ac_status=$?
@@ -10739,15 +10716,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_LIBS"; then
-        pkg_cv_XTST_LIBS="$XTST_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XTST_LIBS"; then
+    pkg_cv_XTST_LIBS="$XTST_LIBS"
+ elif test -n "$PKG_CONFIG"; then


From bugzilla-daemon at icedtea.classpath.org  Tue Jun 10 07:53:32 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 10 Jun 2008 14:53:32 +0000
Subject: [Bug 157] New: not all copyright holders mentioned in the third party
	readme
Message-ID: <E1K65E4-0001ye-E9@icedtea.classpath.org>

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

           Summary: not all copyright holders mentioned in the third party
                    readme
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: doko at ubuntu.com
OtherBugsDependingO 138
             nThis:


this was reported in
http://mail.openjdk.java.net/pipermail/jdk6-dev/2008-April/000044.html

All upstream licenses are included in the third party readme, but individual
copyright holders are missing:

- openjdk/jdk/src/share/classes/java/lang/instrument/package.html
   Copyright 2003 Wily Technology, Inc. License?

- %% This notice is provided with respect to PC/SC Lite for Suse Linux v.
1.1.1,
  which may be included with this software:

  Copyright (c) 1999-2004 David Corcoran
  All rights reserved.
  needs to be Ludovic Rousseau for e.g.
  openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h

- the Eastman Kodak see below?
- RSA Security Inc. see below?

Some inaccuracies in debian/copyright, should be fixed:
- Sax is said to be public domain in d/c, but Sun claims copyright
  for some of these and licenses under GPL, e.g.
  openjdk/jaxp/src/share/classes/org/xml/sax/HandlerBase.java
  >> in THIRD_PARTY_README as well

- Apache Software Foundation owns copyrights up to 2005

- at least parts of Xerces (and Xalan, but that could be the
  destinction between Xalan J2 and Xalan in d/c) uses
  Apache License 2.0, not just Apache Software license 1.1
  e.g.
openjdk/jaxp/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
-
jaxp/src/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java
-
openjdk/jaxp/src/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java
  has Portions Copyright Sun Microsystems, Inc. in addition
  to ASF,
-
jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
  has a note a la "based on software (c) ... IBM ...", don't know if
  that should be mentioned, some more might have that nearby.
-
openjdk/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
  and more like it: some xml security is Apache License 2.0,
  debian/copyright says ASL1.1
- %% This notice is provided with respect to IAIK PKCS Wrapper, which may be
included with this software:
  Copyright (c) 2002 Graz University of Technology. All rights reserved.
  should have sun with portions copyright
  e.g.
openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.jav
- openjdk/jdk/src/share/classes/sun/security/krb5/PrincipalName.java
  * Portions Copyright 2000-2006 Sun Microsystems, Inc.  All Rights  Reserved.
  ...
  *  (C) Copyright IBM Corp. 1999 All Rights Reserved.
  *  Copyright 1997 The Open Group Research Institute.  All rights reserved./*
  and some nearby

- This notice is provided with respect to Kerberos, which may be included with
this software:
  * Copyright (C) 1998 by the FundsXpress, INC.
  could be more specific and / or list other copyright holders to the
  krb5 stuff, fundsxpress seems to own only one (?) file.


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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun 10 07:53:33 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 10 Jun 2008 14:53:33 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1K65E5-0001ym-SI@icedtea.classpath.org>

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


doko at ubuntu.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  BugsThisDependsOn|                            |157




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


From bugzilla-daemon at icedtea.classpath.org  Tue Jun 10 14:29:15 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 10 Jun 2008 21:29:15 +0000
Subject: [Bug 150] truststore settings in hotspot
Message-ID: <E1K6BP1-0002BW-IX@icedtea.classpath.org>

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





------- Comment #4 from nitya.doraisamy at sun.com  2008-06-10 21:29 -------
Looking at the patch : 
Need to check this /etc/pki/tls/certs/ca-bundle.crt ... 

According to Andrew John Hughes, this file may not exist on all icedtea
platforms, and should be more carefully reviewed by the IcedTea community. 

The two key values are never actually used: "/etc/pki/tls/certs/ca-bundle.crt"
and "CertBundle".

This also breaks the PKCS11 provider code, which depends on NONE in trustStore
key value.

For max interoperability, the order of trust files consulted should be the
following:
    javax.net.ssl.trustStore
    <java-home>/lib/ext/jssecacerts
    /etc/pki/tls/certs/ca-bundle.crt
        Need to check if this file exists.  I think this is a LINUX
        only file, and may not exist on all icedtea platforms!
    <java-home>/lib/ext/cacerts

You could reverse the order of the jssecacerts and ca-bundle.crt.  But people
may be expecting jssecacerts to be there given the long history of this file.
This is an arch decision that should be reviewed among the IcedTea
participants.

Something like :

   if (storeFileName != null) {
       // javax.net.ssl.trustStore was set.
       storeFile = new File(storeFileName);
       fis = getFileInputStream(storeFile);
   } else {
       // fallbacks
       String javaHome = props.get("javaHome");
       storeFile = new File(javaHome + sep + "lib" + sep
                                       + "security" + sep +
                                       "jssecacerts");
       if (!storeFile.canRead()) {
           storeFile = new File("/etc/pki/tls/certs/ca-bundle.crt");
           if (storeFile.canRead()) {
               // Need to do something to set the
               // trustStoreType below to "CertBundle"
               ...
           } else {
               storeFile = new File(javaHome + sep + "lib" + sep
                                       + "security" + sep +
                                       "cacerts");
           }
       }
       fis = getFileInputStream(storeFile);
   }


-- 
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 Jun 11 09:33:01 2008
From: langel at redhat.com (Lillian Angel)
Date: Wed, 11 Jun 2008 16:33:01 +0000
Subject: changeset in /hg/icedtea6: 2008-06-11  Lillian Angel  <langel@re...
Message-ID: <hg.485da23424a2.1213201981.2873452341184383832@icedtea.classpath.org>

changeset 485da23424a2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485da23424a2
description:
	2008-06-11  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
	        like the Sun's verify Java version applet, check for the "_" in the
	        version string. Our version string format is now correct:
	        java version "1.6.0_0"
	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 26 insertions(+), 10 deletions(-)
ChangeLog   |   10 ++++++++++
Makefile.am |   11 +++++++----
Makefile.in |   15 +++++++++------

diffs (90 lines):

diff -r c400aa599d8b -r 485da23424a2 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:21:11 2008 -0400
+++ b/ChangeLog	Wed Jun 11 12:32:56 2008 -0400
@@ -1,3 +1,13 @@ 2008-06-10  Lillian Angel  <langel at redha
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.6.0_0"
+	OpenJDK  Runtime Environment (build 1.6.0_0-b10)
+	OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+	* Makefile.in: Regenerated.
+
 2008-06-10  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.in: Regenerated.
diff -r c400aa599d8b -r 485da23424a2 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.am	Wed Jun 11 12:32:56 2008 -0400
@@ -62,6 +62,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -76,8 +77,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -134,8 +136,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r c400aa599d8b -r 485da23424a2 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.in	Wed Jun 11 12:32:56 2008 -0400
@@ -285,15 +285,17 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +327,10 @@ ICEDTEA_CLS_DIR_ECJ = \
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \


From bugzilla-daemon at icedtea.classpath.org  Wed Jun 11 10:58:18 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 11 Jun 2008 17:58:18 +0000
Subject: [Bug 150] truststore settings in hotspot
Message-ID: <E1K6UaQ-0003Ei-3W@icedtea.classpath.org>

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





------- Comment #5 from fitzsim at redhat.com  2008-06-11 17:58 -------
We've changed our strategy for certs.  We now symlink
$JAVA_HOME/jre/lib/security/cacerts to /etc/pki/java/cacerts which is provided
by a system-wide certs package called ca-certificates.  We've completely
eliminated the certbundle patch.  In addition to the concerns you listed below
it was causing problems in the GlassFish installer and Eclipse Equinox.

http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/002016.html
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/002025.html


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


From bugzilla-daemon at icedtea.classpath.org  Wed Jun 11 16:57:17 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 11 Jun 2008 23:57:17 +0000
Subject: [Bug 150] truststore settings in hotspot
Message-ID: <E1K6aBp-0003QX-QF@icedtea.classpath.org>

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





------- Comment #6 from bradford.wetmore at sun.com  2008-06-11 23:57 -------
Thanks for the clarification (#5), Thomas.  Those were my comments in #4,
submitted on my behalf by the Glassfish folks (Nitya).  I just joined the
IcedTea bugzilla shortly afterwards on the request of the Glassfish team to
help track/resolve the various issues.  But looks like it's now resolved.

Thanks for the update.

Brad Wetmore
JSSE Tech Lead
Sun Microsystems


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


From bugzilla-daemon at icedtea.classpath.org  Thu Jun 12 01:09:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Jun 2008 08:09:43 +0000
Subject: [Bug 158] New: FrozenBubble just shows a grey window
Message-ID: <E1K6hsN-00049u-A1@icedtea.classpath.org>

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

           Summary: FrozenBubble just shows a grey window
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: twisti at complang.tuwien.ac.at


When running FrozenBubble (http://glenn.sanson.free.fr/v2/?select=fb), as
standalone application, it just shows a grey window.  This also happens with
CACAO as VM, while it works with 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 doko at ubuntu.com  Thu Jun 12 02:35:31 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 12 Jun 2008 11:35:31 +0200
Subject: version number [Re: changeset in /hg/icedtea6: 2008-06-11  Lillian
	Angel  <langel@re...]
In-Reply-To: <hg.485da23424a2.1213201981.2873452341184383832@icedtea.classpath.org>
References: <hg.485da23424a2.1213201981.2873452341184383832@icedtea.classpath.org>
Message-ID: <4850EDE3.5060905@ubuntu.com>

Lillian Angel schrieb:
> changeset 485da23424a2 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485da23424a2
> description:
> 	2008-06-11  Lillian Angel  <langel at redhat.com>
> 
> 	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
> 	        like the Sun's verify Java version applet, check for the "_" in the
> 	        version string. Our version string format is now correct:
> 	        java version "1.6.0_0"
> 	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
> 	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
> 	        * Makefile.in: Regenerated.

Do we really want this? According to
http://java.sun.com/javase/6/webnotes/version-6.html
the underscore isn't mentioned at all. Is this further specified?

This schema also differs with the Java 6 version number, which displays
"1.6.0_06" for the version, and "1.6.0_06-b02" for the full version. Apparently
"b02"is used here for the build number, while for OpenJDK the "bxx" part is used
as service release / new code drop.

  Matthias


From mark at klomp.org  Thu Jun 12 03:34:06 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 12 Jun 2008 12:34:06 +0200
Subject: version number [Re: changeset in /hg/icedtea6: 2008-06-11 
	Lillian Angel  <langel@re...]
In-Reply-To: <4850EDE3.5060905@ubuntu.com>
References: <hg.485da23424a2.1213201981.2873452341184383832@icedtea.classpath.org>
	<4850EDE3.5060905@ubuntu.com>
Message-ID: <1213266846.3977.9.camel@dijkstra.wildebeest.org>

Hi Matthias,

On Thu, 2008-06-12 at 11:35 +0200, Matthias Klose wrote:
> Lillian Angel schrieb:
> > changeset 485da23424a2 in /hg/icedtea6
> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485da23424a2
> > description:
> > 	2008-06-11  Lillian Angel  <langel at redhat.com>
> > 
> > 	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
> > 	        like the Sun's verify Java version applet, check for the "_" in the
> > 	        version string. Our version string format is now correct:
> > 	        java version "1.6.0_0"
> > 	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
> > 	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
> > 	        * Makefile.in: Regenerated.
> 
> Do we really want this? According to
> http://java.sun.com/javase/6/webnotes/version-6.html
> the underscore isn't mentioned at all. Is this further specified?
> 
> This schema also differs with the Java 6 version number, which displays
> "1.6.0_06" for the version, and "1.6.0_06-b02" for the full version. Apparently
> "b02"is used here for the build number, while for OpenJDK the "bxx" part is used
> as service release / new code drop.

This actually came from the discussion you and I had on irc. As you
pointed out one of the first applets people try after installing
openjdk/icedtea/gcjwebplugin is the test applet one from sun. To verify
that everything installed fine. That applet fails very ungracefully
since it assumes the version number from the java.version system
property has an underscore in it. Apparently applications use this to
check whether you are running the latest "update version". And they die
horribly if they don't see the "update number" in the java.version
property as an underscore-number pair (basically stuffing an empty
string into new Integer and die when that doesn't parse). Of course
without the source code it is somewhat hard, maybe we can find someone
that could find the code for this particular application. But people
will want to run existing applications, so even if the code makes wrong
assumptions and we can make them work anyway it is a good idea to add
the support.

Some more analysis is also in this fedora bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=449959

I don't know if "0" is a good update number to use, or whether other
applications expect an higher version there. It would be best if
applications detected openjdk as the latest and greatest available.

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Thu Jun 12 04:27:18 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Jun 2008 11:27:18 +0000
Subject: [Bug 159] New: deadlock in AWT code
Message-ID: <E1K6kxa-0004Fb-3j@icedtea.classpath.org>

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

           Summary: deadlock in AWT code
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: twisti at complang.tuwien.ac.at


I cannot provide any code, as this is a costumer application.  But here is
something interesting (constumer package name replaced with XXX):

Found one Java-level deadlock:
=============================
"AWT-EventQueue-0":
  waiting to lock monitor 0x0000000000689390 (object 0x00002aaab433cd60, a
java.awt.Component$AWTTreeLock),
  which is held by "main"
"main":
  waiting to lock monitor 0x000000000068a2a8 (object 0x00002aaad499e610, a
XXX.applet.MenuBarPanel),
  which is held by "AWT-EventQueue-0"

Java stack information for the threads listed above:
===================================================
"AWT-EventQueue-0":
        at java.awt.Container.removeAll(Container.java:1259)
        - waiting to lock <0x00002aaab433cd60> (a
java.awt.Component$AWTTreeLock)
        at XXX.applet.MenuBarPanel.arrange(MenuBarApplet.java:450)
        - locked <0x00002aaad499e610> (a XXX.applet.MenuBarPanel)
        at XXX.applet.MenuBarPanel.start(MenuBarApplet.java:405)
        - locked <0x00002aaad499e610> (a XXX.applet.MenuBarPanel)
        at XXX.applet.MenuBarApplet.start(MenuBarApplet.java:151)
        at XXX.browser.HTMLFrame.startApplet(HTMLFrame.java:487)
        at XXX.applet.TxHTMLFrame.startApplet(TxHTMLFrame.java:78)
        at XXX.browser.FrameJob$3.run(UpdateJob.java:431)
        at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:216)
        at java.awt.EventQueue.dispatchEvent(EventQueue.java:602)
        at
java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
        at
java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
        at
java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
        at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)
"main":
        at java.awt.Component.addPropertyChangeListener(Component.java:7928)
        - waiting to lock <0x00002aaad499e610> (a XXX.applet.MenuBarPanel)
        at java.awt.Container.addPropertyChangeListener(Container.java:3482)
        at java.awt.Component.addNotify(Component.java:6529)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at java.awt.Container.addNotify(Container.java:2632)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at javax.swing.JComponent.addNotify(JComponent.java:4696)
        at javax.swing.JRootPane.addNotify(JRootPane.java:750)
        at java.awt.Container.addNotify(Container.java:2639)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at java.awt.Window.addNotify(Window.java:668)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at java.awt.Frame.addNotify(Frame.java:486)
        - locked <0x00002aaab433cd60> (a java.awt.Component$AWTTreeLock)
        at java.awt.Window.pack(Window.java:698)
<snip>

Found 1 deadlock.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Jun 12 04:34:31 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Jun 2008 11:34:31 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K6l4Z-0004Fx-On@icedtea.classpath.org>

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





------- Comment #1 from aph at redhat.com  2008-06-12 11:34 -------
Version ?


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


From bugzilla-daemon at icedtea.classpath.org  Thu Jun 12 05:49:34 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Jun 2008 12:49:34 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K6mFC-0004IJ-MM@icedtea.classpath.org>

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





------- Comment #2 from twisti at complang.tuwien.ac.at  2008-06-12 12:49 -------
Right:

$ java -version
java version "1.6.0"
OpenJDK  Runtime Environment (build 1.6.0-b10)
OpenJDK 64-Bit Server VM (build 1.6.0-b10, mixed mode)


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


From gnu_andrew at member.fsf.org  Sun Jun 15 20:11:09 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Jun 2008 04:11:09 +0100
Subject: PING: RFC: JScheme fix (PR icedtea/140)
Message-ID: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>

On 10/06/2008, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
> The attached patch removes the dependency on JScheme, replacing the
>  Scheme script with a Java equivalent.
>
>  I've bootstrapped this on x86_64.  Okay to commit?
>
>  Thanks,
>  --
>  Andrew :-)
>
>  Support Free Java!
>  Contribute to GNU Classpath and the OpenJDK
>  http://www.gnu.org/software/classpath
>  http://openjdk.java.net
>
>  PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>  Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>
>

Any comments?
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From mark at klomp.org  Mon Jun 16 00:21:04 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 16 Jun 2008 09:21:04 +0200
Subject: PING: RFC: JScheme fix (PR icedtea/140)
In-Reply-To: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
References: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
Message-ID: <1213600864.8039.5.camel@dijkstra.wildebeest.org>

Hi Andrew,

On Mon, 2008-06-16 at 04:11 +0100, Andrew John Hughes wrote:
> On 10/06/2008, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
> > The attached patch removes the dependency on JScheme, replacing the
> >  Scheme script with a Java equivalent.
> >
> >  I've bootstrapped this on x86_64.  Okay to commit?
>
> Any comments?

yeah, sorry. We discussed this a bit on irc. I like it.

The fact that, apart from the headers the generated files are the same
is very encouraging. Also good to see the icedtea-ecj.patch cleaned up
(although a Changelog entry would have helped getting a better idea what
was going on). Do you plan to push this upstream?

Thanks,

Mark



From gnu_andrew at member.fsf.org  Mon Jun 16 04:03:22 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Jun 2008 12:03:22 +0100
Subject: PING: RFC: JScheme fix (PR icedtea/140)
In-Reply-To: <1213600864.8039.5.camel@dijkstra.wildebeest.org>
References: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
	<1213600864.8039.5.camel@dijkstra.wildebeest.org>
Message-ID: <17c6771e0806160403m19de4cdbhfdf22cb2b72ee96f@mail.gmail.com>

2008/6/16 Mark Wielaard <mark at klomp.org>:
> Hi Andrew,
>
> On Mon, 2008-06-16 at 04:11 +0100, Andrew John Hughes wrote:
>> On 10/06/2008, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
>> > The attached patch removes the dependency on JScheme, replacing the
>> >  Scheme script with a Java equivalent.
>> >
>> >  I've bootstrapped this on x86_64.  Okay to commit?
>>
>> Any comments?
>
> yeah, sorry. We discussed this a bit on irc. I like it.
>

That's ok.  I'd forgotten I'd only RFCed it myself.

> The fact that, apart from the headers the generated files are the same
> is very encouraging. Also good to see the icedtea-ecj.patch cleaned up
> (although a Changelog entry would have helped getting a better idea what
> was going on).

It doesn't fully cleanup the icedtea-ecj patch, just alters it
slightly so the existing changes to that
bit of the tree are either removed (mc.scm is no longer patched as it
gets removed anyway) or remade
(the removal of the corresponding Makefile needs a new patch because
the Makefile changes due
to the jscheme patch).

I thought I had included a ChangeLog, sorry.  I'm pretty sure I have
one on my tree.  The changes are simply:

* Add icedtea-jscheme.patch which adds the new Java code and a new
Makefile, as well as hooking that
Makefile into the build in corba/tools.
* Add the patch to configure.ac along with removal of jscheme.jar.
* Fix icedtea-ecj.patch as described above.

> Do you plan to push this upstream?
>

Yes, that's the plan.  I need to roll another patch against OpenJDK hg to do so.

> Thanks,
>
> Mark
>
>

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8


From doko at ubuntu.com  Mon Jun 16 07:12:00 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Mon, 16 Jun 2008 10:12:00 -0400
Subject: PING: RFC: JScheme fix (PR icedtea/140)
In-Reply-To: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
References: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
Message-ID: <485674B0.8090804@ubuntu.com>

Andrew John Hughes schrieb:
> On 10/06/2008, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
>> The attached patch removes the dependency on JScheme, replacing the
>>  Scheme script with a Java equivalent.
>>
>>  I've bootstrapped this on x86_64.  Okay to commit?
>>
>>  Thanks,
>>  --
>>  Andrew :-)
>>
>>  Support Free Java!
>>  Contribute to GNU Classpath and the OpenJDK
>>  http://www.gnu.org/software/classpath
>>  http://openjdk.java.net
>>
>>  PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>>  Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>>
>>
> 
> Any comments?

built packages using this patch which do work fine.

  Matthias


From bugzilla-daemon at icedtea.classpath.org  Mon Jun 16 08:52:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 16 Jun 2008 15:52:49 +0000
Subject: [Bug 158] FrozenBubble just shows a grey window
Message-ID: <E1K8H0j-0000gd-OB@icedtea.classpath.org>

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


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|langel at redhat.com
                   |.org                        |




------- Comment #1 from langel at redhat.com  2008-06-16 15:52 -------
I am able to reproduce this. The standalone app works with jdk1.5.0 and
jdk1.6.0 as well. I am looking into 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.
You are the assignee for the bug, or are watching the assignee.


From gnu_andrew at member.fsf.org  Mon Jun 16 12:05:06 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 16 Jun 2008 19:05:06 +0000
Subject: changeset in /hg/icedtea6: Merge jscheme patch to tip.
Message-ID: <hg.03aeec329490.1213643106.2873452341184383832@icedtea.classpath.org>

changeset 03aeec329490 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=03aeec329490
description:
	Merge jscheme patch to tip.

diffstat:

11 files changed, 268 insertions(+), 18 deletions(-)
ChangeLog                                 |   36 +++++++++++
Makefile.am                               |   22 +++++-
Makefile.in                               |   30 ++++++---
acinclude.m4                              |   10 +++
configure                                 |   14 ++++
generated/sun/misc/Version.java           |    4 -
generated/sun/tools/jconsole/Version.java |    2 
patches/icedtea-no-bcopy.patch            |   20 ++++++
patches/icedtea-sparc-ptracefix.patch     |   34 ++++++++++
patches/icedtea-sparc-trapsfix.patch      |   21 ++++++
patches/icedtea-sparc64-linux.patch       |   93 +++++++++++++++++++++++++++++

diffs (491 lines):

diff -r 2a13fc138cfa -r 03aeec329490 ChangeLog
--- a/ChangeLog	Tue Jun 10 03:17:12 2008 +0100
+++ b/ChangeLog	Mon Jun 16 20:04:22 2008 +0100
@@ -9,6 +9,42 @@ 2008-06-09  Andrew John Hughes  <gnu_and
 	tree.
 	* patches/icedtea-jscheme.patch: Added.
 	
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.6.0_0"
+	OpenJDK  Runtime Environment (build 1.6.0_0-b10)
+	OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+	* Makefile.in: Regenerated.
+
+2008-06-10  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* generated/sun/misc/Version.java: Likewise.
+	* generated/sun/tools/jconsole/Version.java: Likewise.
+
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
+2008-06-10  Tom Callaway <tcallawa at redhat.com>
+	    Dennis Gilmore <dennis at ausil.us>
+
+	* patches/icedtea-sparc64-linux.patch,
+	patches/icedtea-sparc-ptracefix.patch,
+	patches/icedtea-sparc-trapsfix.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
+	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+	* acinclude.m4: Set JRE_ARCH_DIR.
+	* Makefile.in, configure: Regenerate.
+
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.am
--- a/Makefile.am	Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.am	Mon Jun 16 20:04:22 2008 +0100
@@ -64,6 +64,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -78,8 +79,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -136,8 +138,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -320,7 +323,11 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
@@ -516,8 +523,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.in
--- a/Makefile.in	Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.in	Mon Jun 16 20:04:22 2008 +0100
@@ -138,6 +138,7 @@ JAVA = @JAVA@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
 LDFLAGS = @LDFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -285,15 +286,17 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +328,10 @@ ICEDTEA_CLS_DIR_ECJ = \
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
@@ -423,9 +427,12 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
-	patches/icedtea-jscheme.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -1005,8 +1012,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 acinclude.m4
--- a/acinclude.m4	Tue Jun 10 03:17:12 2008 +0100
+++ b/acinclude.m4	Mon Jun 16 20:04:22 2008 +0100
@@ -4,22 +4,32 @@ AC_DEFUN([SET_ARCH_DIRS],
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
+  AC_SUBST(JRE_ARCH_DIR)
 ])
 
 AC_DEFUN([FIND_JAVAC],
diff -r 2a13fc138cfa -r 03aeec329490 configure
--- a/configure	Tue Jun 10 03:17:12 2008 +0100
+++ b/configure	Mon Jun 16 20:04:22 2008 +0100
@@ -734,6 +734,7 @@ PARALLEL_JOBS
 PARALLEL_JOBS
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
+JRE_ARCH_DIR
 JAVA
 JAVAC
 JAVAH
@@ -5966,20 +5967,30 @@ fi
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
+
 
 
 
@@ -12976,6 +12987,7 @@ PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
 PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
 BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
 INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+JRE_ARCH_DIR!$JRE_ARCH_DIR$ac_delim
 JAVA!$JAVA$ac_delim
 JAVAC!$JAVAC$ac_delim
 JAVAH!$JAVAH$ac_delim
@@ -13045,7 +13057,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java	Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/misc/Version.java	Mon Jun 16 20:04:22 2008 +0100
@@ -36,10 +36,10 @@ public class Version {
         "1.6.0";
 
     private static final String java_runtime_name =
-        "IcedTea Runtime Environment";
+        "OpenJDK  Runtime Environment";
 
     private static final String java_runtime_version =
-        "1.6.0-b09";
+        "1.6.0-b10";
 
     static {
         init();
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/tools/jconsole/Version.java
--- a/generated/sun/tools/jconsole/Version.java	Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/tools/jconsole/Version.java	Mon Jun 16 20:04:22 2008 +0100
@@ -29,7 +29,7 @@ import java.io.PrintStream;
 
 public class Version {
     private static final String jconsole_version =
-        "1.6.0-b09";
+        "1.6.0-b10";
 
     public static void print(PrintStream ps) {
         printFullVersion(ps);
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-no-bcopy.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~	2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+ 
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-ptracefix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-ptracefix.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,34 @@
+diff -up openjdk/hotspot/agent/src/os/linux/libproc.h.BAD openjdk/hotspot/agent/src/os/linux/libproc.h
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.BAD	2008-05-29 19:03:34.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/libproc.h	2008-05-29 19:01:45.000000000 -0400
+@@ -34,14 +34,25 @@
+ 
+ #if defined(sparc) || defined(sparcv9)
+ /*
+-  If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+-  otherwise it should be from /usr/include/asm-sparc
+-  These two files define pt_regs structure differently
++  Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h
+ */ 
+ #ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
++struct pt_regs {
++	unsigned long u_regs[16]; /* globals and ins */
++	unsigned long tstate;
++	unsigned long tpc;
++	unsigned long tnpc;
++	unsigned int y;
++	unsigned int fprs;
++};
+ #else
+-#include "asm-sparc/ptrace.h"
++struct pt_regs {
++	unsigned long psr;
++	unsigned long pc;
++	unsigned long npc;
++	unsigned long y;
++	unsigned long u_regs[16]; /* globals and ins */
++};
+ #endif
+ 
+ #endif //sparc or sparcv9
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-trapsfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,21 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD	2008-05-28 11:49:06.000000000 -0500
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	2008-05-28 11:51:56.000000000 -0500
+@@ -25,7 +25,16 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_assembler_linux_sparc.cpp.incl"
+ 
+-#include <asm-sparc/traps.h>
++/* Headers for 32bit sparc with a 32bit userland end up in asm/
++ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
++ * There is no traps.h in asm-sparc64/
++ */
++
++#if defined(__sparc__) && defined(__arch64__)
++# include <asm-sparc/traps.h>
++#else 
++# include <asm/traps.h>
++#endif
+ 
+ bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+   // Since the linux kernel resides at the low end of
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc64-linux.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc64-linux.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,93 @@
+diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD	2008-05-29 15:48:44.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-05-29 15:48:39.000000000 -0400
+@@ -0,0 +1,27 @@
++#
++# Copyright 1999-2005 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.
++#
++# 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.
++#  
++#
++
++# TLS helper, assembled from .s file
++# Not included in includeDB because it has no dependencies
++Obj_Files += linux_sparc.o
+diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD	2008-05-29 16:25:10.000000000 -0400
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-29 16:32:11.000000000 -0400
+@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
+ 
+ void LIRGenerator::increment_counter(address counter, int step) {
+   LIR_Opr pointer = new_register(T_INT);
+-  __ move(LIR_OprFact::intConst((int)counter), pointer);
++  __ move(LIR_OprFact::intConst((int)*counter), pointer);
+   LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
+   increment_counter(addr, step);
+ }
+@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+ 
+ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+                                         CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ store_mem_reg(value, address, info);
+-#else
+   __ volatile_store_mem_reg(value, address, info);
+-#endif
+ }
+ 
+ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+                                        CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ load_mem_reg(address, result, info);
+-#else
+   __ volatile_load_mem_reg(address, result, info);
+-#endif
+ }
+ 
+ 
+diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk/hotspot/build/linux/makefiles/defs.make.BAD	2008-05-30 07:03:37.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-30 07:03:45.000000000 -0400
+@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
+   HS_ARCH         = ia64
+ endif
+ 
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
+   HS_ARCH            = sparc
+ endif
+ 
++# sparc
++ifeq ($(ARCH), sparc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-sparc
++  VM_PLATFORM      = linux_sparc
++  HS_ARCH          = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)


From gnu_andrew at member.fsf.org  Mon Jun 16 12:05:05 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 16 Jun 2008 19:05:05 +0000
Subject: changeset in /hg/icedtea6: Fix PR icedtea/140 by removing depend...
Message-ID: <hg.2a13fc138cfa.1213643105.2873452341184383832@icedtea.classpath.org>

changeset 2a13fc138cfa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2a13fc138cfa
description:
	Fix PR icedtea/140 by removing dependency on JScheme

diffstat:

5 files changed, 1506 insertions(+), 237 deletions(-)
ChangeLog                     |   11 
Makefile.am                   |    5 
Makefile.in                   |    6 
patches/icedtea-ecj.patch     |  461 +++++++--------
patches/icedtea-jscheme.patch | 1260 +++++++++++++++++++++++++++++++++++++++++

diffs (truncated from 1823 to 500 lines):

diff -r f1c286afb8fa -r 2a13fc138cfa ChangeLog
--- a/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
+++ b/ChangeLog	Tue Jun 10 03:17:12 2008 +0100
@@ -1,3 +1,14 @@ 2008-06-09  Joshua Sumali  <jsumali at redh
+2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR icedtea/140:
+	* Makefile.am: Add icedtea-jscheme.patch and
+	remove jscheme jar files and scripts after
+	unzipping OpenJDK.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-ecj.patch: Updated for post-jscheme
+	tree.
+	* patches/icedtea-jscheme.patch: Added.
+	
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.am
--- a/Makefile.am	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.am	Tue Jun 10 03:17:12 2008 +0100
@@ -1,6 +1,8 @@ OPENJDK_DATE = 30_may_2008
 OPENJDK_DATE = 30_may_2008
 OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
 OPENJDK_VERSION = b10
+
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -319,6 +321,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-jscheme.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
@@ -333,6 +336,8 @@ stamps/extract.stamp: stamps/download.st
 	  mkdir openjdk ; \
 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 	  chmod -R ug+w openjdk ; \
+	  rm -rf $(JSCHEME_DIR)/lib; \
+	  rm -rf $(JSCHEME_DIR)/scripts; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.in
--- a/Makefile.in	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.in	Tue Jun 10 03:17:12 2008 +0100
@@ -252,6 +252,7 @@ OPENJDK_DATE = 30_may_2008
 OPENJDK_DATE = 30_may_2008
 OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
 OPENJDK_VERSION = b10
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -422,7 +423,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-jscheme.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
@@ -840,6 +842,8 @@ stamps/extract.stamp: stamps/download.st
 	  mkdir openjdk ; \
 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 	  chmod -R ug+w openjdk ; \
+	  rm -rf $(JSCHEME_DIR)/lib; \
+	  rm -rf $(JSCHEME_DIR)/scripts; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Mon Jun 09 16:15:29 2008 -0400
+++ b/patches/icedtea-ecj.patch	Tue Jun 10 03:17:12 2008 +0100
@@ -317,232 +317,6 @@ diff -ruN openjdk.old/corba/make/com/sun
 +# Include
 +#
 +include $(BUILDDIR)/common/Classes.gmk
-diff -ruN openjdk.old/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk.old/corba/make/com/sun/corba/se/sources/Makefile	2007-10-12 03:49:13.000000000 -0400
-+++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	1969-12-31 19:00:00.000000000 -0500
-@@ -1,222 +0,0 @@
--#
--# Copyright 2000-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.
--#
--
--BUILDDIR = ../../../../..
--
--PACKAGE = com.sun.corba.se
--PRODUCT = org
--
--include $(BUILDDIR)/common/Defs.gmk
--
--#
--# Rules
--#
--all: build
--
--build: portableactivation.idl.compile logwrapper.generate logresource.generate 
--
--clean clobber:: portableactivation.idl.clean
--
--#
--# Files
--#
--CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
--
--#
--# Dirs
--#
--
--SRC_DIR = $(SHARE_SRC)/classes
--CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
--PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
--
--ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
--PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
--LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
--
--#
--# IDLs
--#
--
--ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
--PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
--
--
--#
--# .mc files
--#
--ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
--IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
--INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
--NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
--OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
--ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
--POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
--UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
--
--MC_GENERATE_CLASS = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class
--MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource 
--
--JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_CLASS) 
--JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_LOG_RB) 
--
--
--#
--# Activation 
--#
--
--ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
--
--$(ACTIVATIONFILES): $(ACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
--
--activation.idl.compile: $(ACTIVATIONFILES)
--
--activation.idl.clean:
--	$(RM) -f $(ACTIVATIONFILES)
--
--#
--# PortableActivationIDL
--#
--
--PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
--
--PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
--
--PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
--    -pkgPrefix PortableActivationIDL com.sun.corba.se \
--    -pkgPrefix Dynamic org.omg \
--    -pkgPrefix IOP org.omg
--
--# REVISIT: remove -oldImplBase
--$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
--
--portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
--
--portableactivation.idl.clean:
--	$(RM) -f $(PORTABLEACTIVATIONFILES)
--
--#
--# Generate LogWrapper classes
--#
--logwrapper.generate: \
--	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
--	$(LOG_GENDIRECTORY)/IORSystemException.java \
--	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
--	$(LOG_GENDIRECTORY)/NamingSystemException.java \
--	$(LOG_GENDIRECTORY)/OMGSystemException.java \
--	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
--	$(LOG_GENDIRECTORY)/POASystemException.java \
--	$(LOG_GENDIRECTORY)/UtilSystemException.java
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/LogStrings.properties: \
--		$(LOG_GENDIRECTORY)/ActivationSystemException.resource \
--		$(LOG_GENDIRECTORY)/IORSystemException.resource \
--		$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
--		$(LOG_GENDIRECTORY)/NamingSystemException.resource \
--		$(LOG_GENDIRECTORY)/OMGSystemException.resource \
--		$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
--		$(LOG_GENDIRECTORY)/POASystemException.resource \
--		$(LOG_GENDIRECTORY)/UtilSystemException.resource
--	$(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--
--.PHONY: all build clean clobber \
--	activation.idl.compile activation.idl.clean \
--	portableactivation.idl.compile portableactivation.idl.clean
--
--#
--# Include
--#
--include $(BUILDDIR)/common/Rules.gmk
 --- iopenjdk/jdk/make/common/Rules.gmk	2007-10-12 03:54:05.000000000 -0400
 +++ openjdk-ecj/jdk/make/common/Rules.gmk	2007-11-07 11:02:53.000000000 -0500
 @@ -235,8 +235,9 @@
@@ -781,16 +555,6 @@ diff -ru openjdk-ecj.orig/langtools/make
  
      /**
       * Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2007-12-10 15:46:46.000000000 -0500
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2007-12-19 09:53:07.000000000 -0500
-@@ -332,7 +332,6 @@
- 	    (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- 	(.println pw "//")
- 	(.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
--	(.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- 	(.println pw)))
- 
- (define (write-factory-method class-name exception-group-name pw)
 --- openjdk.old/langtools/make/Makefile	2008-01-16 10:23:52.000000000 -0500
 +++ openjdk-ecj/langtools/make/Makefile	2008-01-16 10:42:51.000000000 -0500
 @@ -113,7 +113,7 @@
@@ -1023,3 +787,228 @@ diff -ru openjdk-ecj.orig/langtools/make
  
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
+--- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	2008-06-09 03:12:48.000000000 +0100
++++ /dev/null	2008-05-17 00:35:13.224001676 +0100
+@@ -1,222 +0,0 @@
+-#
+-# Copyright 2000-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.
+-#
+-
+-BUILDDIR = ../../../../..
+-
+-PACKAGE = com.sun.corba.se
+-PRODUCT = org
+-
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Rules
+-#
+-all: build
+-
+-build: portableactivation.idl.compile logwrapper.generate logresource.generate 
+-
+-clean clobber:: portableactivation.idl.clean
+-
+-#
+-# Files
+-#
+-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
+-
+-#
+-# Dirs
+-#
+-
+-SRC_DIR = $(SHARE_SRC)/classes
+-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
+-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
+-
+-ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
+-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
+-LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
+-
+-#
+-# IDLs
+-#
+-
+-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
+-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
+-
+-
+-#
+-# .mc files
+-#
+-ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
+-IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
+-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
+-NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
+-OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
+-ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
+-POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
+-UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
+-
+-MC_GENERATE_CLASS = make-class
+-MC_GENERATE_LOG_RB = make-resource 
+-
+-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) 
+-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) 
+-
+-
+-#
+-# Activation 
+-#
+-
+-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
+-
+-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
+-
+-activation.idl.compile: $(ACTIVATIONFILES)
+-
+-activation.idl.clean:
+-	$(RM) -f $(ACTIVATIONFILES)
+-
+-#
+-# PortableActivationIDL
+-#
+-
+-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
+-
+-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
+-
+-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
+-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
+-    -pkgPrefix Dynamic org.omg \
+-    -pkgPrefix IOP org.omg
+-
+-# REVISIT: remove -oldImplBase
+-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
+-
+-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
+-
+-portableactivation.idl.clean:
+-	$(RM) -f $(PORTABLEACTIVATIONFILES)
+-
+-#
+-# Generate LogWrapper classes
+-#
+-logwrapper.generate: \
+-	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
+-	$(LOG_GENDIRECTORY)/IORSystemException.java \
+-	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
+-	$(LOG_GENDIRECTORY)/NamingSystemException.java \
+-	$(LOG_GENDIRECTORY)/OMGSystemException.java \
+-	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
+-	$(LOG_GENDIRECTORY)/POASystemException.java \
+-	$(LOG_GENDIRECTORY)/UtilSystemException.java
+-
+-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)


From gnu_andrew at member.fsf.org  Mon Jun 16 12:16:20 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Jun 2008 20:16:20 +0100
Subject: PING: RFC: JScheme fix (PR icedtea/140)
In-Reply-To: <485674B0.8090804@ubuntu.com>
References: <17c6771e0806152011v14fc3bf8rf91799b2df912ebf@mail.gmail.com>
	<485674B0.8090804@ubuntu.com>
Message-ID: <17c6771e0806161216v35c5015fx563c281fb1d6809b@mail.gmail.com>

On 16/06/2008, Matthias Klose <doko at ubuntu.com> wrote:
> Andrew John Hughes schrieb:
>
> > On 10/06/2008, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
>  >> The attached patch removes the dependency on JScheme, replacing the
>  >>  Scheme script with a Java equivalent.
>  >>
>  >>  I've bootstrapped this on x86_64.  Okay to commit?
>  >>
>  >>  Thanks,
>  >>  --
>  >>  Andrew :-)
>  >>
>  >>  Support Free Java!
>  >>  Contribute to GNU Classpath and the OpenJDK
>  >>  http://www.gnu.org/software/classpath
>  >>  http://openjdk.java.net
>  >>
>  >>  PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>  >>  Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>  >>
>  >>
>  >
>  > Any comments?
>
>
> built packages using this patch which do work fine.
>
>
>   Matthias
>

Committed.

ChangeLog:

2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

       PR icedtea/140:
      * Makefile.am: Add icedtea-jscheme.patch and
       remove jscheme jar files and scripts after
       unzipping OpenJDK.
       * Makefile.in: Regenerated.
       * patches/icedtea-ecj.patch: Updated for post-jscheme
       tree.
       * patches/icedtea-jscheme.patch: Added.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From David.Herron at Sun.COM  Mon Jun 16 13:45:18 2008
From: David.Herron at Sun.COM (David Herron)
Date: Mon, 16 Jun 2008 13:45:18 -0700
Subject: version number [Re: changeset in /hg/icedtea6: 2008-06-11	Lillian
	Angel  <langel@re...]
In-Reply-To: <1213266846.3977.9.camel@dijkstra.wildebeest.org>
References: <hg.485da23424a2.1213201981.2873452341184383832@icedtea.classpath.org>
	<4850EDE3.5060905@ubuntu.com>
	<1213266846.3977.9.camel@dijkstra.wildebeest.org>
Message-ID: <4856D0DE.3070906@sun.com>

Mark Wielaard wrote:
> Hi Matthias,
>
> On Thu, 2008-06-12 at 11:35 +0200, Matthias Klose wrote:
>   
>> Lillian Angel schrieb:
>>     
>>> changeset 485da23424a2 in /hg/icedtea6
>>> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485da23424a2
>>> description:
>>> 	2008-06-11  Lillian Angel  <langel at redhat.com>
>>>
>>> 	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
>>> 	        like the Sun's verify Java version applet, check for the "_" in the
>>> 	        version string. Our version string format is now correct:
>>> 	        java version "1.6.0_0"
>>> 	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
>>> 	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
>>> 	        * Makefile.in: Regenerated.
>>>       
>> Do we really want this? According to
>> http://java.sun.com/javase/6/webnotes/version-6.html
>> the underscore isn't mentioned at all. Is this further specified?
>>
>> This schema also differs with the Java 6 version number, which displays
>> "1.6.0_06" for the version, and "1.6.0_06-b02" for the full version. Apparently
>> "b02"is used here for the build number, while for OpenJDK the "bxx" part is used
>> as service release / new code drop.
>>     
>
> This actually came from the discussion you and I had on irc. As you
> pointed out one of the first applets people try after installing
> openjdk/icedtea/gcjwebplugin is the test applet one from sun. To verify
> that everything installed fine. That applet fails very ungracefully
> since it assumes the version number from the java.version system
> property has an underscore in it. Apparently applications use this to
> check whether you are running the latest "update version". And they die
> horribly if they don't see the "update number" in the java.version
> property as an underscore-number pair (basically stuffing an empty
> string into new Integer and die when that doesn't parse). Of course
> without the source code it is somewhat hard, maybe we can find someone
> that could find the code for this particular application. But people
> will want to run existing applications, so even if the code makes wrong
> assumptions and we can make them work anyway it is a good idea to add
> the support.
>
> Some more analysis is also in this fedora bug report:
> https://bugzilla.redhat.com/show_bug.cgi?id=449959
>
> I don't know if "0" is a good update number to use, or whether other
> applications expect an higher version there. It would be best if
> applications detected openjdk as the latest and greatest available.
>
> Cheers,
>
> Mark
>
>   

Hey, FWIW, I sent an email to the people in charge of that applet.

They're working on changing it ...

- David Herron


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080616/21da90d5/attachment.html 

From gk at spreadshirt.net  Tue Jun 17 04:21:43 2008
From: gk at spreadshirt.net (=?ISO-8859-1?Q?Guido_K=E4mper?=)
Date: Tue, 17 Jun 2008 13:21:43 +0200
Subject: IcedTea6 1.2 Released!
In-Reply-To: <17c6771e0805291317r512c6cc6xdd610f26013cb41c@mail.gmail.com>
References: <483F0563.2080103@redhat.com>
	<17c6771e0805291317r512c6cc6xdd610f26013cb41c@mail.gmail.com>
Message-ID: <E0DEAAFB-5D16-4E11-B120-9493C830DA81@spreadshirt.net>

Hello all,

congratulations to the new version!

One question: The gnu classpath has a support for using DSSI  
instruments in the sound libraries. Are there plans to include this  
into the IcedTea platform - or is it already included? That would be  
really cool:)

cu,
Guido

Am 29.05.2008 um 22:17 schrieb Andrew John Hughes:

> On 29/05/2008, Lillian Angel <langel at redhat.com> wrote:
>> We are proud to announce the release of IcedTea6 1.2.
>>
>> The IcedTea6 project provides a harness to build the source code from
>> OpenJDK6 (http://openjdk.java.net) using Free Software build tools  
>> and
>> provides replacements libraries for the binary plugs with code from  
>> the
>> GNU Classpath project. More information on IcedTea can be found here:
>> http://icedtea.classpath.org
>>
>>
>> What's New?
>> -----------------
>> - Updated to b09.
>> - Added the the lcms library with PYCC and LINEAR_RGB ICC
>>  profiles.
>> - Integrated Gervill to provide midi support.
>> - JTreg integrated.
>> - NetX fixes:
>>  - Improved security, namely catching Socket permissions during
>>  runtime
>>  - Implemented the remaining JNLP services api
>>  - Applet focusing bug fixed
>> - sparc/sparc64 port
>> - Desktop file integration.
>> - Various zero fixes.
>> - Sound fixes.
>> - Font fixes.
>> - Many bug fixes (http://icedtea.classpath.org/bugzilla/
>> and
>> https://bugzilla.redhat.com/).
>>
>> -----------------
>>
>> The tarball and nosrc RPM can be downloaded here:
>> http://icedtea.classpath.org/download/fedora/java-1.6.0-openjdk-1.6.0.0-0.14.b09.fc9.nosrc.rpm
>> http://icedtea.classpath.org/download/source/icedtea6-1.2.tar.gz
>>
>> The following people helped with this release:
>> Lillian Angel, Gary Benson, Thomas Fitzsimmons, Andrew Haley, Andrew
>> John Hughes, Matthias Klose, Dan Munckton, Parag Nemade, Keith Seitz,
>> Joshua Sumali, Christian Thalinger, Mark Wielaard, Yi Zhan
>>
>>
>> We would also like to thank the bug reporters and testers!
>>
>> To get started:
>> $ hg clone http://icedtea.classpath.org/hg/icedtea6
>> $ cd icedtea6
>>
>> Full build requirements and instructions are in INSTALL:
>> $ ./configure
>> $ make
>>
>>
>>
>
> Congratulations on the release!
> -- 
> Andrew :-)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>



From mark at klomp.org  Tue Jun 17 05:17:18 2008
From: mark at klomp.org (Mark Wielaard)
Date: Tue, 17 Jun 2008 14:17:18 +0200
Subject: IcedTea6 1.2 Released!
In-Reply-To: <E0DEAAFB-5D16-4E11-B120-9493C830DA81@spreadshirt.net>
References: <483F0563.2080103@redhat.com>
	<17c6771e0805291317r512c6cc6xdd610f26013cb41c@mail.gmail.com>
	<E0DEAAFB-5D16-4E11-B120-9493C830DA81@spreadshirt.net>
Message-ID: <1213705038.3156.11.camel@dijkstra.wildebeest.org>

Hi Guido,

On Tue, 2008-06-17 at 13:21 +0200, Guido K?mper wrote:
> congratulations to the new version!

Thanks!

> One question: The gnu classpath has a support for using DSSI  
> instruments in the sound libraries. Are there plans to include this  
> into the IcedTea platform - or is it already included? That would be  
> really cool:)

No it hasn't been integrated yet. All midi handling is currently being
done through Gervill, a software synthesizer. This has as advantage (or
disadvantage, depending on your view), that no direct integration with
the native platform soft synths needs to be done.

I have CCed Anthony Green, who originally wrote the DSSI backend for GNU
Classpath, to see if he might be interested in porting it to IcedTea.
Hi Anthony! :)

Cheers,

Mark



From green at redhat.com  Tue Jun 17 08:30:02 2008
From: green at redhat.com (Anthony Green)
Date: Tue, 17 Jun 2008 08:30:02 -0700
Subject: IcedTea6 1.2 Released!
In-Reply-To: <1213705038.3156.11.camel@dijkstra.wildebeest.org>
References: <483F0563.2080103@redhat.com>	
	<17c6771e0805291317r512c6cc6xdd610f26013cb41c@mail.gmail.com>	
	<E0DEAAFB-5D16-4E11-B120-9493C830DA81@spreadshirt.net>
	<1213705038.3156.11.camel@dijkstra.wildebeest.org>
Message-ID: <4857D87A.7070406@redhat.com>

Mark Wielaard wrote:
> Hi Guido,
>
> On Tue, 2008-06-17 at 13:21 +0200, Guido K?mper wrote:
>   
>> congratulations to the new version!
>>     
>
> Thanks!
>
>   
>> One question: The gnu classpath has a support for using DSSI  
>> instruments in the sound libraries. Are there plans to include this  
>> into the IcedTea platform - or is it already included? That would be  
>> really cool:)
>>     
>
> No it hasn't been integrated yet. All midi handling is currently being
> done through Gervill, a software synthesizer. This has as advantage (or
> disadvantage, depending on your view), that no direct integration with
> the native platform soft synths needs to be done.
>
> I have CCed Anthony Green, who originally wrote the DSSI backend for GNU
> Classpath, to see if he might be interested in porting it to IcedTea.
> Hi Anthony! :)
>   
Hi Mark.  The DSSI providers were written using JNI, so they should be 
easy to port over to IcedTea.  I'm happy to try.  It will give me 
something to do on my flight today.

AG



From gk at spreadshirt.net  Tue Jun 17 08:57:53 2008
From: gk at spreadshirt.net (=?ISO-8859-1?Q?Guido_K=E4mper?=)
Date: Tue, 17 Jun 2008 17:57:53 +0200
Subject: IcedTea6 1.2 Released!
In-Reply-To: <4857D87A.7070406@redhat.com>
References: <483F0563.2080103@redhat.com>	
	<17c6771e0805291317r512c6cc6xdd610f26013cb41c@mail.gmail.com>	
	<E0DEAAFB-5D16-4E11-B120-9493C830DA81@spreadshirt.net>
	<1213705038.3156.11.camel@dijkstra.wildebeest.org>
	<4857D87A.7070406@redhat.com>
Message-ID: <CA998E7D-1E1B-427D-B09C-80D1A5C97233@spreadshirt.net>

wow. very cool :-)

Thanks for trying, i'm really looking forward to downloading the  
nightly builds:)

It sounds interesting to use virtual instruments from Java, that  
should be possible then, isn't it? I am not very involved in this  
project yet, i just saw the specifications and source parts of the gnu  
classpath till now - and the information that it is not yet included.

cu,
Guido

Am 17.06.2008 um 17:30 schrieb Anthony Green:

> Mark Wielaard wrote:
>> Hi Guido,
>>
>> On Tue, 2008-06-17 at 13:21 +0200, Guido K?mper wrote:
>>
>>> congratulations to the new version!
>>>
>>
>> Thanks!
>>
>>
>>> One question: The gnu classpath has a support for using DSSI   
>>> instruments in the sound libraries. Are there plans to include  
>>> this  into the IcedTea platform - or is it already included? That  
>>> would be  really cool:)
>>>
>>
>> No it hasn't been integrated yet. All midi handling is currently  
>> being
>> done through Gervill, a software synthesizer. This has as advantage  
>> (or
>> disadvantage, depending on your view), that no direct integration  
>> with
>> the native platform soft synths needs to be done.
>>
>> I have CCed Anthony Green, who originally wrote the DSSI backend  
>> for GNU
>> Classpath, to see if he might be interested in porting it to IcedTea.
>> Hi Anthony! :)
>>
> Hi Mark.  The DSSI providers were written using JNI, so they should  
> be easy to port over to IcedTea.  I'm happy to try.  It will give me  
> something to do on my flight today.
>
> AG
>



From bugzilla-daemon at icedtea.classpath.org  Wed Jun 18 02:52:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Jun 2008 09:52:03 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K8uKh-0002oN-Mn@icedtea.classpath.org>

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





------- Comment #3 from twisti at complang.tuwien.ac.at  2008-06-18 09:52 -------
Talked a bit to Mark on #openjdk and I tried with OpenJDK7:

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

And it works with this 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 Jun 18 02:52:54 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Jun 2008 09:52:54 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K8uLW-0002oS-Te@icedtea.classpath.org>

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





------- Comment #4 from twisti at complang.tuwien.ac.at  2008-06-18 09:52 -------
<mjw> "The OpenJDK 6 sources branched off from JDK 7 around build 20, circa
late August 2007 to early September 2007"


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


From bugzilla-daemon at icedtea.classpath.org  Wed Jun 18 03:04:23 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Jun 2008 10:04:23 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K8uWd-0002os-3t@icedtea.classpath.org>

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





------- Comment #5 from twisti at complang.tuwien.ac.at  2008-06-18 10:04 -------
Mark did a good guess.  This patch fixes it:

http://hg.openjdk.java.net/jdk7/awt/jdk/rev/9f51e4e1251e

But I got an exception when running the application:

Exception in thread "AWT-EventQueue-0"
java.lang.ArrayIndexOutOfBoundsException: No such child: 0
        at java.awt.Container.getComponent(Container.java:306)
        at javax.swing.JComponent.rectangleIsObscured(JComponent.java:4348)
        at javax.swing.JComponent.paint(JComponent.java:1036)
        at javax.swing.JComponent.paintToOffscreen(JComponent.java:5147)
        at
javax.swing.BufferStrategyPaintManager.paint(BufferStrategyPaintManager.java:302)
        at javax.swing.RepaintManager.paint(RepaintManager.java:1145)
        at javax.swing.JComponent._paintImmediately(JComponent.java:5095)
        at javax.swing.JComponent.paintImmediately(JComponent.java:4905)
        at
javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:740)
        at
javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:696)
        at
javax.swing.RepaintManager.prePaintDirtyRegions(RepaintManager.java:676)
        at javax.swing.RepaintManager.access$700(RepaintManager.java:57)
        at
javax.swing.RepaintManager$ProcessingRunnable.run(RepaintManager.java:1550)
        at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:226)
        at java.awt.EventQueue.dispatchEvent(EventQueue.java:602)
        at
java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
        at
java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
        at
java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
        at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)


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


From bugzilla-daemon at icedtea.classpath.org  Wed Jun 18 06:40:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Jun 2008 13:40:43 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K8xtz-0002vk-M3@icedtea.classpath.org>

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





------- Comment #6 from langel at redhat.com  2008-06-18 13:40 -------
Feel free to commit the patch after testing, and you can close this bug.

Thanks!


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


From bugzilla-daemon at icedtea.classpath.org  Wed Jun 18 06:41:25 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Jun 2008 13:41:25 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K8xuf-0002vs-Vi@icedtea.classpath.org>

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





------- Comment #7 from langel at redhat.com  2008-06-18 13:41 -------
Also, we should be sure to report this upstream to the awt team.


-- 
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 keiths at redhat.com  Wed Jun 18 12:51:32 2008
From: keiths at redhat.com (Keith Seitz)
Date: Wed, 18 Jun 2008 19:51:32 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-dnd-updatecursor.pa...
Message-ID: <hg.ac0e756d55cd.1213818692.2873452341184383832@icedtea.classpath.org>

changeset ac0e756d55cd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ac0e756d55cd
description:
	* patches/icedtea-dnd-updatecursor.patch: New file.
	        * Makefile.am (ICEDTEA_PATHCES): Add above patch.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 19 insertions(+), 1 deletion(-)
ChangeLog                              |    6 ++++++
Makefile.am                            |    1 +
Makefile.in                            |    3 ++-
patches/icedtea-dnd-updatecursor.patch |   10 ++++++++++

diffs (51 lines):

diff -r 03aeec329490 -r ac0e756d55cd ChangeLog
--- a/ChangeLog	Mon Jun 16 20:04:22 2008 +0100
+++ b/ChangeLog	Wed Jun 18 12:51:24 2008 -0700
@@ -1,3 +1,9 @@ 2008-06-09  Andrew John Hughes  <gnu_and
+2008-06-18  Keith Seitz  <keiths at redhat.com>
+
+	* patches/icedtea-dnd-updatecursor.patch: New file.
+	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.in: Regenerated.
+
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR icedtea/140:
diff -r 03aeec329490 -r ac0e756d55cd Makefile.am
--- a/Makefile.am	Mon Jun 16 20:04:22 2008 +0100
+++ b/Makefile.am	Wed Jun 18 12:51:24 2008 -0700
@@ -329,6 +329,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
+	patches/icedtea-dnd-updatecursor.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 03aeec329490 -r ac0e756d55cd Makefile.in
--- a/Makefile.in	Mon Jun 16 20:04:22 2008 +0100
+++ b/Makefile.in	Wed Jun 18 12:51:24 2008 -0700
@@ -432,7 +432,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
diff -r 03aeec329490 -r ac0e756d55cd patches/icedtea-dnd-updatecursor.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-dnd-updatecursor.patch	Wed Jun 18 12:51:24 2008 -0700
@@ -0,0 +1,10 @@
+--- openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java.orig	2008-06-16 12:11:39.000000000 -0700
++++ openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java	2008-06-16 12:18:39.000000000 -0700
+@@ -466,7 +466,6 @@
+ 
+         Cursor c = null;
+ 
+-        targetAct = DnDConstants.ACTION_NONE;
+         switch (status) {
+             case ENTER:
+             case OVER:


From gnu_andrew at member.fsf.org  Thu Jun 19 08:46:18 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 19 Jun 2008 16:46:18 +0100
Subject: [PATCH] Remove dependency on JScheme for generating CORBA exceptions
Message-ID: <17c6771e0806190846n39ceb6d1mf63083bcfc298e1a@mail.gmail.com>

At present, a number of exceptions for CORBA are generated using a
script written in JScheme.
JScheme is thus included in the CORBA tree as a binary 'blob' called
jscheme.jar.  The utility
Java files are also included in binary form in jschemelogutil.jar, as
well as the original source code.

This has arisen as an issue when packaging OpenJDK (in the form of
OpenJDK6/IcedTea6) for Debian:

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

The attached patches avoids this issue by replacing the single JScheme
script used, mc.scm, with a Java-based
equivalent.  This generates identical source code and resource files,
barring a few appropriate changes in the comments.

We've already included this in IcedTea as a patch against OpenJDK6,
but ideally would like to also see it included upstream.

The attached patches were created against a checkout of the latest
CORBA forest (http://hg.openjdk.java.net/jdk7/corba/).  I couldn't see
a way to create a whole forest diff, so I instead create one against
the forest root and one against the CORBA tree.  The patches are
as follows:

* jscheme-root.diff: Removes the JScheme notice from the root README file.
* jscheme-corba.diff: The main patch; adds the new code and Makefile,
and adds this to the build process.
* jscheme-rm.diff: Removes jscheme.jar, jschemelogutil.jar and the
JScheme scripts from the repository.

The second two could be made into one patch if necessary.

I did notice that there seems to be no mailing list or active
development for the CORBA tree, hence this mail to build-dev instead
of
a corba-dev alias (the same seems to be true of jaxws and jaxp too).
Are these not actively maintained or are they maintained outside
the OpenJDK process?

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: jscheme-corba.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080619/6e339c26/jscheme-corba.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: jscheme-root.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080619/6e339c26/jscheme-root.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: jscheme-rm.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080619/6e339c26/jscheme-rm.diff 

From mr at sun.com  Thu Jun 19 10:16:25 2008
From: mr at sun.com (Mark Reinhold)
Date: Thu, 19 Jun 2008 10:16:25 -0700
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions 
In-Reply-To: gnu_andrew@member.fsf.org; Thu, 19 Jun 2008 16:46:18 BST;
	<17c6771e0806190846n39ceb6d1mf63083bcfc298e1a@mail.gmail.com> 
Message-ID: <20080619171625.9A86F5D06@eggemoggin.niobe.net>

Andrew: Thanks for the patch!

The CORBA code isn't maintained directly in OpenJDK, but rather in a
sub-project of GlassFish (https://glassfish-corba.dev.java.net/).

That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)

Ken Cavanaugh owns the glassfish-corba project ...

Ken: What's the best way to handle this?  It'd take longer if OpenJDK
waits for these patches to be applied to the upstream glassfish-corba.
Could we apply them directly in OpenJDK for now, and then sync things
up later?

- Mark

-------------- next part --------------
An embedded message was scrubbed...
From: Andrew John Hughes <gnu_andrew at member.fsf.org>
Subject: [PATCH] Remove dependency on JScheme for generating CORBA exceptions
Date: Thu, 19 Jun 2008 16:46:18 +0100
Size: 77517
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080619/933fab7d/attachment.nws 

From Tim.Bell at Sun.COM  Thu Jun 19 10:27:42 2008
From: Tim.Bell at Sun.COM (Tim Bell)
Date: Thu, 19 Jun 2008 10:27:42 -0700
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
Message-ID: <485A970E.2050704@sun.com>

Mark Reinhold wrote:
> Andrew: Thanks for the patch!
> 
> The CORBA code isn't maintained directly in OpenJDK, but rather in a
> sub-project of GlassFish (https://glassfish-corba.dev.java.net/).
> 
> That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)
> 
> Ken Cavanaugh owns the glassfish-corba project ...
> 
> Ken: What's the best way to handle this?  It'd take longer if OpenJDK
> waits for these patches to be applied to the upstream glassfish-corba.
> Could we apply them directly in OpenJDK for now, and then sync things
> up later?

FYI: In JDK7, this issue is java:build bug-ID 6695776 "corba jscheme jar files in repository 
could be built from source"

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

Tim


From langel at redhat.com  Thu Jun 19 10:36:12 2008
From: langel at redhat.com (Lillian Angel)
Date: Thu, 19 Jun 2008 17:36:12 +0000
Subject: changeset in /hg/icedtea6: 2008-06-19  Lillian Angel  <langel@re...
Message-ID: <hg.c9c356cd3adf.1213896972.2873452341184383832@icedtea.classpath.org>

changeset c9c356cd3adf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c9c356cd3adf
description:
	2008-06-19  Lillian Angel  <langel at redhat.com>

	        Fixes Bug #159
	        * patches/icedtea-component.patch: New file.
	        * Makefile.am (ICEDTEA_PATHCES): Add above patch.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 169 insertions(+), 1 deletion(-)
ChangeLog                       |    7 +
Makefile.am                     |    1 
Makefile.in                     |    3 
patches/icedtea-component.patch |  159 +++++++++++++++++++++++++++++++++++++++

diffs (201 lines):

diff -r ac0e756d55cd -r c9c356cd3adf ChangeLog
--- a/ChangeLog	Wed Jun 18 12:51:24 2008 -0700
+++ b/ChangeLog	Thu Jun 19 13:35:47 2008 -0400
@@ -1,3 +1,10 @@ 2008-06-18  Keith Seitz  <keiths at redhat.
+2008-06-19  Lillian Angel  <langel at redhat.com>
+
+	Fixes Bug #159
+	* patches/icedtea-component.patch: New file.
+	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.in: Regenerated.
+
 2008-06-18  Keith Seitz  <keiths at redhat.com>
 
 	* patches/icedtea-dnd-updatecursor.patch: New file.
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.am
--- a/Makefile.am	Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.am	Thu Jun 19 13:35:47 2008 -0400
@@ -330,6 +330,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.in
--- a/Makefile.in	Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.in	Thu Jun 19 13:35:47 2008 -0400
@@ -432,7 +432,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r ac0e756d55cd -r c9c356cd3adf patches/icedtea-component.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-component.patch	Thu Jun 19 13:35:47 2008 -0400
@@ -0,0 +1,159 @@
+--- openjdk.old/jdk/src/share/classes/java/awt/Component.java	Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/share/classes/java/awt/Component.java	Tue Mar 18 12:04:20 2008 +0300
+@@ -634,6 +634,11 @@ public abstract class Component implemen
+      */
+     private PropertyChangeSupport changeSupport;
+ 
++    private transient final Object changeSupportLock = new Object();
++    private Object getChangeSupportLock() {
++        return changeSupportLock;
++    }
++
+     boolean isPacked = false;
+ 
+     /**
+@@ -7839,15 +7844,17 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+      */
+-    public synchronized void addPropertyChangeListener(
++    public void addPropertyChangeListener(
+                                                        PropertyChangeListener listener) {
+-        if (listener == null) {
+-            return;
+-        }
+-        if (changeSupport == null) {
+-            changeSupport = new PropertyChangeSupport(this);
+-        }
+-        changeSupport.addPropertyChangeListener(listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null) {
++                return;
++            }
++            if (changeSupport == null) {
++                changeSupport = new PropertyChangeSupport(this);
++            }
++            changeSupport.addPropertyChangeListener(listener);
++        }
+     }
+ 
+     /**
+@@ -7863,12 +7870,14 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
+      */
+-    public synchronized void removePropertyChangeListener(
++    public void removePropertyChangeListener(
+                                                           PropertyChangeListener listener) {
+-        if (listener == null || changeSupport == null) {
+-            return;
+-        }
+-        changeSupport.removePropertyChangeListener(listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null || changeSupport == null) {
++                return;
++            }
++            changeSupport.removePropertyChangeListener(listener);
++        }
+     }
+ 
+     /**
+@@ -7885,11 +7894,13 @@ public abstract class Component implemen
+      * @see      java.beans.PropertyChangeSupport#getPropertyChangeListeners
+      * @since    1.4
+      */
+-    public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
+-        if (changeSupport == null) {
+-            return new PropertyChangeListener[0];
+-        }
+-        return changeSupport.getPropertyChangeListeners();
++    public PropertyChangeListener[] getPropertyChangeListeners() {
++        synchronized (getChangeSupportLock()) {
++            if (changeSupport == null) {
++                return new PropertyChangeListener[0];
++            }
++            return changeSupport.getPropertyChangeListeners();
++        }
+     }
+ 
+     /**
+@@ -7923,16 +7934,18 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners(java.lang.String)
+      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+      */
+-    public synchronized void addPropertyChangeListener(
++    public void addPropertyChangeListener(
+                                                        String propertyName,
+                                                        PropertyChangeListener listener) {
+-        if (listener == null) {
+-            return;
+-        }
+-        if (changeSupport == null) {
+-            changeSupport = new PropertyChangeSupport(this);
+-        }
+-        changeSupport.addPropertyChangeListener(propertyName, listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null) {
++                return;
++            }
++            if (changeSupport == null) {
++                changeSupport = new PropertyChangeSupport(this);
++            }
++            changeSupport.addPropertyChangeListener(propertyName, listener);
++        }
+     }
+ 
+     /**
+@@ -7951,13 +7964,15 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners(java.lang.String)
+      * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
+      */
+-    public synchronized void removePropertyChangeListener(
++    public void removePropertyChangeListener(
+                                                           String propertyName,
+                                                           PropertyChangeListener listener) {
+-        if (listener == null || changeSupport == null) {
+-            return;
+-        }
+-        changeSupport.removePropertyChangeListener(propertyName, listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null || changeSupport == null) {
++                return;
++            }
++            changeSupport.removePropertyChangeListener(propertyName, listener);
++        }
+     }
+ 
+     /**
+@@ -7974,12 +7989,14 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @since 1.4
+      */
+-    public synchronized PropertyChangeListener[] getPropertyChangeListeners(
++    public PropertyChangeListener[] getPropertyChangeListeners(
+                                                                             String propertyName) {
+-        if (changeSupport == null) {
+-            return new PropertyChangeListener[0];
+-        }
+-        return changeSupport.getPropertyChangeListeners(propertyName);
++        synchronized (getChangeSupportLock()) {
++            if (changeSupport == null) {
++                return new PropertyChangeListener[0];
++            }
++            return changeSupport.getPropertyChangeListeners(propertyName);
++        }
+     }
+ 
+     /**
+@@ -7994,7 +8011,10 @@ public abstract class Component implemen
+      */
+     protected void firePropertyChange(String propertyName,
+                                       Object oldValue, Object newValue) {
+-        PropertyChangeSupport changeSupport = this.changeSupport;
++        PropertyChangeSupport changeSupport;
++        synchronized (getChangeSupportLock()) {
++            changeSupport = this.changeSupport;
++        }
+         if (changeSupport == null ||
+             (oldValue != null && newValue != null && oldValue.equals(newValue))) {
+             return;


From bugzilla-daemon at icedtea.classpath.org  Thu Jun 19 10:36:23 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 19 Jun 2008 17:36:23 +0000
Subject: [Bug 159] deadlock in AWT code
Message-ID: <E1K9O3b-00047x-A8@icedtea.classpath.org>

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


langel at redhat.com changed:

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




------- Comment #8 from langel at redhat.com  2008-06-19 17:36 -------
I committed the patch in the repo.

Thanks!


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


From Ken.Cavanaugh at Sun.COM  Thu Jun 19 10:35:12 2008
From: Ken.Cavanaugh at Sun.COM (Ken Cavanaugh)
Date: Thu, 19 Jun 2008 10:35:12 -0700
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
Message-ID: <485A98D0.3090602@sun.com>

Mark Reinhold wrote:
> Andrew: Thanks for the patch!
>
> The CORBA code isn't maintained directly in OpenJDK, but rather in a
> sub-project of GlassFish (https://glassfish-corba.dev.java.net/).
>
> That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)
>
> Ken Cavanaugh owns the glassfish-corba project ...
>
> Ken: What's the best way to handle this?  It'd take longer if OpenJDK
> waits for these patches to be applied to the upstream glassfish-corba.
> Could we apply them directly in OpenJDK for now, and then sync things
> up later?
>   
Yes, you should apply the patch now to the OpenJDK workspaces.
I'll take it as a requirement to remove Jscheme from the CORBA master
before we integrate with JDK 7.  I'll take a closer look at the
code from the patch and adapt/replace it as needed.
Some work will be needed because I changed the code
generation for exception wrappers in the later versions of CORBA

Thanks,

Ken.




From iris at sun.com  Thu Jun 19 11:14:57 2008
From: iris at sun.com (iris clark)
Date: Thu, 19 Jun 2008 11:14:57 -0700 (PDT)
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <20080619171625.9A86F5D06@eggemoggin.niobe.net> (message from
	Mark Reinhold on Thu, 19 Jun 2008 10:16:25 -0700)
Message-ID: <200806191814.m5JIEvvi016368@ribbit.SFBay.Sun.COM>


Hi.

> The CORBA code isn't maintained directly in OpenJDK, but rather in a
> sub-project of GlassFish (https://glassfish-corba.dev.java.net/).
>
> That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)

For a list of projects and their associated mailing lists (including
contact info for portions of the not maintained directly in OpenJDK,
see this table in the Developers' Guide:

  http://openjdk.java.net/guide/repositories.html#projects

Thanks,
iris


From mark at klomp.org  Thu Jun 19 14:05:39 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 19 Jun 2008 23:05:39 +0200
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <485A98D0.3090602@sun.com>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
	<485A98D0.3090602@sun.com>
Message-ID: <1213909539.3160.2.camel@dijkstra.wildebeest.org>

Hi Ken,

On Thu, 2008-06-19 at 10:35 -0700, Ken Cavanaugh wrote:
> Mark Reinhold wrote:
> > Andrew: Thanks for the patch!
> >
> > The CORBA code isn't maintained directly in OpenJDK, but rather in a
> > sub-project of GlassFish (https://glassfish-corba.dev.java.net/).
> >
> > That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)
> >
> > Ken Cavanaugh owns the glassfish-corba project ...
> >
> > Ken: What's the best way to handle this?  It'd take longer if OpenJDK
> > waits for these patches to be applied to the upstream glassfish-corba.
> > Could we apply them directly in OpenJDK for now, and then sync things
> > up later?
> >   
> Yes, you should apply the patch now to the OpenJDK workspaces.
> I'll take it as a requirement to remove Jscheme from the CORBA master
> before we integrate with JDK 7.  I'll take a closer look at the
> code from the patch and adapt/replace it as needed.
> Some work will be needed because I changed the code
> generation for exception wrappers in the later versions of CORBA

Aha! That is where the corba master is :)
According to that page the mercurial page is at
http://mercurial2.foundry.sun.com/corba/corba-master but that seems
unreachable. Is there another way to view the current corba master code?

Thanks,

Mark



From Ken.Cavanaugh at Sun.COM  Thu Jun 19 14:12:50 2008
From: Ken.Cavanaugh at Sun.COM (Ken Cavanaugh)
Date: Thu, 19 Jun 2008 14:12:50 -0700
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <1213909539.3160.2.camel@dijkstra.wildebeest.org>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
	<485A98D0.3090602@sun.com>
	<1213909539.3160.2.camel@dijkstra.wildebeest.org>
Message-ID: <485ACBD2.9090305@sun.com>

An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080619/f1ab377c/attachment.html 

From gnu_andrew at member.fsf.org  Thu Jun 19 16:11:38 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 20 Jun 2008 00:11:38 +0100
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <485A970E.2050704@sun.com>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
	<485A970E.2050704@sun.com>
Message-ID: <17c6771e0806191611w66122854n2f29c0223d282146@mail.gmail.com>

On 19/06/2008, Tim Bell <Tim.Bell at sun.com> wrote:
> Mark Reinhold wrote:
>
> > Andrew: Thanks for the patch!
> >
> > The CORBA code isn't maintained directly in OpenJDK, but rather in a
> > sub-project of GlassFish
> (https://glassfish-corba.dev.java.net/).
> >
> > That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)
> >
> > Ken Cavanaugh owns the glassfish-corba project ...
> >
> > Ken: What's the best way to handle this?  It'd take longer if OpenJDK
> > waits for these patches to be applied to the upstream glassfish-corba.
> > Could we apply them directly in OpenJDK for now, and then sync things
> > up later?
> >
>
>  FYI: In JDK7, this issue is java:build bug-ID 6695776 "corba jscheme jar
> files in repository could be built from source"
>
>
> http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6695776
>
>  Tim
>

This bug only focuses on the more minor problem that a binary
(jschemelogutil.jar) is included which could be built from the two
source files listed.  The bigger problem is jscheme.jar, which is
binary only and also isn't owned by Sun.  I added a note to this
effect on the bug too.

The patch here fixes both issues, handling the expanded sources for
'logutil' in the same manner as the stripproperties and idl tools.

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gbenson at redhat.com  Fri Jun 20 08:06:58 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 20 Jun 2008 15:06:58 +0000
Subject: changeset in /hg/icedtea6: 2008-06-20  Gary Benson  <gbenson@red...
Message-ID: <hg.d201ff92afab.1213974418.2873452341184383832@icedtea.classpath.org>

changeset d201ff92afab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d201ff92afab
description:
	2008-06-20  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch: Defuzz.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog                        |    4 ++++
patches/icedtea-core-build.patch |    2 +-

diffs (23 lines):

diff -r c9c356cd3adf -r d201ff92afab ChangeLog
--- a/ChangeLog	Thu Jun 19 13:35:47 2008 -0400
+++ b/ChangeLog	Fri Jun 20 11:06:52 2008 -0400
@@ -1,3 +1,7 @@ 2008-06-19  Lillian Angel  <langel at redha
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Defuzz.
+	
 2008-06-19  Lillian Angel  <langel at redhat.com>
 
 	Fixes Bug #159
diff -r c9c356cd3adf -r d201ff92afab patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Jun 19 13:35:47 2008 -0400
+++ b/patches/icedtea-core-build.patch	Fri Jun 20 11:06:52 2008 -0400
@@ -176,7 +176,7 @@ diff -r 79d639c8a75f openjdk/hotspot/src
 diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-12 04:14:24.000000000 -0500
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-14 17:39:45.000000000 -0500
-@@ -92,8 +92,12 @@
+@@ -89,8 +89,12 @@
  #ifdef TIERED
    #define VMTYPE "Server"
  #else


From gbenson at redhat.com  Fri Jun 20 08:08:35 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 20 Jun 2008 15:08:35 +0000
Subject: changeset in /hg/icedtea6: 2008-06-20  Gary Benson  <gbenson@red...
Message-ID: <hg.4999cbdbc405.1213974515.2873452341184383832@icedtea.classpath.org>

changeset 4999cbdbc405 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4999cbdbc405
description:
	2008-06-20  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero-build.patch: Correctly set CPU.

diffstat:

2 files changed, 22 insertions(+)
ChangeLog                        |    4 ++++
patches/icedtea-zero-build.patch |   18 ++++++++++++++++++

diffs (36 lines):

diff -r d201ff92afab -r 4999cbdbc405 ChangeLog
--- a/ChangeLog	Fri Jun 20 11:06:52 2008 -0400
+++ b/ChangeLog	Fri Jun 20 11:08:28 2008 -0400
@@ -1,3 +1,7 @@ 2008-06-20  Gary Benson  <gbenson at redhat
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero-build.patch: Correctly set CPU.
+
 2008-06-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch: Defuzz.
diff -r d201ff92afab -r 4999cbdbc405 patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch	Fri Jun 20 11:06:52 2008 -0400
+++ b/patches/icedtea-zero-build.patch	Fri Jun 20 11:08:28 2008 -0400
@@ -296,3 +296,21 @@ diff -r c9fa8e3d5aa2 openjdk/corba/make/
    ifeq ($(ARCH), sparc)
      # Linux sparc build can be either 32-bit or 64-bit.
      #   Default to 32, but allow explicit setting to 32 or 64.
+diff -r b5e5d2ef906a openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Jun 19 17:05:23 2008 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Jun 20 10:29:14 2008 +0100
+@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele
+                  WINDOWS_ONLY("windows")         \
+                  SOLARIS_ONLY("solaris")
+ 
++#ifdef ZERO_LIBARCH
++#define CPU      ZERO_LIBARCH
++#else
+ #define CPU      IA32_ONLY("x86")                \
+                  IA64_ONLY("ia64")               \
+                  AMD64_ONLY("amd64")             \
+                  SPARC_ONLY("sparc")
++#endif // ZERO_LIBARCH
+ 
+ const char *Abstract_VM_Version::vm_platform_string() {
+   return OS "-" CPU;


From Joe.Darcy at Sun.COM  Fri Jun 20 16:06:01 2008
From: Joe.Darcy at Sun.COM (Joe Darcy)
Date: Fri, 20 Jun 2008 16:06:01 -0700
Subject: [PATCH] Remove dependency on JScheme for generating CORBA
	exceptions
In-Reply-To: <485A98D0.3090602@sun.com>
References: <20080619171625.9A86F5D06@eggemoggin.niobe.net>
	<485A98D0.3090602@sun.com>
Message-ID: <485C37D9.908@sun.com>

Ken Cavanaugh wrote:
> Mark Reinhold wrote:
>> Andrew: Thanks for the patch!
>>
>> The CORBA code isn't maintained directly in OpenJDK, but rather in a
>> sub-project of GlassFish (https://glassfish-corba.dev.java.net/).
>>
>> That's why there's no CORBA Group.  (The same goes for JAXWS and JAXP.)
>>
>> Ken Cavanaugh owns the glassfish-corba project ...
>>
>> Ken: What's the best way to handle this?  It'd take longer if OpenJDK
>> waits for these patches to be applied to the upstream glassfish-corba.
>> Could we apply them directly in OpenJDK for now, and then sync things
>> up later?
>>   
> Yes, you should apply the patch now to the OpenJDK workspaces.
> I'll take it as a requirement to remove Jscheme from the CORBA master
> before we integrate with JDK 7.  I'll take a closer look at the
> code from the patch and adapt/replace it as needed.
> Some work will be needed because I changed the code
> generation for exception wrappers in the later versions of CORBA
>

Hello.

I've successfully applied Andrew's patch to one of my OpenJDK 6 
workspaces.  Upon successful completion of some testing, I'll put the 
fix back into the Sun-internal OpenJDK 6 master and the fix should then 
be reflected in the next OpenJDK 6 source drop, b11.

Thanks,

-Joe


From bugzilla-daemon at icedtea.classpath.org  Fri Jun 20 19:13:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 21 Jun 2008 02:13:03 +0000
Subject: [Bug 160] New: files fontconfig.Fedora.* in 1.6.0-b09 are wrong
Message-ID: <E1K9sb9-0000es-Jc@icedtea.classpath.org>

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

           Summary: files fontconfig.Fedora.* in 1.6.0-b09 are wrong
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: pablogdc at gmail.com


The files fontconfig.Fedora.bfc and fontconfig.Fedora.properties.src points to
a deprecated font in FC9, where DejaVu was reeplaced by DejaVu LGC; so the java
runtime fallback to standards fonts that are really ugly :-)


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


From bugzilla-daemon at icedtea.classpath.org  Fri Jun 20 19:17:18 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 21 Jun 2008 02:17:18 +0000
Subject: [Bug 160] files fontconfig.Fedora.* in 1.6.0-b09 are wrong
Message-ID: <E1K9sfG-0000fI-SY@icedtea.classpath.org>

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





------- Comment #1 from pablogdc at gmail.com  2008-06-21 02:17 -------
Created an attachment (id=75)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=75&action=view)
fontconfig file for FC9 with fontname DejaVu references fixes

I know that the fontconfig file must work with all posibles Fedoras releases
but in FC9 the fonts DejaVu was replaced by "DejaVu LGC". This files contains
the necesaru fixes to that fontname.


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


From gnu_andrew at member.fsf.org  Sun Jun 22 12:34:38 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:34:38 +0000
Subject: changeset in /hg/icedtea: Fix invalid paths in ChangeLog.
Message-ID: <hg.ea9643ca3a31.1214163278.-6899778133799504387@icedtea.classpath.org>

changeset ea9643ca3a31 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ea9643ca3a31
description:
	Fix invalid paths in ChangeLog.

diffstat:

1 file changed, 5 insertions(+), 5 deletions(-)
ChangeLog |   10 +++++-----

diffs (21 lines):

diff -r 910a55ae501d -r ea9643ca3a31 ChangeLog
--- a/ChangeLog	Mon Jun 02 04:34:01 2008 +0100
+++ b/ChangeLog	Sun Jun 22 00:45:57 2008 +0100
@@ -45,12 +45,12 @@ 2008-05-30  Andrew John Hughes  <gnu_and
 	Remove generated.stamp and make the ports
 	dist dependency explicitly on the directory,
 	not the make target.
-	* b/Makefile.in: Regenerated.
-	* b/acinclude.m4:
+	* Makefile.in: Regenerated.
+	* acinclude.m4:
 	(SET_OS): Removed.
-	* b/configure: Regenerated.
-	* b/configure.ac: Remove call to SET_OS.
-	* b/generated/java/lang/UNIXProcess.java:
+	* configure: Regenerated.
+	* configure.ac: Remove call to SET_OS.
+	* generated/java/lang/UNIXProcess.java:
 	Readded.
 
 2008-05-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>


From mark at klomp.org  Sun Jun 22 12:34:40 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 22 Jun 2008 19:34:40 +0000
Subject: changeset in /hg/icedtea: Integrate b10.
Message-ID: <hg.37c853f39fe3.1214163280.-6899778133799504387@icedtea.classpath.org>

changeset 37c853f39fe3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=37c853f39fe3
description:
	Integrate b10.

	2008-06-01  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
	       (OPENJDK_MD5SUM): Updated.
	       (OPENJDK_VERSION): Updated to b10.
	       (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
	       version and date in b10.
	       (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
	       icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
	       * Makefile.in: Regenerated.
	       * patches/icedtea-copy-plugs.patch: Adjusted to remove sound
	       references in b10.
	       * patches/icedtea-gervill.patch: Adjusted to new sound service
	       files in b10.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
	       * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
	       * patches/icedtea-color-profiles.patch: Removed.
	       * patches/icedtea-hat-spl-gpl.patch: Removed.
	       * patches/icedtea-xinerama.patch: Removed.

diffstat:

8 files changed, 49 insertions(+), 2311 deletions(-)
ChangeLog                            |   21 
Makefile.am                          |   11 
Makefile.in                          |   13 
patches/icedtea-color-profiles.patch |   29 
patches/icedtea-copy-plugs.patch     |   41 
patches/icedtea-gervill.patch        |   28 
patches/icedtea-hat-spl-gpl.patch    | 2133 ----------------------------------
patches/icedtea-xinerama.patch       |   84 -

diffs (truncated from 2509 to 500 lines):

diff -r cebc828cf765 -r 37c853f39fe3 ChangeLog
--- a/ChangeLog	Fri May 30 15:39:55 2008 +0200
+++ b/ChangeLog	Mon Jun 02 00:35:24 2008 +0200
@@ -1,3 +1,24 @@ 2008-05-30  Mark Wielaard  <mark at klomp.o
+2008-06-01  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
+	(OPENJDK_MD5SUM): Updated.
+	(OPENJDK_VERSION): Updated to b10.
+	(OPENJDK_SRC_ZIP): Adjusted to new underscore convention between
+	version and date in b10.
+	(ICEDTEA_PATCHES): Removed icedtea-xinerama.patch,
+	icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-copy-plugs.patch: Adjusted to remove sound
+	references in b10.
+	* patches/icedtea-gervill.patch: Adjusted to new sound service
+	files in b10.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed.
+	* overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed.
+	* patches/icedtea-color-profiles.patch: Removed.
+	* patches/icedtea-hat-spl-gpl.patch: Removed.
+	* patches/icedtea-xinerama.patch: Removed.
+
 2008-05-30  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin.
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.am
--- a/Makefile.am	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.am	Mon Jun 02 00:35:24 2008 +0200
@@ -1,6 +1,6 @@ OPENJDK_DATE = 11_apr_2008
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -200,7 +200,7 @@ if USE_ALT_OPENJDK_SRC_ZIP
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 else
-  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+  OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 endif
 
 stamps/download.stamp:
@@ -303,16 +303,13 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
diff -r cebc828cf765 -r 37c853f39fe3 Makefile.in
--- a/Makefile.in	Fri May 30 15:39:55 2008 +0200
+++ b/Makefile.in	Mon Jun 02 00:35:24 2008 +0200
@@ -249,9 +249,9 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -360,7 +360,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 
 # Download OpenJDK sources.
 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -409,14 +409,13 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-color-profiles.patch
--- a/patches/icedtea-color-profiles.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Changeset: 804b0757d801
-# Author:    prr
-# Date:      2008-04-24 11:58 -0700
-# URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801
-# 
-# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
-# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix.
-# Reviewed-by: jgodinez, avu, prr
-# Contributed-by: aph at redhat.com
-#
-# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/
-
---- openjdk/jdk/make/sun/cmm/Makefile.orig	2008-04-27 23:59:37.000000000 +0200
-+++ openjdk/jdk/make/sun/cmm/Makefile	2008-04-27 23:59:45.000000000 +0200
-@@ -41,12 +41,8 @@
- ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
- 
- iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
--	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
--
--ifndef OPENJDK
--iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
--	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
--endif
-+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
- 
- $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-copy-plugs.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -33,9 +33,9 @@ diff -urN openjdk.orig/jdk/src/share/cla
  
                  Type[] paramTypes = constr.getGenericParameterTypes();
                  if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
-@@ -51,28 +51,19 @@
+--- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig	2008-05-30 09:50:36.000000000 +0200
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-01 23:18:11.000000000 +0200
+@@ -49,33 +49,30 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -64,10 +64,6 @@ diff -urN openjdk.orig/jdk/src/share/cla
 -com/sun/jmx/snmp/daemon/WaitQ.class
 +com/sun/jmx/snmp/daemon/SnmpSession.class
  
- PLUG_SOUND_CLASS_NAMES = \
- com/sun/media/sound/AbstractPlayer.class \
-@@ -128,8 +119,14 @@
- 
  # Class list temp files (used by both import and export of plugs)
  
 +PLUG_GNU_CLASS_NAMES = gnu
@@ -77,14 +73,14 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +PLUG_NETX_CLASS_NAMES = net
 +
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound
-+PLUG_CLASS_AREAS = jmf sound gnu javax netx
+-PLUG_CLASS_AREAS = jmf
++PLUG_CLASS_AREAS = jmf gnu javax netx
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -152,6 +149,21 @@
- 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
- 	  $(ECHO) "$$i" >> $@ ; \
+@@ -93,11 +90,32 @@
+ 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
+ 	  $(ECHO) "$$i" >> $@; \
  	done
 +$(PLUG_TEMPDIR)/gnu.clist:
 +	@$(prep-target)
@@ -104,9 +100,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
-@@ -159,6 +171,12 @@
- 	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
@@ -117,7 +111,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -188,9 +206,9 @@
+@@ -125,9 +143,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -129,10 +123,10 @@ diff -urN openjdk.orig/jdk/src/share/cla
  endef # import-binary-plug-classes
  
  else # IMPORT_BINARY_PLUGS
-@@ -220,12 +238,21 @@
+@@ -153,11 +171,20 @@
+ 
+ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
- import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
 +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
@@ -143,12 +137,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
  # Import all classes from the jar file
  
  import-binary-plug-jar: \
- 	     import-binary-plug-jmf-classes \
--	     import-binary-plug-sound-classes
-+	     import-binary-plug-sound-classes \
+-	     import-binary-plug-jmf-classes
++	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes \
 +	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes \
++	     import-binary-plug-netx-classes
  
- # Import native libraries
+ # Binary plug start/complete messages
  
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-gervill.patch
--- a/patches/icedtea-gervill.patch	Fri May 30 15:39:55 2008 +0200
+++ b/patches/icedtea-gervill.patch	Mon Jun 02 00:35:24 2008 +0200
@@ -1,33 +1,7 @@
 # Adds the provides defined by gervill (and removes non-existing ones).
 # Gervill can be found in the overlays under
 # openjdk/jdk/src/share/classes/com/sun/media/sound
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.orig	2008-04-30 16:12:37.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider	2008-04-30 16:06:18.000000000 +0200
-@@ -1,5 +1,5 @@
- # Providers for midi devices
--com.sun.media.sound.MixerSynthProvider
- com.sun.media.sound.RealTimeSequencerProvider
- com.sun.media.sound.MidiOutDeviceProvider
- com.sun.media.sound.MidiInDeviceProvider
-+com.sun.media.sound.SoftProvider
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.orig	2008-04-30 16:13:18.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader	2008-04-30 16:07:16.000000000 +0200
-@@ -1,2 +1,6 @@
- # Providers for Soundbanks
--com.sun.media.sound.HsbParser
-+com.sun.media.sound.PATSoundbankReader
-+com.sun.media.sound.DLSSoundbankReader
-+com.sun.media.sound.JARSoundbankReader
-+com.sun.media.sound.AudioFileSoundbankReader
-+com.sun.media.sound.SF2SoundbankReader
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.orig	2008-04-30 16:13:58.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader	2008-04-30 16:01:27.000000000 +0200
-@@ -2,3 +2,5 @@
- com.sun.media.sound.AuFileReader
- com.sun.media.sound.AiffFileReader
- com.sun.media.sound.WaveFileReader
-+com.sun.media.sound.WaveFloatFileReader
-+com.sun.media.sound.SoftMidiAudioFileReader
+# (This currently overrides the one from b10 because we track Gervill CVS)
 --- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
 @@ -2,3 +2,4 @@
diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-hat-spl-gpl.patch
--- a/patches/icedtea-hat-spl-gpl.patch	Fri May 30 15:39:55 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2133 +0,0 @@
-Changeset: d70a63c92b49
-Author:    ohair
-Date:      2008-04-30 17:34 -0700
-URL:       http://hg.openjdk.java.net/jdk7/build/jdk/rev/d70a63c92b49
-
-6695553: Cleanup GPLv2+SPL legal notices in hat sources
-Summary: Just correcting the legal notices on the HAT sources.
-Reviewed-by: alanb
-
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -23,18 +23,10 @@
-  * have any questions.
-  */
- 
--
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml	Wed Apr 30 17:34:41 2008 -0700
-@@ -27,19 +27,9 @@
- 
- <!-- 
- 
-- The contents of this file are subject to the Sun Public License
-- Version 1.0 (the "License"); you may not use this file except in
-- compliance with the License. A copy of the License is available at
-- http://www.sun.com/, and in the file LICENSE.html in the
-- doc directory.
-- 
-  The Original Code is HAT. The Initial Developer of the
-  Original Code is Bill Foote, with contributions from others
-- at JavaSoft/Sun. Portions created by Bill Foote and others
-- at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- 
-- In addition to the formal license, I ask that you don't
-- change the history or donations files without permission.
-+ at JavaSoft/Sun.
- 
- -->
- 
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 1997-2005 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
-@@ -25,20 +25,9 @@
- 
- 
- /*
-- * The contents of this file are subject to the Sun Public License
-- * Version 1.0 (the "License"); you may not use this file except in
-- * compliance with the License. A copy of the License is available at
-- * http://www.sun.com/, and in the file LICENSE.html in the
-- * doc directory.
-- *
-  * The Original Code is HAT. The Initial Developer of the
-  * Original Code is Bill Foote, with contributions from others
-- * at JavaSoft/Sun. Portions created by Bill Foote and others
-- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved.
-- *
-- * In addition to the formal license, I ask that you don't
-- * change the history or donations files without permission.
-- *
-+ * at JavaSoft/Sun.
-  */
- 
- package com.sun.tools.hat.internal.model;
---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Fri Apr 18 16:40:32 2008 -0700
-+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java	Wed Apr 30 17:34:41 2008 -0700
-@@ -1,5 +1,5 @@


From mark at klomp.org  Sun Jun 22 12:34:41 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 22 Jun 2008 19:34:41 +0000
Subject: changeset in /hg/icedtea: Add hotspot eclipse crasher patch fix ...
Message-ID: <hg.e4b644655e78.1214163281.-6899778133799504387@icedtea.classpath.org>

changeset e4b644655e78 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e4b644655e78
description:
	Add hotspot eclipse crasher patch fix for sun bu #6614100.

	2008-06-08  Mark Wielaard  <mark at klomp.org>

	       * Makefile.am (ZERO_PATCHES): Add
	       patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
	       (NON_ZERO_PATCHES): New patch list.
	       (ZERO_PATCHES_COND): Use new NON_ZERO_PATCHES list when necessary.
	       * Makefile.in: Regenerate.
	       * patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
	       * patches/icedtea-eclipse-hotspot-6614100-6b06.patch: New patch.

diffstat:

5 files changed, 159 insertions(+), 5 deletions(-)
ChangeLog                                          |   10 ++
Makefile.am                                        |    9 +-
Makefile.in                                        |   12 ++-
patches/icedtea-eclipse-hotspot-6614100-6b06.patch |   56 ++++++++++++++
patches/icedtea-eclipse-hotspot-6614100-7b24.patch |   77 ++++++++++++++++++++

diffs (203 lines):

diff -r 37c853f39fe3 -r e4b644655e78 ChangeLog
--- a/ChangeLog	Mon Jun 02 00:35:24 2008 +0200
+++ b/ChangeLog	Sun Jun 08 18:51:47 2008 +0200
@@ -1,3 +1,13 @@ 2008-06-01  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (ZERO_PATCHES): Add
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
+	(NON_ZERO_PATCHES): New patch list.
+	(ZERO_PATCHES_COND): Use new NON_ZERO_PATCHES list when necessary.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
+	* patches/icedtea-eclipse-hotspot-6614100-6b06.patch: New patch.
+
 2008-06-01  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (OPENJDK_DATE): Updated to 30_may_2008.
diff -r 37c853f39fe3 -r e4b644655e78 Makefile.am
--- a/Makefile.am	Mon Jun 02 00:35:24 2008 +0200
+++ b/Makefile.am	Sun Jun 08 18:51:47 2008 +0200
@@ -259,12 +259,17 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
 
 if ZERO_BUILD
   ZERO_PATCHES_COND = $(ZERO_PATCHES)
 else
-  ZERO_PATCHES_COND = 
+  ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
 endif
 
 ICEDTEA_PATCHES = \
diff -r 37c853f39fe3 -r e4b644655e78 Makefile.in
--- a/Makefile.in	Mon Jun 02 00:35:24 2008 +0200
+++ b/Makefile.in	Sun Jun 08 18:51:47 2008 +0200
@@ -378,9 +378,15 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-copy-plugs.patch patches/icedtea-version.patch \
diff -r 37c853f39fe3 -r e4b644655e78 patches/icedtea-eclipse-hotspot-6614100-6b06.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-eclipse-hotspot-6614100-6b06.patch	Sun Jun 08 18:51:47 2008 +0200
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User never
+# Date 1212727493 25200
+# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
+# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
+6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
+Reviewed-by: kvn, jrose, rasbold
+
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
+@@ -1551,45 +1551,6 @@
+     if (opt != NULL)  return opt;
+   }
+ 
+-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
+-    // Try to undo Phi of AddP:
+-    //   (Phi (AddP base base y) (AddP base2 base2 y))
+-    // becomes:
+-    //   newbase := (Phi base base2)
+-    //   (AddP newbase newbase y)
+-    //
+-    // This occurs as a result of unsuccessful split_thru_phi and
+-    // interferes with taking advantage of addressing modes.  See the
+-    // clone_shift_expressions code in matcher.cpp
+-    Node* addp = in(1);
+-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
+-    Node* y = addp->in(AddPNode::Offset);
+-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
+-      // make sure that all the inputs are similar to the first one,
+-      // i.e. AddP with base == address and same offset as first AddP
+-      bool doit = true;
+-      for (uint i = 2; i < req(); i++) {
+-        if (in(i) == NULL ||
+-            in(i)->Opcode() != Op_AddP ||
+-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
+-            in(i)->in(AddPNode::Offset) != y) {
+-          doit = false;
+-          break;
+-        }
+-        // Accumulate type for resulting Phi
+-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
+-      }
+-      if (doit) {
+-        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
+-        for (uint i = 1; i < req(); i++) {
+-          base->init_req(i, in(i)->in(AddPNode::Base));
+-        }
+-        phase->is_IterGVN()->register_new_node_with_optimizer(base);
+-        return new (phase->C, 4) AddPNode(base, base, y);
+-      }
+-    }
+-  }
+-
+   // Split phis through memory merges, so that the memory merges will go away.
+   // Piggy-back this transformation on the search for a unique input....
+   // It will be as if the merged memory is the unique value of the phi.
diff -r 37c853f39fe3 -r e4b644655e78 patches/icedtea-eclipse-hotspot-6614100-7b24.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-eclipse-hotspot-6614100-7b24.patch	Sun Jun 08 18:51:47 2008 +0200
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User never
+# Date 1212727493 25200
+# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
+# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
+6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
+Reviewed-by: kvn, jrose, rasbold
+
+--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	Thu Jun 05 15:43:18 2008 -0700
++++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	Thu Jun 05 21:44:53 2008 -0700
+@@ -1621,64 +1621,6 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bo
+     if (opt != NULL)  return opt;
+   }
+ 
+-  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
+-    // Try to undo Phi of AddP:
+-    //   (Phi (AddP base base y) (AddP base2 base2 y))
+-    // becomes:
+-    //   newbase := (Phi base base2)
+-    //   (AddP newbase newbase y)
+-    //
+-    // This occurs as a result of unsuccessful split_thru_phi and
+-    // interferes with taking advantage of addressing modes.  See the
+-    // clone_shift_expressions code in matcher.cpp
+-    Node* addp = in(1);
+-    const Type* type = addp->in(AddPNode::Base)->bottom_type();
+-    Node* y = addp->in(AddPNode::Offset);
+-    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
+-      // make sure that all the inputs are similar to the first one,
+-      // i.e. AddP with base == address and same offset as first AddP
+-      bool doit = true;
+-      for (uint i = 2; i < req(); i++) {
+-        if (in(i) == NULL ||
+-            in(i)->Opcode() != Op_AddP ||
+-            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
+-            in(i)->in(AddPNode::Offset) != y) {
+-          doit = false;
+-          break;
+-        }
+-        // Accumulate type for resulting Phi
+-        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
+-      }
+-      Node* base = NULL;
+-      if (doit) {
+-        // Check for neighboring AddP nodes in a tree.
+-        // If they have a base, use that it.
+-        for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) {
+-          Node* u = this->fast_out(k);
+-          if (u->is_AddP()) {
+-            Node* base2 = u->in(AddPNode::Base);
+-            if (base2 != NULL && !base2->is_top()) {
+-              if (base == NULL)
+-                base = base2;
+-              else if (base != base2)
+-                { doit = false; break; }
+-            }
+-          }
+-        }
+-      }
+-      if (doit) {
+-        if (base == NULL) {
+-          base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
+-          for (uint i = 1; i < req(); i++) {
+-            base->init_req(i, in(i)->in(AddPNode::Base));
+-          }
+-          phase->is_IterGVN()->register_new_node_with_optimizer(base);
+-        }
+-        return new (phase->C, 4) AddPNode(base, base, y);
+-      }
+-    }
+-  }
+-
+   // Split phis through memory merges, so that the memory merges will go away.
+   // Piggy-back this transformation on the search for a unique input....
+   // It will be as if the merged memory is the unique value of the phi.
+


From mark at klomp.org  Sun Jun 22 12:34:43 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 22 Jun 2008 19:34:43 +0000
Subject: changeset in /hg/icedtea: Import Gervill CVS fixes.
Message-ID: <hg.94f0c8f3a4aa.1214163283.-6899778133799504387@icedtea.classpath.org>

changeset 94f0c8f3a4aa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=94f0c8f3a4aa
description:
	Import Gervill CVS fixes.

	2008-08-08  Mark Wielaard  <mark at klomp.org>

	       * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	       Import Gervill fixes from CVS. See CHANGES.txt.
	       * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.

	- Cleanup: Make inner classes static
	           AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
	           AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
	           AudioFloatFormatConverter.AudioFloatInputStreamResampler
	           SimpleInstrument.SimpleInstrumentPart
	           SoftChorus.VariableDelay
	           SoftChorus.LFODelay
	           SoftMixingDataLine.AudioFloatInputStreamResampler
	           SoftMixingSourceDataLine.NonBlockingFloatInputStream
	           SoftReverb.AllPass
	           SoftReverb.Comb
	           SoftReverb.Delay
	- Cleanup: Remove unused fields in:
	           SoftSincResampler.din, SoftLanczosResampler.din,
	           SoftMainMixer.finetuning,  SoftMainMixer.coarsetuning
	           SoftJitterCorrector.JitterStream.nullbuff,
	           SoftAbstractResampler.ModelAbstractResampler.loopread
	           SoftAbstractResampler.ModelAbstractResampler.streammarked
	- Cleanup: Remove dead code from FFT.
	- Cleanup: Make constant fields in SoftFilter final.
	- Cleanup: Let SoftSynthesizer.info be final.
	- Cleanup: Let SoftProvider.info be final.
	- Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer
	       causes random hangs in SoftSynthesizer.open jtreg test.
	       This happens when the synthesizer is opened and right after closed.
	       This will not happen if there is a delay between open and close call.
	- Fix: ModelByteBufferAudioFileSoundbankReader,
	       SoftAudioPusher, SoftJitterCorrector
	       don't ignore stream.read return value.
	- Fix: NullPointerException in
	       SoftSynthesizer.unloadInstrument if instrument = null
	- Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream.
	- Fix: Futile attempts to guard buffers variable in SoftJitterCorrector.
	- Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read
	       when reading from stream.
	       JTreg tests where created to test for this.

diffstat:

49 files changed, 844 insertions(+), 203 deletions(-)
ChangeLog                                                                                              |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java               |   80 +++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java                    |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java              |   12 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt                                 |   37 +++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                           |   60 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java                     |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                                    |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java                     |   32 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java                        |    9 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java               |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java                        |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt                                  |    3 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                             |   49 +++-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                           |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java                       |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java                  |    5 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java                        |   10 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                             |    4 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                             |   26 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java                         |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java                    |   21 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java                   |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                          |    4 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java                     |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java                        |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java                |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java               |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                           |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                             |    6 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java                      |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java                        |   13 -
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java             |   52 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java      |   63 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java     |  119 ++++++++++
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java              |   54 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java             |   52 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java      |   63 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java     |  119 ++++++++++
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java              |   54 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java                |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java           |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java      |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java             |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java        |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java          |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java     |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java                         |   20 +

diffs (truncated from 1938 to 500 lines):

diff -r e4b644655e78 -r 94f0c8f3a4aa ChangeLog
--- a/ChangeLog	Sun Jun 08 18:51:47 2008 +0200
+++ b/ChangeLog	Sun Jun 08 21:21:14 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill fixes from CVS. See CHANGES.txt.
+	* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
+
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (ZERO_PATCHES): Add
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
@@ -26,6 +26,7 @@ package com.sun.media.sound;
 package com.sun.media.sound;
 
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +42,7 @@ import javax.sound.sampled.UnsupportedAu
 /**
  * Soundbank reader that uses audio files as soundbanks.
  * 
- * @version %I%, %E% 
+ * @version %I%, %E%
  * @author Karl Helgason
  * 
  */
@@ -81,34 +82,32 @@ public class AudioFileSoundbankReader ex
 			throws InvalidMidiDataException, IOException {
 
 		try {
-			try {
-				byte[] buffer;
-				if (ais.getFrameLength() == -1) {
-					ByteArrayOutputStream baos = new ByteArrayOutputStream();
-					byte[] buff = new byte[1024 - (1024 % ais.getFormat().getFrameSize())];
-					int ret;
-					while ((ret = ais.read(buff)) != -1)
-						baos.write(buff, 0, ret);
-					ais.close();
-					buffer = baos.toByteArray();
-				} else {
-					buffer = new byte[(int) (ais.getFrameLength() * ais
-							.getFormat().getFrameSize())];
-					ais.read(buffer);
-				}
-				ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-						new ModelByteBuffer(buffer), ais.getFormat(), -4800);
-				ModelPerformer performer = new ModelPerformer();
-				;
-				performer.getOscillators().add(osc);
+			byte[] buffer;
+			if (ais.getFrameLength() == -1) {
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buff = new byte[1024 - (1024 % ais.getFormat()
+						.getFrameSize())];
+				int ret;
+				while ((ret = ais.read(buff)) != -1)
+					baos.write(buff, 0, ret);
+				ais.close();
+				buffer = baos.toByteArray();
+			} else {
+				buffer = new byte[(int) (ais.getFrameLength() * ais.getFormat()
+						.getFrameSize())];
+				new DataInputStream(ais).readFully(buffer);
+			}
+			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+					new ModelByteBuffer(buffer), ais.getFormat(), -4800);
+			ModelPerformer performer = new ModelPerformer();
+			;
+			performer.getOscillators().add(osc);
 
-				SimpleSoundbank sbk = new SimpleSoundbank();
-				SimpleInstrument ins = new SimpleInstrument();
-				ins.add(performer);
-				sbk.addInstrument(ins);
-				return sbk;
-			} finally {
-			}
+			SimpleSoundbank sbk = new SimpleSoundbank();
+			SimpleInstrument ins = new SimpleInstrument();
+			ins.add(performer);
+			sbk.addInstrument(ins);
+			return sbk;
 		} catch (Exception e) {
 			return null;
 		}
@@ -117,18 +116,18 @@ public class AudioFileSoundbankReader ex
 	public Soundbank getSoundbank(File file) throws InvalidMidiDataException,
 			IOException {
 
-		try {									
-				AudioInputStream ais = AudioSystem.getAudioInputStream(file);
-				ais.close();
-				ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+		try {
+			AudioInputStream ais = AudioSystem.getAudioInputStream(file);
+			ais.close();
+			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
 					new ModelByteBuffer(file, 0, file.length()), -4800);
-				ModelPerformer performer = new ModelPerformer();				
-				performer.getOscillators().add(osc);
-				SimpleSoundbank sbk = new SimpleSoundbank();
-				SimpleInstrument ins = new SimpleInstrument();
-				ins.add(performer);
-				sbk.addInstrument(ins);
-				return sbk;							
+			ModelPerformer performer = new ModelPerformer();
+			performer.getOscillators().add(osc);
+			SimpleSoundbank sbk = new SimpleSoundbank();
+			SimpleInstrument ins = new SimpleInstrument();
+			ins.add(performer);
+			sbk.addInstrument(ins);
+			return sbk;
 		} catch (UnsupportedAudioFileException e1) {
 			return null;
 		} catch (IOException e) {
@@ -136,6 +135,5 @@ public class AudioFileSoundbankReader ex
 		}
 
 	}
-	
-	
+
 }
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 21:21:14 2008 +0200
@@ -923,7 +923,7 @@ public abstract class AudioFloatConverte
 				if (format.getSampleSizeInBits() <= 8)
 					conv = new AudioFloatConversion8S();
 				else if (format.getSampleSizeInBits() > 8
-						& format.getSampleSizeInBits() <= 16)
+						&& format.getSampleSizeInBits() <= 16)
 					conv = new AudioFloatConversion16SL();
 				else if (format.getSampleSizeInBits() > 16
 						&& format.getSampleSizeInBits() <= 24)
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java	Sun Jun 08 21:21:14 2008 +0200
@@ -47,7 +47,7 @@ import javax.sound.sampled.spi.FormatCon
 
 public class AudioFloatFormatConverter extends FormatConversionProvider {
 
-	private class AudioFloatFormatConverterInputStream extends InputStream
+	private static class AudioFloatFormatConverterInputStream extends InputStream
 	{
 		private AudioFloatConverter converter;
 		private AudioFloatInputStream stream;
@@ -109,7 +109,7 @@ public class AudioFloatFormatConverter e
 		
 	}
 	
-	private class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream
+	private static class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream
 	{
 		
 		private int targetChannels;
@@ -217,7 +217,7 @@ public class AudioFloatFormatConverter e
 		
 	}
 	
-	private class AudioFloatInputStreamResampler extends AudioFloatInputStream
+	private static class AudioFloatInputStreamResampler extends AudioFloatInputStream
 	{
 		
 		private AudioFloatInputStream ais;
@@ -476,16 +476,16 @@ public class AudioFloatFormatConverter e
 	}	
 
 	public Encoding[] getSourceEncodings() {
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public Encoding[] getTargetEncodings() {
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public Encoding[] getTargetEncodings(AudioFormat sourceFormat) {
 		if(AudioFloatConverter.getConverter(sourceFormat) == null) return new Encoding[0]; 
-		return formats;
+		return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT};
 	}
 
 	public AudioFormat[] getTargetFormats(Encoding targetEncoding, AudioFormat sourceFormat) {
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Sun Jun 08 21:21:14 2008 +0200
@@ -1,3 +1,39 @@
+  - Cleanup: Make inner classes static 
+              AudioFloatFormatConverter.AudioFloatFormatConverterInputStream
+              AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer
+              AudioFloatFormatConverter.AudioFloatInputStreamResampler
+              SimpleInstrument.SimpleInstrumentPart
+              SoftChorus.VariableDelay
+              SoftChorus.LFODelay
+              SoftMixingDataLine.AudioFloatInputStreamResampler
+              SoftMixingSourceDataLine.NonBlockingFloatInputStream
+              SoftReverb.AllPass
+              SoftReverb.Comb
+              SoftReverb.Delay
+  - Cleanup: Remove unused fields in:
+              SoftSincResampler.din, SoftLanczosResampler.din, 
+              SoftMainMixer.finetuning,  SoftMainMixer.coarsetuning
+              SoftJitterCorrector.JitterStream.nullbuff, 
+              SoftAbstractResampler.ModelAbstractResampler.loopread
+              SoftAbstractResampler.ModelAbstractResampler.streammarked
+  - Cleanup: Remove dead code from FFT.
+  - Cleanup: Make constant fields in SoftFilter final.
+  - Cleanup: Let SoftSynthesizer.info be final.
+  - Cleanup: Let SoftProvider.info be final.
+  - Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer 
+         causes random hangs in SoftSynthesizer.open jtreg test.
+         This happens when the synthesizer is opened and right after closed.
+         This will not happen if there is a delay between open and close call.
+  - Fix: ModelByteBufferAudioFileSoundbankReader, 
+         SoftAudioPusher, SoftJitterCorrector
+          don't ignore stream.read return value.
+  - Fix: NullPointerException in 
+         SoftSynthesizer.unloadInstrument if instrument = null       
+  - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream.
+  - Fix: Futile attempts to guard buffers variable in SoftJitterCorrector.
+  - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read 
+         when reading from stream.
+         JTreg tests where created to test for this.
   - Added: Software Mixing Mixer
   - Removed: PATSoundBankReader removed because no format license is available.
              It is also undocumented format. 
@@ -22,6 +58,7 @@
          If illegal notenumber was used in NoteOn/NoteOff
          a ArrayOutOfIndex exception was thrown.
          
+Version 1.0 (released in OpenJDK 6 b10)
   - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm
   - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info
   - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java	Sun Jun 08 21:21:14 2008 +0200
@@ -111,6 +111,10 @@ public class DLSSoundbank implements Sou
 			return d;
 		}
 		
+		public int hashCode() {
+			return (int)i1;
+		}
+				
 		public boolean equals(Object obj) {
 			if(!(obj instanceof DLSID)) return false;
 			DLSID t = (DLSID)obj;
@@ -230,15 +234,15 @@ public class DLSSoundbank implements Sou
 					if(!readCdlChunk(chunk))
 						throw new RIFFInvalidFormatException("DLS file isn't supported!");
 				}
-				if (chunk.getFormat().equals("colh")) {
+				//if (chunk.getFormat().equals("colh")) {
 					// - skipped because we will load the entire bank into memory
 					// long instrumentcount = chunk.readUnsignedInt();
 					// System.out.println("instrumentcount = "+ instrumentcount);					
-				}
-				if (chunk.getFormat().equals("ptbl")) {
+				//}
+				//if (chunk.getFormat().equals("ptbl")) {
 					// Pool Table Chunk
 					// - skipped because we will load the entire bank into memory
-				}	
+				//}	
 				if (chunk.getFormat().equals("vers")) {
 					major = chunk.readUnsignedInt();
 					minor = chunk.readUnsignedInt();
@@ -300,80 +304,80 @@ public class DLSSoundbank implements Sou
 			case DLS_CDL_AND:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) & (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_OR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) | (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_XOR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) ^ (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) ^ (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_ADD:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x+y ));
+				stack.push(Long.valueOf( x+y ));
 				break;
 			case DLS_CDL_SUBTRACT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x-y ));
+				stack.push(Long.valueOf( x-y ));
 				break;
 			case DLS_CDL_MULTIPLY:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x*y ));
+				stack.push(Long.valueOf( x*y ));
 				break;
 			case DLS_CDL_DIVIDE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( x/y ));
+				stack.push(Long.valueOf( x/y ));
 				break;
 			case DLS_CDL_LOGICAL_AND:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) & (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_LOGICAL_OR:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( ((x!=0) | (y!=0)) ?1:0));
+				stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0));
 				break;
 			case DLS_CDL_LT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x < y) ?1:0));
+				stack.push(Long.valueOf( (x < y) ?1:0));
 				break;				
 			case DLS_CDL_LE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x <= y) ?1:0));
+				stack.push(Long.valueOf( (x <= y) ?1:0));
 				break;				
 			case DLS_CDL_GT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x > y) ?1:0));
+				stack.push(Long.valueOf( (x > y) ?1:0));
 				break;				
 			case DLS_CDL_GE:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x >= y) ?1:0));
+				stack.push(Long.valueOf( (x >= y) ?1:0));
 				break;				
 			case DLS_CDL_EQ:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long( (x == y) ?1:0));
+				stack.push(Long.valueOf( (x == y) ?1:0));
 				break;		
 			case DLS_CDL_NOT:
 				x = stack.pop();
 				y = stack.pop();
-				stack.push(new Long((x==0)?1:0));
+				stack.push(Long.valueOf((x==0)?1:0));
 				break;
 			case DLS_CDL_CONST:
-				stack.push(new Long(riff.readUnsignedInt()));
+				stack.push(Long.valueOf(riff.readUnsignedInt()));
 				break;
 			case DLS_CDL_QUERY:
 				uuid = DLSID.read(riff);
@@ -381,7 +385,7 @@ public class DLSSoundbank implements Sou
 				break;				
 			case DLS_CDL_QUERYSUPPORTED:
 				uuid = DLSID.read(riff);
-				stack.push(new Long(cdlIsQuerySupported(uuid)?1:0));
+				stack.push(Long.valueOf(cdlIsQuerySupported(uuid)?1:0));
 				break;				
 			default:
 				break;
@@ -527,7 +531,7 @@ public class DLSSoundbank implements Sou
 				if(format.equals("dlid"))
 				{
 					instrument.guid = new byte[16];
-					chunk.read(instrument.guid);	
+					chunk.readFully(instrument.guid);	
 				}
 				if(format.equals("insh"))
 				{
@@ -559,7 +563,7 @@ public class DLSSoundbank implements Sou
 		long size = riff.readUnsignedInt();
 		long count = riff.readUnsignedInt();
 		
-		if(size - 8 != 0) riff.skip(size - 8);
+		if(size - 8 != 0) riff.skipBytes(size - 8);
 
 		for (int i = 0; i < count; i++) {
 			
@@ -579,7 +583,7 @@ public class DLSSoundbank implements Sou
 		long size = riff.readUnsignedInt();
 		long count = riff.readUnsignedInt();
 		
-		if(size - 8 != 0) riff.skip(size - 8);
+		if(size - 8 != 0) riff.skipBytes(size - 8);
 
 		for (int i = 0; i < count; i++) {
 			
@@ -686,7 +690,7 @@ public class DLSSoundbank implements Sou
 		
 		if(size > 20)
 		{
-			riff.skip(size - 20);
+			riff.skipBytes(size - 20);
 		}
 		
 		for (int i = 0; i < loops; i++) {
@@ -698,7 +702,7 @@ public class DLSSoundbank implements Sou
 			sampleOptions.loops.add(loop);
 			if(size2 > 16)
 			{
-				riff.skip(size2 - 16);
+				riff.skipBytes(size2 - 16);
 			}			
 		}
 	}
@@ -776,7 +780,7 @@ public class DLSSoundbank implements Sou
 				if(format.equals("dlid"))
 				{
 					sample.guid = new byte[16];
-					chunk.read(sample.guid);	
+					chunk.readFully(sample.guid);	
 				}	
 
 				if(format.equals("fmt "))
@@ -936,7 +940,7 @@ public class DLSSoundbank implements Sou
 		List<Long> offsettable = new ArrayList<Long>(); 
 		for (DLSSample sample : samples) 
 		{
-			offsettable.add(new Long(wvpl.getFilePointer() - off));
+			offsettable.add(Long.valueOf(wvpl.getFilePointer() - off));
 			writeSample(wvpl.writeList("wave"), sample);
 		}
 		
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java	Sun Jun 08 21:21:14 2008 +0200
@@ -49,7 +49,7 @@ import com.sun.media.sound.SF2Soundbank;
  */ 
 public class EmergencySoundbank {
 	
-	public static String[] general_midi_instruments = { 
+	private final static String[] general_midi_instruments = { 
 	"Acoustic Grand Piano",
 	"Bright Acoustic Piano",
 	"Electric Grand Piano",
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java	Sun Jun 08 21:21:14 2008 +0200
@@ -158,7 +158,6 @@ public final class FFT {
 	private final static void calcF2E(int fftFrameSize, double[] data, int i,
 			int nstep, double[] w) {
 		int jmax = nstep;
-		nstep <<= 1;
 		for (int n = 0; n < jmax; n += 2) {
 			double wr = w[i++];
 			double wi = w[i++];
diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java	Sun Jun 08 18:51:47 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
@@ -82,23 +82,29 @@ public class JARSoundbankReader extends 
 		URLClassLoader ucl = URLClassLoader.newInstance(new URL[] {url});
 		InputStream stream = ucl.getResourceAsStream("META-INF/services/javax.sound.midi.Soundbank");
 		if(stream == null) return null;
-		BufferedReader r = new BufferedReader(new InputStreamReader(stream));
-		String line = r.readLine();
-		while (line != null) {
-			if (!line.startsWith("#")) {
-				try {
-					Class c = Class.forName(line.trim(), true, ucl);
-					Object o = c.newInstance();
-					if (o instanceof Soundbank) {
-						soundbanks.add((Soundbank)o);
+		try
+		{
+			BufferedReader r = new BufferedReader(new InputStreamReader(stream));
+			String line = r.readLine();
+			while (line != null) {
+				if (!line.startsWith("#")) {
+					try {
+						Class c = Class.forName(line.trim(), true, ucl);
+						Object o = c.newInstance();
+						if (o instanceof Soundbank) {
+							soundbanks.add((Soundbank)o);
+						}
+					} catch (Exception e) {
+						e.printStackTrace();


From mark at klomp.org  Sun Jun 22 12:34:44 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 22 Jun 2008 19:34:44 +0000
Subject: changeset in /hg/icedtea: Import Gervill CVS source reformatting.
Message-ID: <hg.5a126447fc2c.1214163284.-6899778133799504387@icedtea.classpath.org>

changeset 5a126447fc2c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5a126447fc2c
description:
	Import Gervill CVS source reformatting.

	2008-06-08  Mark Wielaard  <mark at klomp.org>

	        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	        Import Gervill CVS source reformatting.

diffstat:

101 files changed, 24535 insertions(+), 25117 deletions(-)
ChangeLog                                                                                    |    5 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java     |  166 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java          | 2014 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java    | 1067 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java        |  488 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java             |  130 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java |   97 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java                      |  206 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java                |  798 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java                 |  607 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java                    |  238 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java                    |  195 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java                |  103 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java             |  139 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                 | 2564 ++--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java           |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java           | 5456 ++++------
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                          | 1500 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java         |   70 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java       |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java           |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java    |  186 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java      |  375 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java              |  641 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java     |  550 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java            |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java         |  254 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java             |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java          |   57 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java                |   75 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java              |  296 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java              |  241 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java    |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java        |   94 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java              |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java        |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java                   |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java               |  237 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java                  |  193 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java        |  148 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java       |  245 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java               |   54 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java               |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java     |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java   |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                   |  599 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java                   |  666 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java              |   53 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java                | 1687 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java          |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java                     |  135 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java               |   69 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java                 |  175 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java                    |  316 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java                    |  403 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                 | 1923 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java           |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java             |  282 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java              |  182 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java        |  731 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java              |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java           |   22 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java              |  101 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java                  | 2949 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java             |  336 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                   |  650 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java                  |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java           |  110 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java        |  572 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                   | 1199 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java               |   85 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java          |  483 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java         |  155 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java                  |  287 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java          |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java         |  146 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java   |  184 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                | 1848 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java      |  324 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java               |  985 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java           |  947 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java          |  435 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java              |  865 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java      |   47 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java     |  948 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java                | 1460 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java           |   60 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java                  |   14 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                 |   29 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java                 |   88 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java                |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java        |    9 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                   |  896 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java             |   41 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java            |  193 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java              | 1897 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java                   |  443 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java                    | 1720 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java     |  566 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java          |  213 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java          |  188 

diffs (truncated from 51710 to 500 lines):

diff -r 94f0c8f3a4aa -r 5a126447fc2c ChangeLog
--- a/ChangeLog	Sun Jun 08 21:21:14 2008 +0200
+++ b/ChangeLog	Sun Jun 08 22:27:05 2008 +0200
@@ -1,3 +1,8 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill CVS source reformatting.
+
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
diff -r 94f0c8f3a4aa -r 5a126447fc2c overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 21:21:14 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java	Sun Jun 08 22:27:05 2008 +0200
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.media.sound;
 
 import java.io.ByteArrayOutputStream;
@@ -42,98 +41,91 @@ import javax.sound.sampled.UnsupportedAu
 /**
  * Soundbank reader that uses audio files as soundbanks.
  * 
- * @version %I%, %E%
  * @author Karl Helgason
- * 
  */
 public class AudioFileSoundbankReader extends SoundbankReader {
 
-	public Soundbank getSoundbank(URL url) throws InvalidMidiDataException,
-			IOException {
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(url);
-			Soundbank sbk = getSoundbank(ais);
-			ais.close();
-			return sbk;
-		} catch (UnsupportedAudioFileException e) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-	}
+    public Soundbank getSoundbank(URL url) 
+            throws InvalidMidiDataException, IOException {
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(url);
+            Soundbank sbk = getSoundbank(ais);
+            ais.close();
+            return sbk;
+        } catch (UnsupportedAudioFileException e) {
+            return null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
 
-	public Soundbank getSoundbank(InputStream stream)
-			throws InvalidMidiDataException, IOException {
+    public Soundbank getSoundbank(InputStream stream)
+            throws InvalidMidiDataException, IOException {
+        stream.mark(512);
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(stream);
+            Soundbank sbk = getSoundbank(ais);
+            if (sbk != null)
+                return sbk;
+        } catch (UnsupportedAudioFileException e) {
+        } catch (IOException e) {
+        }
+        stream.reset();
+        return null;
+    }
 
-		stream.mark(512);
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(stream);
-			Soundbank sbk = getSoundbank(ais);
-			if (sbk != null)
-				return sbk;
-		} catch (UnsupportedAudioFileException e) {
-		} catch (IOException e) {
-		}
-		stream.reset();
-		return null;
-	}
+    public Soundbank getSoundbank(AudioInputStream ais)
+            throws InvalidMidiDataException, IOException {
+        try {
+            byte[] buffer;
+            if (ais.getFrameLength() == -1) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buff = new byte[1024 
+                        - (1024 % ais.getFormat().getFrameSize())];
+                int ret;
+                while ((ret = ais.read(buff)) != -1) {
+                    baos.write(buff, 0, ret);
+                }
+                ais.close();
+                buffer = baos.toByteArray();
+            } else {
+                buffer = new byte[(int) (ais.getFrameLength() 
+                                    * ais.getFormat().getFrameSize())];
+                new DataInputStream(ais).readFully(buffer);
+            }
+            ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+                    new ModelByteBuffer(buffer), ais.getFormat(), -4800);
+            ModelPerformer performer = new ModelPerformer();
+            performer.getOscillators().add(osc);
 
-	public Soundbank getSoundbank(AudioInputStream ais)
-			throws InvalidMidiDataException, IOException {
+            SimpleSoundbank sbk = new SimpleSoundbank();
+            SimpleInstrument ins = new SimpleInstrument();
+            ins.add(performer);
+            sbk.addInstrument(ins);
+            return sbk;
+        } catch (Exception e) {
+            return null;
+        }
+    }
 
-		try {
-			byte[] buffer;
-			if (ais.getFrameLength() == -1) {
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				byte[] buff = new byte[1024 - (1024 % ais.getFormat()
-						.getFrameSize())];
-				int ret;
-				while ((ret = ais.read(buff)) != -1)
-					baos.write(buff, 0, ret);
-				ais.close();
-				buffer = baos.toByteArray();
-			} else {
-				buffer = new byte[(int) (ais.getFrameLength() * ais.getFormat()
-						.getFrameSize())];
-				new DataInputStream(ais).readFully(buffer);
-			}
-			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-					new ModelByteBuffer(buffer), ais.getFormat(), -4800);
-			ModelPerformer performer = new ModelPerformer();
-			;
-			performer.getOscillators().add(osc);
-
-			SimpleSoundbank sbk = new SimpleSoundbank();
-			SimpleInstrument ins = new SimpleInstrument();
-			ins.add(performer);
-			sbk.addInstrument(ins);
-			return sbk;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public Soundbank getSoundbank(File file) throws InvalidMidiDataException,
-			IOException {
-
-		try {
-			AudioInputStream ais = AudioSystem.getAudioInputStream(file);
-			ais.close();
-			ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
-					new ModelByteBuffer(file, 0, file.length()), -4800);
-			ModelPerformer performer = new ModelPerformer();
-			performer.getOscillators().add(osc);
-			SimpleSoundbank sbk = new SimpleSoundbank();
-			SimpleInstrument ins = new SimpleInstrument();
-			ins.add(performer);
-			sbk.addInstrument(ins);
-			return sbk;
-		} catch (UnsupportedAudioFileException e1) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-
-	}
-
+    public Soundbank getSoundbank(File file) 
+            throws InvalidMidiDataException, IOException {
+        try {
+            AudioInputStream ais = AudioSystem.getAudioInputStream(file);
+            ais.close();
+            ModelByteBufferWavetable osc = new ModelByteBufferWavetable(
+                    new ModelByteBuffer(file, 0, file.length()), -4800);
+            ModelPerformer performer = new ModelPerformer();
+            performer.getOscillators().add(osc);
+            SimpleSoundbank sbk = new SimpleSoundbank();
+            SimpleInstrument ins = new SimpleInstrument();
+            ins.add(performer);
+            sbk.addInstrument(ins);
+            return sbk;
+        } catch (UnsupportedAudioFileException e1) {
+            return null;
+        } catch (IOException e) {
+            return null;
+        }
+    }
 }
diff -r 94f0c8f3a4aa -r 5a126447fc2c overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 21:21:14 2008 +0200
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java	Sun Jun 08 22:27:05 2008 +0200
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.media.sound;
 
 import java.nio.ByteBuffer;
@@ -37,1006 +36,1023 @@ import javax.sound.sampled.AudioFormat.E
  * This class is used to convert between 8,16,24,32,32+ bit signed/unsigned
  * big/litle endian fixed/floating point byte buffers and float buffers.
  * 
- * @version %I%, %E%
  * @author Karl Helgason
  */
-
 public abstract class AudioFloatConverter {
 
-	public static final Encoding PCM_FLOAT = new Encoding("PCM_FLOAT");
-	
-	/***************************************************************************
-	 * 
-	 * LSB Filter, used filter least significant byte in samples arrays.
-	 * 
-	 * Is used filter out data in lsb byte 
-	 * when SampleSizeInBits is not dividable by 8.
-	 * 
-	 **************************************************************************/
-	
-	private static class AudioFloatLSBFilter extends AudioFloatConverter {
-		
-		private AudioFloatConverter converter;
-		final private int offset;
-		final private int stepsize;
-		final private byte mask;		
-		private byte[] mask_buffer;
-		
-		public AudioFloatLSBFilter(AudioFloatConverter converter, AudioFormat format)
-		{
-			int bits = format.getSampleSizeInBits();
-			boolean bigEndian = format.isBigEndian();
-			this.converter = converter;
-			stepsize = (bits + 7) / 8;
-			offset = bigEndian?(stepsize - 1):0;
-			int lsb_bits = bits % 8;
-			if(lsb_bits == 0) mask = (byte)0x00;
-			else if(lsb_bits == 1) mask = (byte)0x80;
-			else if(lsb_bits == 2) mask = (byte)0xC0;
-			else if(lsb_bits == 3) mask = (byte)0xE0;
-			else if(lsb_bits == 4) mask = (byte)0xF0;
-			else if(lsb_bits == 5) mask = (byte)0xF8;
-			else if(lsb_bits == 6) mask = (byte)0xFC;
-			else if(lsb_bits == 7) mask = (byte)0xFE;
-			else mask = (byte)0xFF;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len, byte[] out_buff, int out_offset) {
-			byte[] ret = converter.toByteArray(in_buff, in_offset, in_len, out_buff, out_offset);
-			
-			int out_offset_end = in_len*stepsize;
-			for (int i = out_offset+offset; i < out_offset_end; i+=stepsize) {
-				out_buff[i] = (byte)(out_buff[i] & mask); 
-			}
-			
-			return ret;
-		}
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset, float[] out_buff, int out_offset, int out_len) {
-			if(mask_buffer == null || mask_buffer.length < in_buff.length)
-				mask_buffer = new byte[in_buff.length];
-			System.arraycopy(in_buff, 0, mask_buffer, 0, in_buff.length);
-			int in_offset_end = out_len*stepsize;
-			for (int i = in_offset+offset; i < in_offset_end; i+=stepsize) {
-				mask_buffer[i] = (byte)(mask_buffer[i] & mask); 
-			}
-			float[] ret = converter.toFloatArray(mask_buffer, in_offset, out_buff, out_offset, out_len);
-			return ret;
-		}
-		
-	}
-	
-	/***************************************************************************
-	 * 
-	 * 64 bit float, little/big-endian
-	 * 
-	 **************************************************************************/
-
-	// PCM 64 bit float, little-endian
-	private static class AudioFloatConversion64L extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		DoubleBuffer floatbuffer = null;
-		double[] double_buff = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			if(double_buff == null || double_buff.length < out_len+out_offset)
-				double_buff = new double[out_len+out_offset];
-			floatbuffer.get(double_buff, out_offset, out_len);
-			int out_offset_end = out_offset + out_len;
-			for (int i = out_offset; i < out_offset_end; i++) {
-				out_buff[i] = (float)double_buff[i];
-			}
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			if(double_buff == null || double_buff.length < in_offset+in_len)
-				double_buff = new double[in_offset+in_len];
-			int in_offset_end = in_offset+in_len;
-			for (int i = in_offset; i < in_offset_end; i++) {
-				double_buff[i] = in_buff[i];
-			}			
-			floatbuffer.put(double_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	// PCM 64 bit float, big-endian
-	private static class AudioFloatConversion64B extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		DoubleBuffer floatbuffer = null;
-		double[] double_buff = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			if(double_buff == null || double_buff.length < out_len+out_offset)
-				double_buff = new double[out_len+out_offset];
-			floatbuffer.get(double_buff, out_offset, out_len);
-			int out_offset_end = out_offset + out_len;
-			for (int i = out_offset; i < out_offset_end; i++) {
-				out_buff[i] = (float)double_buff[i];
-			}
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 8;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asDoubleBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			if(double_buff == null || double_buff.length < in_offset+in_len)
-				double_buff = new double[in_offset+in_len];
-			int in_offset_end = in_offset+in_len;
-			for (int i = in_offset; i < in_offset_end; i++) {
-				double_buff[i] = in_buff[i];
-			}						
-			floatbuffer.put(double_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	/***************************************************************************
-	 * 
-	 * 32 bit float, little/big-endian
-	 * 
-	 **************************************************************************/
-
-	// PCM 32 bit float, little-endian
-	private static class AudioFloatConversion32L extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		FloatBuffer floatbuffer = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			floatbuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.LITTLE_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			floatbuffer.put(in_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	// PCM 32 bit float, big-endian
-	private static class AudioFloatConversion32B extends AudioFloatConverter {
-		ByteBuffer bytebuffer = null;
-
-		FloatBuffer floatbuffer = null;
-
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int in_len = out_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < in_len) {
-				bytebuffer = ByteBuffer.allocate(in_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			bytebuffer.position(0);
-			floatbuffer.position(0);
-			bytebuffer.put(in_buff, in_offset, in_len);
-			floatbuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int out_len = in_len * 4;
-			if (bytebuffer == null || bytebuffer.capacity() < out_len) {
-				bytebuffer = ByteBuffer.allocate(out_len).order(
-						ByteOrder.BIG_ENDIAN);
-				floatbuffer = bytebuffer.asFloatBuffer();
-			}
-			floatbuffer.position(0);
-			bytebuffer.position(0);
-			floatbuffer.put(in_buff, in_offset, in_len);
-			bytebuffer.get(out_buff, out_offset, out_len);
-			return out_buff;
-		}
-	}
-
-	/***************************************************************************
-	 * 
-	 * 8 bit signed/unsigned
-	 * 
-	 **************************************************************************/
-
-	// PCM 8 bit, signed
-	private static class AudioFloatConversion8S extends AudioFloatConverter {
-		public float[] toFloatArray(byte[] in_buff, int in_offset,
-				float[] out_buff, int out_offset, int out_len) {
-			int ix = in_offset;
-			int ox = out_offset;
-			for (int i = 0; i < out_len; i++)
-				out_buff[ox++] = in_buff[ix++] * (1.0f / 127.0f);
-			return out_buff;
-		}
-
-		public byte[] toByteArray(float[] in_buff, int in_offset, int in_len,
-				byte[] out_buff, int out_offset) {
-			int ix = in_offset;
-			int ox = out_offset;
-			for (int i = 0; i < in_len; i++)
-				out_buff[ox++] = (byte) (in_buff[ix++] * 127.0f);
-			return out_buff;
-		}
-	}
-
-	// PCM 8 bit, unsigned
-	private static class AudioFloatConversion8U extends AudioFloatConverter {


From gnu_andrew at member.fsf.org  Sun Jun 22 12:34:45 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:34:45 +0000
Subject: changeset in /hg/icedtea: Allow build to take place outside the ...
Message-ID: <hg.f05bf5526474.1214163285.-6899778133799504387@icedtea.classpath.org>

changeset f05bf5526474 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f05bf5526474
description:
	Allow build to take place outside the source directory.

diffstat:

3 files changed, 136 insertions(+), 126 deletions(-)
ChangeLog   |    8 +++
Makefile.am |  134 +++++++++++++++++++++++++++++------------------------------
Makefile.in |  120 ++++++++++++++++++++++++++--------------------------

diffs (truncated from 704 to 500 lines):

diff -r 5a126447fc2c -r f05bf5526474 ChangeLog
--- a/ChangeLog	Sun Jun 08 22:27:05 2008 +0200
+++ b/ChangeLog	Mon Jun 09 02:15:28 2008 +0100
@@ -1,3 +1,11 @@ 2008-06-08  Mark Wielaard  <mark at klomp.o
+2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Fix implicit directory paths
+	and use of abs_top_srcdir where abs_top_builddir is
+	meant, so build works outside the source directory.
+	Also ensure JAVAC is unset during the OpenJDK build.
+	* Makefile.in: Regenerated.
+	
 2008-06-08  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
diff -r 5a126447fc2c -r f05bf5526474 Makefile.am
--- a/Makefile.am	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.am	Mon Jun 09 02:15:28 2008 +0100
@@ -53,13 +53,13 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 if CORE_BUILD
@@ -81,7 +81,7 @@ ICEDTEA_ENV = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -102,7 +102,8 @@ ICEDTEA_ENV = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -126,9 +127,9 @@ env:
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -138,7 +139,7 @@ ICEDTEA_ENV_ECJ = \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -165,7 +166,8 @@ ICEDTEA_ENV_ECJ = \
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
+	"JAVAC="
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -225,18 +227,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -344,10 +346,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -367,10 +369,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -380,7 +382,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -399,24 +401,24 @@ clean-extract-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
@@ -447,7 +449,7 @@ clean-patch-ecj:
 # 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
+	ln -s $(abs_top_builddir)/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
@@ -523,16 +525,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-	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 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; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
@@ -592,10 +594,10 @@ icedtea: stamps/bootstrap-directory-syml
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -615,10 +617,10 @@ icedtea-debug: stamps/bootstrap-director
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
@@ -758,34 +760,34 @@ OPENJDK_SOURCEPATH_DIRS = \
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
-	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+
+	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-	
+
 	mkdir -p stamps
 	touch stamps/hotspot-tools-copy-source-files.stamp
 
@@ -799,12 +801,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-            -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -832,13 +834,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	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
- 
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
@@ -846,15 +848,15 @@ stamps/rt-class-files.stamp: rt-source-f
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
             -bootclasspath '' @$< ; \
 	fi
-	cp -r rt/net/sourceforge/jnlp/resources \
+	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch stamps/rt-class-files.stamp
@@ -882,7 +884,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 # extras -- used to create about.jar for javaws.
 extra-source-files.txt:
-	find extra -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -891,7 +893,7 @@ stamps/extra-class-files.stamp: extra-so
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
- 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -899,7 +901,7 @@ stamps/extra-class-files.stamp: extra-so
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
-	cp -r extra/net/sourceforge/jnlp/about/resources \
+	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
 	touch $@
diff -r 5a126447fc2c -r f05bf5526474 Makefile.in
--- a/Makefile.in	Sun Jun 08 22:27:05 2008 +0200
+++ b/Makefile.in	Mon Jun 09 02:15:28 2008 +0100
@@ -270,16 +270,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 
 ICEDTEA_RT = \
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 ICEDTEA_CLS_DIR = \
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
 
 ICEDTEA_BOOT_DIR = \
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -294,7 +294,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -312,15 +312,15 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
 
 ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
@@ -328,7 +328,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/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)" \
@@ -352,7 +352,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
@@ -426,7 +426,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -818,18 +818,18 @@ clean-download:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
 	done
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
@@ -853,10 +853,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Applying $$p ; \
-	    $(PATCH) -l -p0 < $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -875,10 +875,10 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
+	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
-	    $(PATCH) -l -p0 -R < $$p ; \
+	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -888,7 +888,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp


From jsumali at redhat.com  Sun Jun 22 12:34:47 2008
From: jsumali at redhat.com (Joshua Sumali)
Date: Sun, 22 Jun 2008 19:34:47 +0000
Subject: changeset in /hg/icedtea: 2008-06-09  Joshua Sumali  <jsumali@re...
Message-ID: <hg.f1c286afb8fa.1214163287.-6899778133799504387@icedtea.classpath.org>

changeset f1c286afb8fa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f1c286afb8fa
description:
	2008-06-09  Joshua Sumali  <jsumali at redhat.com>

	        * rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
	        starting the application.
	        * rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
	        dashes in xml comments.
	        (sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
	        (expectedInput(String, char)): New method.

diffstat:

3 files changed, 146 insertions(+), 6 deletions(-)
ChangeLog                                  |    9 ++
rt/net/sourceforge/jnlp/Parser.java        |   23 ++++-
rt/net/sourceforge/nanoxml/XMLElement.java |  120 +++++++++++++++++++++++++++-

diffs (216 lines):

diff -r f05bf5526474 -r f1c286afb8fa ChangeLog
--- a/ChangeLog	Mon Jun 09 02:15:28 2008 +0100
+++ b/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
@@ -1,3 +1,12 @@ 2008-06-09  Andrew John Hughes  <gnu_and
+2008-06-09  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
+	starting the application.
+	* rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
+	dashes in xml comments.
+	(sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
+	(expectedInput(String, char)): New method.
+
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am: Fix implicit directory paths
diff -r f05bf5526474 -r f1c286afb8fa rt/net/sourceforge/jnlp/Parser.java
--- a/rt/net/sourceforge/jnlp/Parser.java	Mon Jun 09 02:15:28 2008 +0100
+++ b/rt/net/sourceforge/jnlp/Parser.java	Mon Jun 09 16:15:29 2008 -0400
@@ -946,10 +946,27 @@ class Parser {
             */
 
             /* NANO */
-            XMLElement xml = new XMLElement();
-            xml.parseFromReader(new InputStreamReader(input));
+            final XMLElement xml = new XMLElement();
+            final PipedInputStream pin = new PipedInputStream();
+            final PipedOutputStream pout = new PipedOutputStream(pin);
+            final InputStreamReader isr = new InputStreamReader(input);
+            
+            // Clean the jnlp xml file of all comments before passing
+            // it to the parser.
+            new Thread(
+                new Runnable(){
+                    public void run(){
+                        (new XMLElement()).sanitizeInput(isr, pout);
+                        try {
+                            pout.close();
+                        } catch (IOException ioe) {
+                            ioe.printStackTrace();
+                        }
+                    }
+                }
+            ).start();
+            xml.parseFromReader(new InputStreamReader(pin));
             Node jnlpNode = new Node(xml);
-
             return jnlpNode;
         }
         catch(Exception ex) {
diff -r f05bf5526474 -r f1c286afb8fa rt/net/sourceforge/nanoxml/XMLElement.java
--- a/rt/net/sourceforge/nanoxml/XMLElement.java	Mon Jun 09 02:15:28 2008 +0100
+++ b/rt/net/sourceforge/nanoxml/XMLElement.java	Mon Jun 09 16:15:29 2008 -0400
@@ -32,6 +32,8 @@ package net.sourceforge.nanoxml;
 
 import java.io.*;
 import java.util.*;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
 
 /**
@@ -195,6 +197,10 @@ public class XMLElement
      */
     private char charReadTooMuch;
 
+    /**
+     * Character read too much for the comment remover.
+     */
+    private char sanitizeCharReadTooMuch;
 
     /**
      * The reader provided by the caller of the parse method.
@@ -532,7 +538,7 @@ public class XMLElement
             char ch = this.scanWhitespace();
 
             if (ch != '<') {
-                throw this.expectedInput("<");
+                throw this.expectedInput("<", ch);
             }
 
             ch = this.readChar();
@@ -815,10 +821,24 @@ public class XMLElement
             } else {
                 dashesToRead = 2;
             }
-        }
+
+            // Be more tolerant of extra -- (double dashes)
+            // in comments.
+            if (dashesToRead == 0) {
+                ch = this.readChar();
+                if (ch == '>') {
+                    return;
+                } else {
+                    dashesToRead = 2;
+                    this.unreadChar(ch);
+                }
+            }
+        }
+        /*
         if (this.readChar() != '>') {
             throw this.expectedInput(">");
         }
+        */
     }
 
 
@@ -1185,6 +1205,23 @@ public class XMLElement
         return new XMLParseException(this.getName(), this.parserLineNr, msg);
     }
 
+    /**
+     * Creates a parse exception for when the next character read is not
+     * the character that was expected.
+     *
+     * @param charSet The set of characters (in human readable form) that was
+     *                expected.
+     * @param ch The character that was received instead.
+     * </dl><dl><dt><b>Preconditions:</b></dt><dd>
+     * <ul><li><code>charSet != null</code>
+     *     <li><code>charSet.length() &gt; 0</code>
+     * </ul></dd></dl>
+     */
+    protected XMLParseException expectedInput(String charSet, char ch)
+    {
+        String msg = "Expected: '" + charSet +"'" + " but got: '" + ch + "'";
+        return new XMLParseException(this.getName(), this.parserLineNr, msg);
+    }
 
     /**
      * Creates a parse exception for when an entity could not be resolved.
@@ -1201,5 +1238,82 @@ public class XMLElement
         String msg = "Unknown or invalid entity: &" + name + ";";
         return new XMLParseException(this.getName(), this.parserLineNr, msg);
     }
-    
+
+    /**
+     * Reads an xml file and removes the comments, leaving only relevant
+     * xml code.
+     *
+     * @param isr The reader of the InputStream containing the xml.
+     * @param pout The PipedOutputStream that will be receiving the filtered
+     *             xml file.
+     */
+    public void sanitizeInput(InputStreamReader isr, PipedOutputStream pout) {
+        try {
+            PrintStream out = new PrintStream(pout);
+
+            this.sanitizeCharReadTooMuch = '\0';
+            this.reader = isr;
+            this.parserLineNr = 0;
+            int newline = 2;
+
+            while(true) {
+                char ch;
+                if (this.sanitizeCharReadTooMuch != '\0') {
+                    ch = this.sanitizeCharReadTooMuch;
+                    this.sanitizeCharReadTooMuch = '\0';
+                } else {
+
+                    int i = this.reader.read();
+                    if (i == -1) {
+                        out.flush();
+                        break;
+                    } else if (i == 10) {
+                        ch = '\n';
+                    } else {
+                        ch = (char) i;
+                    }
+                }
+
+                char next;
+                int i = this.reader.read();
+                if (i == -1) {
+                    out.flush();
+                    break;
+                } else if (i == 10) {
+                    next = '\n';
+                } else {
+                    next = (char) i;
+                }
+
+                this.sanitizeCharReadTooMuch = next;
+
+                // If the next char is a ? or !, then we've hit a special tag,
+                // and should skip it.
+                if (next == '!' || next == '?') {
+                    this.skipSpecialTag(0);
+                    this.sanitizeCharReadTooMuch = '\0';
+                }
+                // Otherwise we haven't hit a comment, and we should write ch.
+                else {
+                    out.print(ch);
+                    if (JNLPRuntime.isDebug()) {
+                        if (ch == 10) {
+                            System.out.println();
+                            System.out.print("line: " + newline + " ");
+                            newline++;
+                        } else {
+                            System.out.print(ch);
+                        }
+                    }
+                }
+            }
+
+            out.close();
+            isr.close();
+        } catch (Exception e) {
+            // Print the stack trace here -- xml.parseFromReader() will
+            // throw the ParseException if something goes wrong.
+            e.printStackTrace();
+        }
+    }
 }


From doko at ubuntu.com  Sun Jun 22 12:34:48 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Sun, 22 Jun 2008 19:34:48 +0000
Subject: changeset in /hg/icedtea: 2008-06-10  Tom Callaway <tcallawa@red...
Message-ID: <hg.931f7730ecf9.1214163288.-6899778133799504387@icedtea.classpath.org>

changeset 931f7730ecf9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=931f7730ecf9
description:
	2008-06-10  Tom Callaway <tcallawa at redhat.com>
	            Dennis Gilmore <dennis at ausil.us>

	        * patches/icedtea-sparc64-linux.patch,
	        patches/icedtea-sparc-ptracefix.patch,
	        patches/icedtea-sparc-trapsfix.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add above patches.
	        * Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
	        symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
	        * acinclude.m4: Set JRE_ARCH_DIR.
	        * Makefile.in, configure: Regenerate.

diffstat:

8 files changed, 198 insertions(+), 3 deletions(-)
ChangeLog                             |   12 ++++
Makefile.am                           |   10 +++
Makefile.in                           |   12 +++-
acinclude.m4                          |   10 +++
configure                             |    9 +++
patches/icedtea-sparc-ptracefix.patch |   34 ++++++++++++
patches/icedtea-sparc-trapsfix.patch  |   21 +++++++
patches/icedtea-sparc64-linux.patch   |   93 +++++++++++++++++++++++++++++++++

diffs (311 lines):

diff -r f1c286afb8fa -r 931f7730ecf9 ChangeLog
--- a/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
+++ b/ChangeLog	Tue Jun 10 10:13:20 2008 +0200
@@ -1,3 +1,15 @@ 2008-06-09  Joshua Sumali  <jsumali at redh
+2008-06-10  Tom Callaway <tcallawa at redhat.com>
+	    Dennis Gilmore <dennis at ausil.us>
+
+	* patches/icedtea-sparc64-linux.patch,
+	patches/icedtea-sparc-ptracefix.patch,
+	patches/icedtea-sparc-trapsfix.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
+	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+	* acinclude.m4: Set JRE_ARCH_DIR.
+	* Makefile.in, configure: Regenerate.
+
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r f1c286afb8fa -r 931f7730ecf9 Makefile.am
--- a/Makefile.am	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.am	Tue Jun 10 10:13:20 2008 +0200
@@ -318,6 +318,9 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
@@ -511,8 +514,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r f1c286afb8fa -r 931f7730ecf9 Makefile.in
--- a/Makefile.in	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.in	Tue Jun 10 10:13:20 2008 +0200
@@ -138,6 +138,7 @@ JAVA = @JAVA@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
 LDFLAGS = @LDFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -421,7 +422,9 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
@@ -1001,8 +1004,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r f1c286afb8fa -r 931f7730ecf9 acinclude.m4
--- a/acinclude.m4	Mon Jun 09 16:15:29 2008 -0400
+++ b/acinclude.m4	Tue Jun 10 10:13:20 2008 +0200
@@ -4,22 +4,32 @@ AC_DEFUN([SET_ARCH_DIRS],
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
+  AC_SUBST(JRE_ARCH_DIR)
 ])
 
 AC_DEFUN([FIND_JAVAC],
diff -r f1c286afb8fa -r 931f7730ecf9 configure
--- a/configure	Mon Jun 09 16:15:29 2008 -0400
+++ b/configure	Tue Jun 10 10:13:20 2008 +0200
@@ -5966,18 +5966,27 @@ fi
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
 
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc-ptracefix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-ptracefix.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,34 @@
+diff -up openjdk/hotspot/agent/src/os/linux/libproc.h.BAD openjdk/hotspot/agent/src/os/linux/libproc.h
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.BAD	2008-05-29 19:03:34.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/libproc.h	2008-05-29 19:01:45.000000000 -0400
+@@ -34,14 +34,25 @@
+ 
+ #if defined(sparc) || defined(sparcv9)
+ /*
+-  If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+-  otherwise it should be from /usr/include/asm-sparc
+-  These two files define pt_regs structure differently
++  Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h
+ */ 
+ #ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
++struct pt_regs {
++	unsigned long u_regs[16]; /* globals and ins */
++	unsigned long tstate;
++	unsigned long tpc;
++	unsigned long tnpc;
++	unsigned int y;
++	unsigned int fprs;
++};
+ #else
+-#include "asm-sparc/ptrace.h"
++struct pt_regs {
++	unsigned long psr;
++	unsigned long pc;
++	unsigned long npc;
++	unsigned long y;
++	unsigned long u_regs[16]; /* globals and ins */
++};
+ #endif
+ 
+ #endif //sparc or sparcv9
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc-trapsfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,21 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD	2008-05-28 11:49:06.000000000 -0500
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	2008-05-28 11:51:56.000000000 -0500
+@@ -25,7 +25,16 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_assembler_linux_sparc.cpp.incl"
+ 
+-#include <asm-sparc/traps.h>
++/* Headers for 32bit sparc with a 32bit userland end up in asm/
++ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
++ * There is no traps.h in asm-sparc64/
++ */
++
++#if defined(__sparc__) && defined(__arch64__)
++# include <asm-sparc/traps.h>
++#else 
++# include <asm/traps.h>
++#endif
+ 
+ bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+   // Since the linux kernel resides at the low end of
diff -r f1c286afb8fa -r 931f7730ecf9 patches/icedtea-sparc64-linux.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc64-linux.patch	Tue Jun 10 10:13:20 2008 +0200
@@ -0,0 +1,93 @@
+diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD	2008-05-29 15:48:44.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-05-29 15:48:39.000000000 -0400
+@@ -0,0 +1,27 @@
++#
++# Copyright 1999-2005 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.
++#
++# 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.
++#  
++#
++
++# TLS helper, assembled from .s file
++# Not included in includeDB because it has no dependencies
++Obj_Files += linux_sparc.o
+diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD	2008-05-29 16:25:10.000000000 -0400
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-29 16:32:11.000000000 -0400
+@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
+ 
+ void LIRGenerator::increment_counter(address counter, int step) {
+   LIR_Opr pointer = new_register(T_INT);
+-  __ move(LIR_OprFact::intConst((int)counter), pointer);
++  __ move(LIR_OprFact::intConst((int)*counter), pointer);
+   LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
+   increment_counter(addr, step);
+ }
+@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+ 
+ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+                                         CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ store_mem_reg(value, address, info);
+-#else
+   __ volatile_store_mem_reg(value, address, info);
+-#endif
+ }
+ 
+ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+                                        CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ load_mem_reg(address, result, info);
+-#else
+   __ volatile_load_mem_reg(address, result, info);
+-#endif
+ }
+ 
+ 
+diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk/hotspot/build/linux/makefiles/defs.make.BAD	2008-05-30 07:03:37.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-30 07:03:45.000000000 -0400
+@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
+   HS_ARCH         = ia64
+ endif
+ 
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
+   HS_ARCH            = sparc
+ endif
+ 
++# sparc
++ifeq ($(ARCH), sparc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-sparc
++  VM_PLATFORM      = linux_sparc
++  HS_ARCH          = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)


From doko at ubuntu.com  Sun Jun 22 12:34:48 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Sun, 22 Jun 2008 19:34:48 +0000
Subject: changeset in /hg/icedtea: 2008-06-10  Matthias Klose  <doko@ubun...
Message-ID: <hg.7f5d247e2da8.1214163288.-6899778133799504387@icedtea.classpath.org>

changeset 7f5d247e2da8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7f5d247e2da8
description:
	2008-06-10  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-no-bcopy.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add patch.
	        * Makefile.in: Regenerate.

diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                      |    6 ++++++
Makefile.am                    |    1 +
Makefile.in                    |    3 ++-
patches/icedtea-no-bcopy.patch |   20 ++++++++++++++++++++

diffs (61 lines):

diff -r 931f7730ecf9 -r 7f5d247e2da8 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:13:20 2008 +0200
+++ b/ChangeLog	Tue Jun 10 10:39:13 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-10  Tom Callaway <tcallawa at redha
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
 2008-06-10  Tom Callaway <tcallawa at redhat.com>
 	    Dennis Gilmore <dennis at ausil.us>
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.am	Tue Jun 10 10:39:13 2008 +0200
@@ -322,6 +322,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.in	Tue Jun 10 10:39:13 2008 +0200
@@ -425,7 +425,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r 931f7730ecf9 -r 7f5d247e2da8 patches/icedtea-no-bcopy.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch	Tue Jun 10 10:39:13 2008 +0200
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~	2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+ 
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro


From doko at ubuntu.com  Sun Jun 22 12:34:49 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Sun, 22 Jun 2008 19:34:49 +0000
Subject: changeset in /hg/icedtea: - Fix typo in icedtea-sparc64-linux pa...
Message-ID: <hg.5e8339d7f686.1214163289.-6899778133799504387@icedtea.classpath.org>

changeset 5e8339d7f686 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5e8339d7f686
description:
	- Fix typo in icedtea-sparc64-linux patch name

diffstat:

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

diffs (24 lines):

diff -r 7f5d247e2da8 -r 5e8339d7f686 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:39:13 2008 +0200
+++ b/Makefile.am	Tue Jun 10 11:42:05 2008 +0200
@@ -318,7 +318,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
-	patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
diff -r 7f5d247e2da8 -r 5e8339d7f686 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:39:13 2008 +0200
+++ b/Makefile.in	Tue Jun 10 11:42:05 2008 +0200
@@ -422,7 +422,7 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
+	patches/icedtea-sparc.patch patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \


From langel at redhat.com  Sun Jun 22 12:34:50 2008
From: langel at redhat.com (Lillian Angel)
Date: Sun, 22 Jun 2008 19:34:50 +0000
Subject: changeset in /hg/icedtea: 2008-06-10  Lillian Angel  <langel@red...
Message-ID: <hg.c400aa599d8b.1214163290.-6899778133799504387@icedtea.classpath.org>

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

	        * Makefile.in: Regenerated.
	        * aclocal.m4: Likewise.
	        * configure: Likewise.
	        * generated/sun/misc/Version.java: Likewise.
	        * generated/sun/tools/jconsole/Version.java: Likewise.

diffstat:

6 files changed, 312 insertions(+), 378 deletions(-)
ChangeLog                                 |    8 
Makefile.in                               |    3 
aclocal.m4                                |   22 
configure                                 |  651 ++++++++++++-----------------
generated/sun/misc/Version.java           |    4 
generated/sun/tools/jconsole/Version.java |    2 

diffs (truncated from 1329 to 500 lines):

diff -r 5e8339d7f686 -r c400aa599d8b ChangeLog
--- a/ChangeLog	Tue Jun 10 11:42:05 2008 +0200
+++ b/ChangeLog	Tue Jun 10 10:21:11 2008 -0400
@@ -1,3 +1,11 @@ 2008-06-10  Matthias Klose  <doko at ubuntu
+2008-06-10  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* generated/sun/misc/Version.java: Likewise.
+	* generated/sun/tools/jconsole/Version.java: Likewise.
+
 2008-06-10  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-no-bcopy.patch: New.
diff -r 5e8339d7f686 -r c400aa599d8b Makefile.in
--- a/Makefile.in	Tue Jun 10 11:42:05 2008 +0200
+++ b/Makefile.in	Tue Jun 10 10:21:11 2008 -0400
@@ -422,7 +422,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-sparc.patch patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
diff -r 5e8339d7f686 -r c400aa599d8b aclocal.m4
--- a/aclocal.m4	Tue Jun 10 11:42:05 2008 +0200
+++ b/aclocal.m4	Tue Jun 10 10:21:11 2008 -0400
@@ -87,16 +87,14 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -140,9 +138,9 @@ if test $pkg_failed = yes; then
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -r 5e8339d7f686 -r c400aa599d8b configure
--- a/configure	Tue Jun 10 11:42:05 2008 +0200
+++ b/configure	Tue Jun 10 10:21:11 2008 -0400
@@ -734,6 +734,7 @@ PARALLEL_JOBS
 PARALLEL_JOBS
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
+JRE_ARCH_DIR
 JAVA
 JAVAC
 JAVAH
@@ -5992,6 +5993,7 @@ fi
 
 
 
+
 if test "${with_openjdk}" == true
 then
   JAVA=$SYSTEM_OPENJDK_DIR/bin/java
@@ -10231,11 +10233,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XPROTO" >&5
 echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_CFLAGS"; then
-        pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XPROTO_CFLAGS"; then
+    pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10245,15 +10246,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_LIBS"; then
-        pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XPROTO_LIBS"; then
+    pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10263,9 +10262,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10278,9 +10276,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
         else
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XPROTO_PKG_ERRORS" >&5
@@ -10313,11 +10311,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XT" >&5
 echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_CFLAGS"; then
-        pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XT_CFLAGS"; then
+    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10327,15 +10324,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_LIBS"; then
-        pkg_cv_XT_LIBS="$XT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XT_LIBS"; then
+    pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10345,9 +10340,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10360,9 +10354,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
         else
-	        XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XT_PKG_ERRORS" >&5
@@ -10395,11 +10389,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XP" >&5
 echo $ECHO_N "checking for XP... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_CFLAGS"; then
-        pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XP_CFLAGS"; then
+    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10409,15 +10402,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_LIBS"; then
-        pkg_cv_XP_LIBS="$XP_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XP_LIBS"; then
+    pkg_cv_XP_LIBS="$XP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10427,9 +10418,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10442,9 +10432,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
         else
-	        XP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XP_PKG_ERRORS" >&5
@@ -10477,11 +10467,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for X11" >&5
 echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_CFLAGS"; then
-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$X11_CFLAGS"; then
+    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10491,15 +10480,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_LIBS"; then
-        pkg_cv_X11_LIBS="$X11_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$X11_LIBS"; then
+    pkg_cv_X11_LIBS="$X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10509,9 +10496,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10524,9 +10510,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
@@ -10559,11 +10545,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XINERAMA" >&5
 echo $ECHO_N "checking for XINERAMA... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_CFLAGS"; then
-        pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XINERAMA_CFLAGS"; then
+    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10573,15 +10558,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_LIBS"; then
-        pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XINERAMA_LIBS"; then
+    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10591,9 +10574,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10606,9 +10588,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
         else
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XINERAMA_PKG_ERRORS" >&5
@@ -10642,11 +10624,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for LIBPNG" >&5
 echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_CFLAGS"; then
-        pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_CFLAGS"; then
+    pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10656,15 +10637,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_LIBS"; then
-        pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBPNG_LIBS"; then
+    pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10674,9 +10653,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10689,9 +10667,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng" 2>&1`
         else
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBPNG_PKG_ERRORS" >&5
@@ -10725,11 +10703,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XTST" >&5
 echo $ECHO_N "checking for XTST... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_CFLAGS"; then
-        pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XTST_CFLAGS"; then
+    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5
   ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
   ac_status=$?
@@ -10739,15 +10716,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_LIBS"; then
-        pkg_cv_XTST_LIBS="$XTST_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XTST_LIBS"; then
+    pkg_cv_XTST_LIBS="$XTST_LIBS"
+ elif test -n "$PKG_CONFIG"; then


From langel at redhat.com  Sun Jun 22 12:34:50 2008
From: langel at redhat.com (Lillian Angel)
Date: Sun, 22 Jun 2008 19:34:50 +0000
Subject: changeset in /hg/icedtea: 2008-06-11  Lillian Angel  <langel@red...
Message-ID: <hg.485da23424a2.1214163290.-6899778133799504387@icedtea.classpath.org>

changeset 485da23424a2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=485da23424a2
description:
	2008-06-11  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
	        like the Sun's verify Java version applet, check for the "_" in the
	        version string. Our version string format is now correct:
	        java version "1.6.0_0"
	        OpenJDK  Runtime Environment (build 1.6.0_0-b10)
	        OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 26 insertions(+), 10 deletions(-)
ChangeLog   |   10 ++++++++++
Makefile.am |   11 +++++++----
Makefile.in |   15 +++++++++------

diffs (90 lines):

diff -r c400aa599d8b -r 485da23424a2 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:21:11 2008 -0400
+++ b/ChangeLog	Wed Jun 11 12:32:56 2008 -0400
@@ -1,3 +1,13 @@ 2008-06-10  Lillian Angel  <langel at redha
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.6.0_0"
+	OpenJDK  Runtime Environment (build 1.6.0_0-b10)
+	OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+	* Makefile.in: Regenerated.
+
 2008-06-10  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.in: Regenerated.
diff -r c400aa599d8b -r 485da23424a2 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.am	Wed Jun 11 12:32:56 2008 -0400
@@ -62,6 +62,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -76,8 +77,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -134,8 +136,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r c400aa599d8b -r 485da23424a2 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:21:11 2008 -0400
+++ b/Makefile.in	Wed Jun 11 12:32:56 2008 -0400
@@ -285,15 +285,17 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +327,10 @@ ICEDTEA_CLS_DIR_ECJ = \
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \


From gnu_andrew at member.fsf.org  Sun Jun 22 12:34:51 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:34:51 +0000
Subject: changeset in /hg/icedtea: Fix PR icedtea/140 by removing depende...
Message-ID: <hg.2a13fc138cfa.1214163291.-6899778133799504387@icedtea.classpath.org>

changeset 2a13fc138cfa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a13fc138cfa
description:
	Fix PR icedtea/140 by removing dependency on JScheme

diffstat:

5 files changed, 1506 insertions(+), 237 deletions(-)
ChangeLog                     |   11 
Makefile.am                   |    5 
Makefile.in                   |    6 
patches/icedtea-ecj.patch     |  461 +++++++--------
patches/icedtea-jscheme.patch | 1260 +++++++++++++++++++++++++++++++++++++++++

diffs (truncated from 1823 to 500 lines):

diff -r f1c286afb8fa -r 2a13fc138cfa ChangeLog
--- a/ChangeLog	Mon Jun 09 16:15:29 2008 -0400
+++ b/ChangeLog	Tue Jun 10 03:17:12 2008 +0100
@@ -1,3 +1,14 @@ 2008-06-09  Joshua Sumali  <jsumali at redh
+2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR icedtea/140:
+	* Makefile.am: Add icedtea-jscheme.patch and
+	remove jscheme jar files and scripts after
+	unzipping OpenJDK.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-ecj.patch: Updated for post-jscheme
+	tree.
+	* patches/icedtea-jscheme.patch: Added.
+	
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.am
--- a/Makefile.am	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.am	Tue Jun 10 03:17:12 2008 +0100
@@ -1,6 +1,8 @@ OPENJDK_DATE = 30_may_2008
 OPENJDK_DATE = 30_may_2008
 OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
 OPENJDK_VERSION = b10
+
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -319,6 +321,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-jscheme.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
@@ -333,6 +336,8 @@ stamps/extract.stamp: stamps/download.st
 	  mkdir openjdk ; \
 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 	  chmod -R ug+w openjdk ; \
+	  rm -rf $(JSCHEME_DIR)/lib; \
+	  rm -rf $(JSCHEME_DIR)/scripts; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.in
--- a/Makefile.in	Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.in	Tue Jun 10 03:17:12 2008 +0100
@@ -252,6 +252,7 @@ OPENJDK_DATE = 30_may_2008
 OPENJDK_DATE = 30_may_2008
 OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
 OPENJDK_VERSION = b10
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -422,7 +423,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-jscheme.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
@@ -840,6 +842,8 @@ stamps/extract.stamp: stamps/download.st
 	  mkdir openjdk ; \
 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 	  chmod -R ug+w openjdk ; \
+	  rm -rf $(JSCHEME_DIR)/lib; \
+	  rm -rf $(JSCHEME_DIR)/scripts; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Mon Jun 09 16:15:29 2008 -0400
+++ b/patches/icedtea-ecj.patch	Tue Jun 10 03:17:12 2008 +0100
@@ -317,232 +317,6 @@ diff -ruN openjdk.old/corba/make/com/sun
 +# Include
 +#
 +include $(BUILDDIR)/common/Classes.gmk
-diff -ruN openjdk.old/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk.old/corba/make/com/sun/corba/se/sources/Makefile	2007-10-12 03:49:13.000000000 -0400
-+++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	1969-12-31 19:00:00.000000000 -0500
-@@ -1,222 +0,0 @@
--#
--# Copyright 2000-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.
--#
--
--BUILDDIR = ../../../../..
--
--PACKAGE = com.sun.corba.se
--PRODUCT = org
--
--include $(BUILDDIR)/common/Defs.gmk
--
--#
--# Rules
--#
--all: build
--
--build: portableactivation.idl.compile logwrapper.generate logresource.generate 
--
--clean clobber:: portableactivation.idl.clean
--
--#
--# Files
--#
--CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
--include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
--
--#
--# Dirs
--#
--
--SRC_DIR = $(SHARE_SRC)/classes
--CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
--PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
--
--ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
--PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
--LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
--
--#
--# IDLs
--#
--
--ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
--PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
--
--
--#
--# .mc files
--#
--ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
--IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
--INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
--NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
--OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
--ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
--POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
--UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
--
--MC_GENERATE_CLASS = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class
--MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource 
--
--JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_CLASS) 
--JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_LOG_RB) 
--
--
--#
--# Activation 
--#
--
--ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
--
--$(ACTIVATIONFILES): $(ACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
--
--activation.idl.compile: $(ACTIVATIONFILES)
--
--activation.idl.clean:
--	$(RM) -f $(ACTIVATIONFILES)
--
--#
--# PortableActivationIDL
--#
--
--PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
--
--PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
--
--PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
--    -pkgPrefix PortableActivationIDL com.sun.corba.se \
--    -pkgPrefix Dynamic org.omg \
--    -pkgPrefix IOP org.omg
--
--# REVISIT: remove -oldImplBase
--$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
--
--portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
--
--portableactivation.idl.clean:
--	$(RM) -f $(PORTABLEACTIVATIONFILES)
--
--#
--# Generate LogWrapper classes
--#
--logwrapper.generate: \
--	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
--	$(LOG_GENDIRECTORY)/IORSystemException.java \
--	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
--	$(LOG_GENDIRECTORY)/NamingSystemException.java \
--	$(LOG_GENDIRECTORY)/OMGSystemException.java \
--	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
--	$(LOG_GENDIRECTORY)/POASystemException.java \
--	$(LOG_GENDIRECTORY)/UtilSystemException.java
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/LogStrings.properties: \
--		$(LOG_GENDIRECTORY)/ActivationSystemException.resource \
--		$(LOG_GENDIRECTORY)/IORSystemException.resource \
--		$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
--		$(LOG_GENDIRECTORY)/NamingSystemException.resource \
--		$(LOG_GENDIRECTORY)/OMGSystemException.resource \
--		$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
--		$(LOG_GENDIRECTORY)/POASystemException.resource \
--		$(LOG_GENDIRECTORY)/UtilSystemException.resource
--	$(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
--	$(prep-target)
--	$(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--
--.PHONY: all build clean clobber \
--	activation.idl.compile activation.idl.clean \
--	portableactivation.idl.compile portableactivation.idl.clean
--
--#
--# Include
--#
--include $(BUILDDIR)/common/Rules.gmk
 --- iopenjdk/jdk/make/common/Rules.gmk	2007-10-12 03:54:05.000000000 -0400
 +++ openjdk-ecj/jdk/make/common/Rules.gmk	2007-11-07 11:02:53.000000000 -0500
 @@ -235,8 +235,9 @@
@@ -781,16 +555,6 @@ diff -ru openjdk-ecj.orig/langtools/make
  
      /**
       * Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2007-12-10 15:46:46.000000000 -0500
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2007-12-19 09:53:07.000000000 -0500
-@@ -332,7 +332,6 @@
- 	    (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- 	(.println pw "//")
- 	(.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
--	(.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- 	(.println pw)))
- 
- (define (write-factory-method class-name exception-group-name pw)
 --- openjdk.old/langtools/make/Makefile	2008-01-16 10:23:52.000000000 -0500
 +++ openjdk-ecj/langtools/make/Makefile	2008-01-16 10:42:51.000000000 -0500
 @@ -113,7 +113,7 @@
@@ -1023,3 +787,228 @@ diff -ru openjdk-ecj.orig/langtools/make
  
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
+--- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	2008-06-09 03:12:48.000000000 +0100
++++ /dev/null	2008-05-17 00:35:13.224001676 +0100
+@@ -1,222 +0,0 @@
+-#
+-# Copyright 2000-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.
+-#
+-
+-BUILDDIR = ../../../../..
+-
+-PACKAGE = com.sun.corba.se
+-PRODUCT = org
+-
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Rules
+-#
+-all: build
+-
+-build: portableactivation.idl.compile logwrapper.generate logresource.generate 
+-
+-clean clobber:: portableactivation.idl.clean
+-
+-#
+-# Files
+-#
+-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
+-
+-#
+-# Dirs
+-#
+-
+-SRC_DIR = $(SHARE_SRC)/classes
+-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
+-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
+-
+-ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
+-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
+-LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
+-
+-#
+-# IDLs
+-#
+-
+-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
+-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
+-
+-
+-#
+-# .mc files
+-#
+-ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
+-IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
+-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
+-NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
+-OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
+-ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
+-POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
+-UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
+-
+-MC_GENERATE_CLASS = make-class
+-MC_GENERATE_LOG_RB = make-resource 
+-
+-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) 
+-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) 
+-
+-
+-#
+-# Activation 
+-#
+-
+-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
+-
+-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
+-
+-activation.idl.compile: $(ACTIVATIONFILES)
+-
+-activation.idl.clean:
+-	$(RM) -f $(ACTIVATIONFILES)
+-
+-#
+-# PortableActivationIDL
+-#
+-
+-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
+-
+-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
+-
+-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
+-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
+-    -pkgPrefix Dynamic org.omg \
+-    -pkgPrefix IOP org.omg
+-
+-# REVISIT: remove -oldImplBase
+-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
+-
+-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
+-
+-portableactivation.idl.clean:
+-	$(RM) -f $(PORTABLEACTIVATIONFILES)
+-
+-#
+-# Generate LogWrapper classes
+-#
+-logwrapper.generate: \
+-	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
+-	$(LOG_GENDIRECTORY)/IORSystemException.java \
+-	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
+-	$(LOG_GENDIRECTORY)/NamingSystemException.java \
+-	$(LOG_GENDIRECTORY)/OMGSystemException.java \
+-	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
+-	$(LOG_GENDIRECTORY)/POASystemException.java \
+-	$(LOG_GENDIRECTORY)/UtilSystemException.java
+-
+-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
+-	$(prep-target)
+-	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)


From gnu_andrew at member.fsf.org  Sun Jun 22 12:34:54 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:34:54 +0000
Subject: changeset in /hg/icedtea: Merge jscheme patch to tip.
Message-ID: <hg.03aeec329490.1214163294.-6899778133799504387@icedtea.classpath.org>

changeset 03aeec329490 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03aeec329490
description:
	Merge jscheme patch to tip.

diffstat:

11 files changed, 268 insertions(+), 18 deletions(-)
ChangeLog                                 |   36 +++++++++++
Makefile.am                               |   22 +++++-
Makefile.in                               |   30 ++++++---
acinclude.m4                              |   10 +++
configure                                 |   14 ++++
generated/sun/misc/Version.java           |    4 -
generated/sun/tools/jconsole/Version.java |    2 
patches/icedtea-no-bcopy.patch            |   20 ++++++
patches/icedtea-sparc-ptracefix.patch     |   34 ++++++++++
patches/icedtea-sparc-trapsfix.patch      |   21 ++++++
patches/icedtea-sparc64-linux.patch       |   93 +++++++++++++++++++++++++++++

diffs (491 lines):

diff -r 2a13fc138cfa -r 03aeec329490 ChangeLog
--- a/ChangeLog	Tue Jun 10 03:17:12 2008 +0100
+++ b/ChangeLog	Mon Jun 16 20:04:22 2008 +0100
@@ -9,6 +9,42 @@ 2008-06-09  Andrew John Hughes  <gnu_and
 	tree.
 	* patches/icedtea-jscheme.patch: Added.
 	
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.6.0_0"
+	OpenJDK  Runtime Environment (build 1.6.0_0-b10)
+	OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+	* Makefile.in: Regenerated.
+
+2008-06-10  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* generated/sun/misc/Version.java: Likewise.
+	* generated/sun/tools/jconsole/Version.java: Likewise.
+
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
+2008-06-10  Tom Callaway <tcallawa at redhat.com>
+	    Dennis Gilmore <dennis at ausil.us>
+
+	* patches/icedtea-sparc64-linux.patch,
+	patches/icedtea-sparc-ptracefix.patch,
+	patches/icedtea-sparc-trapsfix.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
+	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+	* acinclude.m4: Set JRE_ARCH_DIR.
+	* Makefile.in, configure: Regenerate.
+
 2008-06-09  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.am
--- a/Makefile.am	Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.am	Mon Jun 16 20:04:22 2008 +0100
@@ -64,6 +64,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -78,8 +79,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -136,8 +138,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
-        "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-        "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -320,7 +323,11 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
@@ -516,8 +523,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.in
--- a/Makefile.in	Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.in	Mon Jun 16 20:04:22 2008 +0100
@@ -138,6 +138,7 @@ JAVA = @JAVA@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
 LDFLAGS = @LDFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -285,15 +286,17 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +328,10 @@ ICEDTEA_CLS_DIR_ECJ = \
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
@@ -423,9 +427,12 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
-	patches/icedtea-jscheme.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -1005,8 +1012,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 acinclude.m4
--- a/acinclude.m4	Tue Jun 10 03:17:12 2008 +0100
+++ b/acinclude.m4	Mon Jun 16 20:04:22 2008 +0100
@@ -4,22 +4,32 @@ AC_DEFUN([SET_ARCH_DIRS],
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
   AC_SUBST(BUILD_ARCH_DIR)
   AC_SUBST(INSTALL_ARCH_DIR)
+  AC_SUBST(JRE_ARCH_DIR)
 ])
 
 AC_DEFUN([FIND_JAVAC],
diff -r 2a13fc138cfa -r 03aeec329490 configure
--- a/configure	Tue Jun 10 03:17:12 2008 +0100
+++ b/configure	Mon Jun 16 20:04:22 2008 +0100
@@ -734,6 +734,7 @@ PARALLEL_JOBS
 PARALLEL_JOBS
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
+JRE_ARCH_DIR
 JAVA
 JAVAC
 JAVAH
@@ -5966,20 +5967,30 @@ fi
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
       INSTALL_ARCH_DIR=amd64
+      JRE_ARCH_DIR=amd64
       ;;
     i?86-*-*)
       BUILD_ARCH_DIR=i586
       INSTALL_ARCH_DIR=i386
+      JRE_ARCH_DIR=i386
       ;;
     arm*-*-*)
       BUILD_ARCH_DIR=arm
       INSTALL_ARCH_DIR=arm
+      JRE_ARCH_DIR=arm
       ;;
+    sparc64-*-*)
+      BUILD_ARCH_DIR=sparcv9
+      INSTALL_ARCH_DIR=sparcv9
+      JRE_ARCH_DIR=sparc64
+       ;;
     *)
       BUILD_ARCH_DIR=`uname -m`
       INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+      JRE_ARCH_DIR=$INSTALL_ARCH_DIR
       ;;
   esac
+
 
 
 
@@ -12976,6 +12987,7 @@ PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
 PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
 BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
 INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+JRE_ARCH_DIR!$JRE_ARCH_DIR$ac_delim
 JAVA!$JAVA$ac_delim
 JAVAC!$JAVAC$ac_delim
 JAVAH!$JAVAH$ac_delim
@@ -13045,7 +13057,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java	Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/misc/Version.java	Mon Jun 16 20:04:22 2008 +0100
@@ -36,10 +36,10 @@ public class Version {
         "1.6.0";
 
     private static final String java_runtime_name =
-        "IcedTea Runtime Environment";
+        "OpenJDK  Runtime Environment";
 
     private static final String java_runtime_version =
-        "1.6.0-b09";
+        "1.6.0-b10";
 
     static {
         init();
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/tools/jconsole/Version.java
--- a/generated/sun/tools/jconsole/Version.java	Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/tools/jconsole/Version.java	Mon Jun 16 20:04:22 2008 +0100
@@ -29,7 +29,7 @@ import java.io.PrintStream;
 
 public class Version {
     private static final String jconsole_version =
-        "1.6.0-b09";
+        "1.6.0-b10";
 
     public static void print(PrintStream ps) {
         printFullVersion(ps);
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-no-bcopy.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~	2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+ 
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-ptracefix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-ptracefix.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,34 @@
+diff -up openjdk/hotspot/agent/src/os/linux/libproc.h.BAD openjdk/hotspot/agent/src/os/linux/libproc.h
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.BAD	2008-05-29 19:03:34.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/libproc.h	2008-05-29 19:01:45.000000000 -0400
+@@ -34,14 +34,25 @@
+ 
+ #if defined(sparc) || defined(sparcv9)
+ /*
+-  If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+-  otherwise it should be from /usr/include/asm-sparc
+-  These two files define pt_regs structure differently
++  Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h
+ */ 
+ #ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
++struct pt_regs {
++	unsigned long u_regs[16]; /* globals and ins */
++	unsigned long tstate;
++	unsigned long tpc;
++	unsigned long tnpc;
++	unsigned int y;
++	unsigned int fprs;
++};
+ #else
+-#include "asm-sparc/ptrace.h"
++struct pt_regs {
++	unsigned long psr;
++	unsigned long pc;
++	unsigned long npc;
++	unsigned long y;
++	unsigned long u_regs[16]; /* globals and ins */
++};
+ #endif
+ 
+ #endif //sparc or sparcv9
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-trapsfix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,21 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD	2008-05-28 11:49:06.000000000 -0500
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	2008-05-28 11:51:56.000000000 -0500
+@@ -25,7 +25,16 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_assembler_linux_sparc.cpp.incl"
+ 
+-#include <asm-sparc/traps.h>
++/* Headers for 32bit sparc with a 32bit userland end up in asm/
++ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
++ * There is no traps.h in asm-sparc64/
++ */
++
++#if defined(__sparc__) && defined(__arch64__)
++# include <asm-sparc/traps.h>
++#else 
++# include <asm/traps.h>
++#endif
+ 
+ bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+   // Since the linux kernel resides at the low end of
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc64-linux.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc64-linux.patch	Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,93 @@
+diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD	2008-05-29 15:48:44.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-05-29 15:48:39.000000000 -0400
+@@ -0,0 +1,27 @@
++#
++# Copyright 1999-2005 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.
++#
++# 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.
++#  
++#
++
++# TLS helper, assembled from .s file
++# Not included in includeDB because it has no dependencies
++Obj_Files += linux_sparc.o
+diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD	2008-05-29 16:25:10.000000000 -0400
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-29 16:32:11.000000000 -0400
+@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
+ 
+ void LIRGenerator::increment_counter(address counter, int step) {
+   LIR_Opr pointer = new_register(T_INT);
+-  __ move(LIR_OprFact::intConst((int)counter), pointer);
++  __ move(LIR_OprFact::intConst((int)*counter), pointer);
+   LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
+   increment_counter(addr, step);
+ }
+@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+ 
+ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+                                         CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ store_mem_reg(value, address, info);
+-#else
+   __ volatile_store_mem_reg(value, address, info);
+-#endif
+ }
+ 
+ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+                                        CodeEmitInfo* info) {
+-#ifdef _LP64
+-  __ load_mem_reg(address, result, info);
+-#else
+   __ volatile_load_mem_reg(address, result, info);
+-#endif
+ }
+ 
+ 
+diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk/hotspot/build/linux/makefiles/defs.make.BAD	2008-05-30 07:03:37.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-30 07:03:45.000000000 -0400
+@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
+   HS_ARCH         = ia64
+ endif
+ 
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
+   HS_ARCH            = sparc
+ endif
+ 
++# sparc
++ifeq ($(ARCH), sparc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-sparc
++  VM_PLATFORM      = linux_sparc
++  HS_ARCH          = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)


From keiths at redhat.com  Sun Jun 22 12:34:55 2008
From: keiths at redhat.com (Keith Seitz)
Date: Sun, 22 Jun 2008 19:34:55 +0000
Subject: changeset in /hg/icedtea: * patches/icedtea-dnd-updatecursor.pat...
Message-ID: <hg.ac0e756d55cd.1214163295.-6899778133799504387@icedtea.classpath.org>

changeset ac0e756d55cd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ac0e756d55cd
description:
	* patches/icedtea-dnd-updatecursor.patch: New file.
	        * Makefile.am (ICEDTEA_PATHCES): Add above patch.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 19 insertions(+), 1 deletion(-)
ChangeLog                              |    6 ++++++
Makefile.am                            |    1 +
Makefile.in                            |    3 ++-
patches/icedtea-dnd-updatecursor.patch |   10 ++++++++++

diffs (51 lines):

diff -r 03aeec329490 -r ac0e756d55cd ChangeLog
--- a/ChangeLog	Mon Jun 16 20:04:22 2008 +0100
+++ b/ChangeLog	Wed Jun 18 12:51:24 2008 -0700
@@ -1,3 +1,9 @@ 2008-06-09  Andrew John Hughes  <gnu_and
+2008-06-18  Keith Seitz  <keiths at redhat.com>
+
+	* patches/icedtea-dnd-updatecursor.patch: New file.
+	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.in: Regenerated.
+
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR icedtea/140:
diff -r 03aeec329490 -r ac0e756d55cd Makefile.am
--- a/Makefile.am	Mon Jun 16 20:04:22 2008 +0100
+++ b/Makefile.am	Wed Jun 18 12:51:24 2008 -0700
@@ -329,6 +329,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
+	patches/icedtea-dnd-updatecursor.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 03aeec329490 -r ac0e756d55cd Makefile.in
--- a/Makefile.in	Mon Jun 16 20:04:22 2008 +0100
+++ b/Makefile.in	Wed Jun 18 12:51:24 2008 -0700
@@ -432,7 +432,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
diff -r 03aeec329490 -r ac0e756d55cd patches/icedtea-dnd-updatecursor.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-dnd-updatecursor.patch	Wed Jun 18 12:51:24 2008 -0700
@@ -0,0 +1,10 @@
+--- openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java.orig	2008-06-16 12:11:39.000000000 -0700
++++ openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java	2008-06-16 12:18:39.000000000 -0700
+@@ -466,7 +466,6 @@
+ 
+         Cursor c = null;
+ 
+-        targetAct = DnDConstants.ACTION_NONE;
+         switch (status) {
+             case ENTER:
+             case OVER:


From langel at redhat.com  Sun Jun 22 12:34:56 2008
From: langel at redhat.com (Lillian Angel)
Date: Sun, 22 Jun 2008 19:34:56 +0000
Subject: changeset in /hg/icedtea: 2008-06-19  Lillian Angel  <langel@red...
Message-ID: <hg.c9c356cd3adf.1214163296.-6899778133799504387@icedtea.classpath.org>

changeset c9c356cd3adf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c9c356cd3adf
description:
	2008-06-19  Lillian Angel  <langel at redhat.com>

	        Fixes Bug #159
	        * patches/icedtea-component.patch: New file.
	        * Makefile.am (ICEDTEA_PATHCES): Add above patch.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 169 insertions(+), 1 deletion(-)
ChangeLog                       |    7 +
Makefile.am                     |    1 
Makefile.in                     |    3 
patches/icedtea-component.patch |  159 +++++++++++++++++++++++++++++++++++++++

diffs (201 lines):

diff -r ac0e756d55cd -r c9c356cd3adf ChangeLog
--- a/ChangeLog	Wed Jun 18 12:51:24 2008 -0700
+++ b/ChangeLog	Thu Jun 19 13:35:47 2008 -0400
@@ -1,3 +1,10 @@ 2008-06-18  Keith Seitz  <keiths at redhat.
+2008-06-19  Lillian Angel  <langel at redhat.com>
+
+	Fixes Bug #159
+	* patches/icedtea-component.patch: New file.
+	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.in: Regenerated.
+
 2008-06-18  Keith Seitz  <keiths at redhat.com>
 
 	* patches/icedtea-dnd-updatecursor.patch: New file.
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.am
--- a/Makefile.am	Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.am	Thu Jun 19 13:35:47 2008 -0400
@@ -330,6 +330,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r ac0e756d55cd -r c9c356cd3adf Makefile.in
--- a/Makefile.in	Wed Jun 18 12:51:24 2008 -0700
+++ b/Makefile.in	Thu Jun 19 13:35:47 2008 -0400
@@ -432,7 +432,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r ac0e756d55cd -r c9c356cd3adf patches/icedtea-component.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-component.patch	Thu Jun 19 13:35:47 2008 -0400
@@ -0,0 +1,159 @@
+--- openjdk.old/jdk/src/share/classes/java/awt/Component.java	Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/share/classes/java/awt/Component.java	Tue Mar 18 12:04:20 2008 +0300
+@@ -634,6 +634,11 @@ public abstract class Component implemen
+      */
+     private PropertyChangeSupport changeSupport;
+ 
++    private transient final Object changeSupportLock = new Object();
++    private Object getChangeSupportLock() {
++        return changeSupportLock;
++    }
++
+     boolean isPacked = false;
+ 
+     /**
+@@ -7839,15 +7844,17 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+      */
+-    public synchronized void addPropertyChangeListener(
++    public void addPropertyChangeListener(
+                                                        PropertyChangeListener listener) {
+-        if (listener == null) {
+-            return;
+-        }
+-        if (changeSupport == null) {
+-            changeSupport = new PropertyChangeSupport(this);
+-        }
+-        changeSupport.addPropertyChangeListener(listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null) {
++                return;
++            }
++            if (changeSupport == null) {
++                changeSupport = new PropertyChangeSupport(this);
++            }
++            changeSupport.addPropertyChangeListener(listener);
++        }
+     }
+ 
+     /**
+@@ -7863,12 +7870,14 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
+      */
+-    public synchronized void removePropertyChangeListener(
++    public void removePropertyChangeListener(
+                                                           PropertyChangeListener listener) {
+-        if (listener == null || changeSupport == null) {
+-            return;
+-        }
+-        changeSupport.removePropertyChangeListener(listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null || changeSupport == null) {
++                return;
++            }
++            changeSupport.removePropertyChangeListener(listener);
++        }
+     }
+ 
+     /**
+@@ -7885,11 +7894,13 @@ public abstract class Component implemen
+      * @see      java.beans.PropertyChangeSupport#getPropertyChangeListeners
+      * @since    1.4
+      */
+-    public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
+-        if (changeSupport == null) {
+-            return new PropertyChangeListener[0];
+-        }
+-        return changeSupport.getPropertyChangeListeners();
++    public PropertyChangeListener[] getPropertyChangeListeners() {
++        synchronized (getChangeSupportLock()) {
++            if (changeSupport == null) {
++                return new PropertyChangeListener[0];
++            }
++            return changeSupport.getPropertyChangeListeners();
++        }
+     }
+ 
+     /**
+@@ -7923,16 +7934,18 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners(java.lang.String)
+      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
+      */
+-    public synchronized void addPropertyChangeListener(
++    public void addPropertyChangeListener(
+                                                        String propertyName,
+                                                        PropertyChangeListener listener) {
+-        if (listener == null) {
+-            return;
+-        }
+-        if (changeSupport == null) {
+-            changeSupport = new PropertyChangeSupport(this);
+-        }
+-        changeSupport.addPropertyChangeListener(propertyName, listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null) {
++                return;
++            }
++            if (changeSupport == null) {
++                changeSupport = new PropertyChangeSupport(this);
++            }
++            changeSupport.addPropertyChangeListener(propertyName, listener);
++        }
+     }
+ 
+     /**
+@@ -7951,13 +7964,15 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners(java.lang.String)
+      * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
+      */
+-    public synchronized void removePropertyChangeListener(
++    public void removePropertyChangeListener(
+                                                           String propertyName,
+                                                           PropertyChangeListener listener) {
+-        if (listener == null || changeSupport == null) {
+-            return;
+-        }
+-        changeSupport.removePropertyChangeListener(propertyName, listener);
++        synchronized (getChangeSupportLock()) {
++            if (listener == null || changeSupport == null) {
++                return;
++            }
++            changeSupport.removePropertyChangeListener(propertyName, listener);
++        }
+     }
+ 
+     /**
+@@ -7974,12 +7989,14 @@ public abstract class Component implemen
+      * @see #getPropertyChangeListeners
+      * @since 1.4
+      */
+-    public synchronized PropertyChangeListener[] getPropertyChangeListeners(
++    public PropertyChangeListener[] getPropertyChangeListeners(
+                                                                             String propertyName) {
+-        if (changeSupport == null) {
+-            return new PropertyChangeListener[0];
+-        }
+-        return changeSupport.getPropertyChangeListeners(propertyName);
++        synchronized (getChangeSupportLock()) {
++            if (changeSupport == null) {
++                return new PropertyChangeListener[0];
++            }
++            return changeSupport.getPropertyChangeListeners(propertyName);
++        }
+     }
+ 
+     /**
+@@ -7994,7 +8011,10 @@ public abstract class Component implemen
+      */
+     protected void firePropertyChange(String propertyName,
+                                       Object oldValue, Object newValue) {
+-        PropertyChangeSupport changeSupport = this.changeSupport;
++        PropertyChangeSupport changeSupport;
++        synchronized (getChangeSupportLock()) {
++            changeSupport = this.changeSupport;
++        }
+         if (changeSupport == null ||
+             (oldValue != null && newValue != null && oldValue.equals(newValue))) {
+             return;


From gbenson at redhat.com  Sun Jun 22 12:34:57 2008
From: gbenson at redhat.com (Gary Benson)
Date: Sun, 22 Jun 2008 19:34:57 +0000
Subject: changeset in /hg/icedtea: 2008-06-20  Gary Benson  <gbenson@redh...
Message-ID: <hg.d201ff92afab.1214163297.-6899778133799504387@icedtea.classpath.org>

changeset d201ff92afab in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d201ff92afab
description:
	2008-06-20  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-core-build.patch: Defuzz.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog                        |    4 ++++
patches/icedtea-core-build.patch |    2 +-

diffs (23 lines):

diff -r c9c356cd3adf -r d201ff92afab ChangeLog
--- a/ChangeLog	Thu Jun 19 13:35:47 2008 -0400
+++ b/ChangeLog	Fri Jun 20 11:06:52 2008 -0400
@@ -1,3 +1,7 @@ 2008-06-19  Lillian Angel  <langel at redha
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Defuzz.
+	
 2008-06-19  Lillian Angel  <langel at redhat.com>
 
 	Fixes Bug #159
diff -r c9c356cd3adf -r d201ff92afab patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Thu Jun 19 13:35:47 2008 -0400
+++ b/patches/icedtea-core-build.patch	Fri Jun 20 11:06:52 2008 -0400
@@ -176,7 +176,7 @@ diff -r 79d639c8a75f openjdk/hotspot/src
 diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-12 04:14:24.000000000 -0500
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-14 17:39:45.000000000 -0500
-@@ -92,8 +92,12 @@
+@@ -89,8 +89,12 @@
  #ifdef TIERED
    #define VMTYPE "Server"
  #else


From gbenson at redhat.com  Sun Jun 22 12:34:58 2008
From: gbenson at redhat.com (Gary Benson)
Date: Sun, 22 Jun 2008 19:34:58 +0000
Subject: changeset in /hg/icedtea: 2008-06-20  Gary Benson  <gbenson@redh...
Message-ID: <hg.4999cbdbc405.1214163298.-6899778133799504387@icedtea.classpath.org>

changeset 4999cbdbc405 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4999cbdbc405
description:
	2008-06-20  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-zero-build.patch: Correctly set CPU.

diffstat:

2 files changed, 22 insertions(+)
ChangeLog                        |    4 ++++
patches/icedtea-zero-build.patch |   18 ++++++++++++++++++

diffs (36 lines):

diff -r d201ff92afab -r 4999cbdbc405 ChangeLog
--- a/ChangeLog	Fri Jun 20 11:06:52 2008 -0400
+++ b/ChangeLog	Fri Jun 20 11:08:28 2008 -0400
@@ -1,3 +1,7 @@ 2008-06-20  Gary Benson  <gbenson at redhat
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero-build.patch: Correctly set CPU.
+
 2008-06-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-core-build.patch: Defuzz.
diff -r d201ff92afab -r 4999cbdbc405 patches/icedtea-zero-build.patch
--- a/patches/icedtea-zero-build.patch	Fri Jun 20 11:06:52 2008 -0400
+++ b/patches/icedtea-zero-build.patch	Fri Jun 20 11:08:28 2008 -0400
@@ -296,3 +296,21 @@ diff -r c9fa8e3d5aa2 openjdk/corba/make/
    ifeq ($(ARCH), sparc)
      # Linux sparc build can be either 32-bit or 64-bit.
      #   Default to 32, but allow explicit setting to 32 or 64.
+diff -r b5e5d2ef906a openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Jun 19 17:05:23 2008 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Jun 20 10:29:14 2008 +0100
+@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele
+                  WINDOWS_ONLY("windows")         \
+                  SOLARIS_ONLY("solaris")
+ 
++#ifdef ZERO_LIBARCH
++#define CPU      ZERO_LIBARCH
++#else
+ #define CPU      IA32_ONLY("x86")                \
+                  IA64_ONLY("ia64")               \
+                  AMD64_ONLY("amd64")             \
+                  SPARC_ONLY("sparc")
++#endif // ZERO_LIBARCH
+ 
+ const char *Abstract_VM_Version::vm_platform_string() {
+   return OS "-" CPU;


From gnu_andrew at member.fsf.org  Sun Jun 22 12:34:59 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:34:59 +0000
Subject: changeset in /hg/icedtea: Merge recent IcedTea6 patches to r903.
Message-ID: <hg.6a9207d80a39.1214163299.-6899778133799504387@icedtea.classpath.org>

changeset 6a9207d80a39 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6a9207d80a39
description:
	Merge recent IcedTea6 patches to r903.

diffstat:

141 files changed, 27989 insertions(+), 25440 deletions(-)
ChangeLog                                                                                              |  102 
Makefile.am                                                                                            |   28 
Makefile.in                                                                                            |  363 
acinclude.m4                                                                                           |   10 
configure                                                                                              |   16 
generated/sun/misc/Version.java                                                                        |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java               |  170 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java                    | 2014 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java              | 1067 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java                  |  488 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java                       |  130 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java           |   97 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt                                 |   37 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java                                |  206 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java                          |  798 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java                           |  607 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java                              |  238 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java                              |  195 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java                          |  103 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java                       |  139 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                           | 2560 ++--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java                     |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java                     | 5456 ++++------
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                                    | 1501 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java                   |   70 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java                 |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java                     |  190 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java              |  186 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java                |  375 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java                        |  642 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java               |  549 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java                      |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java                   |  254 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java                       |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java                    |   57 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java                          |   75 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java                        |  300 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java                        |  241 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java              |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java                  |   94 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java                        |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java                  |   72 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java                             |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java                         |  237 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java                            |  193 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java                  |  148 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java                 |  245 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java                         |   54 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java                         |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt                                  |    3 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java               |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java             |   19 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                             |  568 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java                             |  666 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java                        |   53 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java                          | 1687 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java                    |   71 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java                               |  135 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java                         |   69 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java                           |  175 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java                              |  316 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java                              |  403 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                           | 1923 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java                     |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java                       |  282 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java                        |  182 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java                  |  736 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java                        |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java                     |   22 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java                        |  105 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java                            | 2949 ++---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java                       |  336 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                             |  650 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java                            |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java                     |  110 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java                  |  572 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                             | 1199 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java                         |   91 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java                    |  478 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java                   |  157 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java                            |  287 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java                    |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java                   |  146 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java             |  184 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                          | 1852 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java                |  324 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java                         |  985 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java                     |  947 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java                    |  435 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java                        |  865 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java                |   47 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java               |  950 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java                          | 1460 +-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java                     |   60 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java                            |   14 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                           |   29 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java                           |   88 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java                          |    8 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java                  |    9 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                             |  896 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java                       |   41 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java                      |  195 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java                        | 1898 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java                             |  443 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java                              | 1720 +--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java               |  566 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java                    |  213 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java                    |  188 
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java             |   52 
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java      |   63 
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java     |  119 
overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java              |   54 
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java             |   52 
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java      |   63 
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java     |  119 
overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java              |   54 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java                |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java           |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java      |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java             |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java        |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java          |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java     |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java                         |   20 
patches/icedtea-component.patch                                                                        |  159 
patches/icedtea-copy-plugs.patch                                                                       |   30 
patches/icedtea-core-build.patch                                                                       |   16 
patches/icedtea-dnd-updatecursor.patch                                                                 |   10 
patches/icedtea-ecj.patch                                                                              |  590 -
patches/icedtea-eclipse-hotspot-6614100-6b06.patch                                                     |   56 
patches/icedtea-eclipse-hotspot-6614100-7b24.patch                                                     |   77 
patches/icedtea-gervill.patch                                                                          |   28 
patches/icedtea-jscheme.patch                                                                          | 1260 ++
patches/icedtea-no-bcopy.patch                                                                         |   20 
patches/icedtea-sparc-ptracefix.patch                                                                  |   34 
patches/icedtea-sparc-trapsfix.patch                                                                   |   21 
patches/icedtea-sparc64-linux.patch                                                                    |   93 
patches/icedtea-zero-build.patch                                                                       |   75 
rt/net/sourceforge/jnlp/Parser.java                                                                    |   23 
rt/net/sourceforge/nanoxml/XMLElement.java                                                             |  120 

diffs (truncated from 56333 to 500 lines):

diff -r ea9643ca3a31 -r 6a9207d80a39 ChangeLog
--- a/ChangeLog	Sun Jun 22 00:45:57 2008 +0100
+++ b/ChangeLog	Sun Jun 22 01:28:42 2008 +0100
@@ -1,3 +1,98 @@ 2008-06-02  Andrew John Hughes  <gnu_and
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-zero-build.patch: Correctly set CPU.
+
+2008-06-20  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-core-build.patch: Defuzz.
+	
+2008-06-19  Lillian Angel  <langel at redhat.com>
+
+	Fixes Bug #159
+	* patches/icedtea-component.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
+	* Makefile.in: Regenerated.
+
+2008-06-18  Keith Seitz  <keiths at redhat.com>
+
+	* patches/icedtea-dnd-updatecursor.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
+	* Makefile.in: Regenerated.
+
+2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR icedtea/140:
+	* Makefile.am: Add icedtea-jscheme.patch and
+	remove jscheme jar files and scripts after
+	unzipping OpenJDK.
+	* Makefile.in: Regenerated.
+	* patches/icedtea-ecj.patch: Updated for post-jscheme
+	tree.
+	* patches/icedtea-jscheme.patch: Added.
+	
+2008-06-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+	like the Sun's verify Java version applet, check for the "_" in the
+	version string. Our version string format is now correct:
+	java version "1.7.0_0"
+	OpenJDK  Runtime Environment (build 1.7.0_0-b26)
+	OpenJDK Server VM (build 1.7.0_0-b26, mixed mode)
+	* Makefile.in: Regenerated.
+
+2008-06-10  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.in: Regenerated.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
+	* generated/sun/misc/Version.java: Likewise.
+	* generated/sun/tools/jconsole/Version.java: Likewise.
+
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
+2008-06-10  Tom Callaway <tcallawa at redhat.com>
+	    Dennis Gilmore <dennis at ausil.us>
+
+	* patches/icedtea-sparc64-linux.patch,
+	patches/icedtea-sparc-ptracefix.patch,
+	patches/icedtea-sparc-trapsfix.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
+	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+	* acinclude.m4: Set JRE_ARCH_DIR.
+	* Makefile.in, configure: Regenerate.
+
+2008-06-09  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
+	starting the application.
+	* rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
+	dashes in xml comments.
+	(sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
+	(expectedInput(String, char)): New method.
+	
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill CVS source reformatting.
+
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
+	Import Gervill fixes from CVS. See CHANGES.txt.
+	* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
+
+2008-06-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (ZERO_PATCHES): Add
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
+	* Makefile.in: Regenerate.
+	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
+
 2008-06-02  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* NEWS: Add news stub for next release.
@@ -25,6 +120,13 @@ 2008-05-30  Lillian Angel  <langel at redha
 	* Makefile.am: Fixed dist to not include full path to ports, and
 	ICEDTEA_ECJ_PATCH. This fixes the problem with "make dist".
 	* Makefile.in: Regenerated.
+
+2008-06-01  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-copy-plugs.patch: Adjusted to remove sound
+	references in b10.
+	* patches/icedtea-gervill.patch: Adjusted to new sound service
+	files in b10.
 
 2008-05-30  Mark Wielaard  <mark at klomp.org>
 
diff -r ea9643ca3a31 -r 6a9207d80a39 Makefile.am
--- a/Makefile.am	Sun Jun 22 00:45:57 2008 +0100
+++ b/Makefile.am	Sun Jun 22 01:28:42 2008 +0100
@@ -1,4 +1,6 @@ OPENJDK_VERSION = b26
 OPENJDK_VERSION = b26
+
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -60,6 +62,7 @@ ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
 if CORE_BUILD
   ICEDTEA_CORE_BUILD = yes
 else
@@ -74,8 +77,9 @@ ICEDTEA_ENV = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"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)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -132,8 +136,9 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"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)" \
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+        "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+        "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" \
 	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -339,8 +344,16 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(ZERO_PATCHES_COND) \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
+	patches/icedtea-no-bcopy.patch \
+	patches/icedtea-jscheme.patch \
+	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch \
@@ -548,8 +561,13 @@ stamps/bootstrap-directory-ecj.stamp:
 	if test -d $(SYSTEM_GCJ_DIR); \
 	then \
 	  mkdir -p bootstrap/ecj/jre/lib; \
-	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+	  ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	    bootstrap/ecj/jre/lib/; \
+	  if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+	  then \
+	    ln -sf ./$(JRE_ARCH_DIR) \
+	      bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+	  fi; \
 	  mkdir -p bootstrap/ecj/include; \
 	  for i in $(SYSTEM_GCJ_DIR)/include/*; do \
 	    test -r $$i | continue; \
diff -r ea9643ca3a31 -r 6a9207d80a39 Makefile.in
--- a/Makefile.in	Sun Jun 22 00:45:57 2008 +0100
+++ b/Makefile.in	Sun Jun 22 01:28:42 2008 +0100
@@ -138,6 +138,7 @@ JAVA = @JAVA@
 JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
 LDFLAGS = @LDFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -250,7 +251,18 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_VERSION = b26
+||||||| /tmp/Makefile.in~base.9SzsA6
+OPENJDK_DATE = 11_apr_2008
+OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
+OPENJDK_VERSION = b09
+=======
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -269,31 +281,63 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
+=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_RT = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+=======
 	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
+=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_BOOT_DIR = \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/bootstrap/jdk1.6.0
+=======
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
 
+JDK_UPDATE_VERSION = 0
 @CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD = 
 @CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
 @ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD = 
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	"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" \
+||||||| /tmp/Makefile.in~base.9SzsA6
+	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+=======
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -311,23 +355,54 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
+=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
+||||||| /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+=======
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR_ECJ = \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
+||||||| /tmp/Makefile.in~base.9SzsA6
+	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+=======
+	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	"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" \
+||||||| /tmp/Makefile.in~base.9SzsA6
+	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
+	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+=======
+	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
+=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -351,15 +426,27 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
+=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
 # ==================================
 
 # Download OpenJDK sources.
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
 @USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = 
+||||||| /tmp/Makefile.in~base.9SzsA6
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
+=======
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -381,9 +468,15 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
+	patches/icedtea-ia64-bugfix.patch \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+
+
+# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
+NON_ZERO_PATCHES = \
+	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
@@ -412,21 +505,40 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch patches/icedtea-override.patch \
 	$(am__append_7)
+||||||| /tmp/Makefile.in~base.9SzsA6
+	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
+	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_7)
+=======
+	patches/icedtea-sparc.patch \
+	patches/icedtea-sparc64-linux.patch \
+	patches/icedtea-sparc-ptracefix.patch \
+	patches/icedtea-sparc-trapsfix.patch \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+	patches/icedtea-dnd-updatecursor.patch \
+	patches/icedtea-component.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) $(am__append_7)
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 # Patch OpenJDK for plug replacements and ecj.
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+=======
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -842,24 +954,84 @@ clean-clone:
 	rm -rf openjdk
 
 # Link ports sources into tree
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/ports.stamp: stamps/clone.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sf $$target $$link; \
+||||||| /tmp/Makefile.in~base.9SzsA6
+stamps/ports.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+	  ln -sf $$PWD/$$target $$link; \
+=======
+stamps/ports.stamp: stamps/extract.stamp
+	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+	  ln -sf $$target $$link; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	done
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
+=======
 	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+=======
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+<<<<<<< /tmp/Makefile.in~base.9SzsA6
+	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+=======
 	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
+>>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
+<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/patch.stamp: stamps/clone.stamp
+||||||| /tmp/Makefile.in~base.9SzsA6
+stamps/extract.stamp: stamps/download.stamp
+	if ! test -d openjdk ; \
+	then \
+	  mkdir openjdk ; \
+	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+	  chmod -R ug+w openjdk ; \
+	fi
+	mkdir -p stamps
+	touch stamps/extract.stamp
+
+clean-extract:
+	rm -f stamps/extract.stamp
+
+stamps/patch.stamp: stamps/extract.stamp
+=======
+stamps/extract.stamp: stamps/download.stamp
+	if ! test -d openjdk ; \
+	then \
+	  mkdir openjdk ; \
+	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+	  chmod -R ug+w openjdk ; \


From gnu_andrew at member.fsf.org  Sun Jun 22 12:35:01 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:35:01 +0000
Subject: changeset in /hg/icedtea: Fix patches to apply against OpenJDK b26.
Message-ID: <hg.0c781f5b6de5.1214163300.-6899778133799504387@icedtea.classpath.org>

changeset 0c781f5b6de5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0c781f5b6de5
description:
	Fix patches to apply against OpenJDK b26.

diffstat:

8 files changed, 730 insertions(+), 1622 deletions(-)
ChangeLog                           |   13 
Makefile.am                         |    1 
Makefile.in                         |  363 --------
configure                           |    6 
patches/icedtea-copy-plugs.patch    |  143 +--
patches/icedtea-core-build.patch    |  298 ++++++-
patches/icedtea-ecj.patch           | 1443 ++++++++---------------------------
patches/icedtea-sparc64-linux.patch |   85 --

diffs (truncated from 3063 to 500 lines):

diff -r 6a9207d80a39 -r 0c781f5b6de5 ChangeLog
--- a/ChangeLog	Sun Jun 22 01:28:42 2008 +0100
+++ b/ChangeLog	Sun Jun 22 20:30:20 2008 +0100
@@ -1,3 +1,16 @@ 2008-06-20  Gary Benson  <gbenson at redhat
+2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Remove unneeded component patch.
+	* Makefile.in,
+	* configure:
+	Regenerated.
+	* patches/icedtea-copy-plugs.patch,
+	* patches/icedtea-core-build.patch,
+	* patches/icedtea-ecj.patch,
+	* patches/icedtea-sparc64-linux.patch:
+	Regenerated against OpenJDK b26.
+
 2008-06-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-zero-build.patch: Correctly set CPU.
diff -r 6a9207d80a39 -r 0c781f5b6de5 Makefile.am
--- a/Makefile.am	Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.am	Sun Jun 22 20:30:20 2008 +0100
@@ -353,7 +353,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
-	patches/icedtea-component.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch \
diff -r 6a9207d80a39 -r 0c781f5b6de5 Makefile.in
--- a/Makefile.in	Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.in	Sun Jun 22 20:30:20 2008 +0100
@@ -251,18 +251,8 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_VERSION = b26
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
-=======
-OPENJDK_DATE = 30_may_2008
-OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
-OPENJDK_VERSION = b10
 JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -281,32 +271,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
-=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_RT = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-=======
 	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
-=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_BOOT_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
-=======
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -318,26 +292,12 @@ JDK_UPDATE_VERSION = 0
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-	"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" \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -355,54 +315,24 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
-=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
-||||||| /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
-=======
-	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
-||||||| /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-=======
-	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-	"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" \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -426,27 +356,15 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
-=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
 # ==================================
 
 # Download OpenJDK sources.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
 @USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = 
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-=======
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -468,15 +386,9 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch \
-	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
-
-
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
-	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+	patches/icedtea-ia64-bugfix.patch
+
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
@@ -505,40 +417,27 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-arm-uname.patch \
+	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
+	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch \
-	$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
-	patches/icedtea-xslfix.patch patches/icedtea-override.patch \
-	$(am__append_7)
-||||||| /tmp/Makefile.in~base.9SzsA6
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
-=======
-	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	$(ZERO_PATCHES_COND) \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch \
-	patches/icedtea-component.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
+	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
+	patches/icedtea-override.patch $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-=======
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -954,84 +853,24 @@ clean-clone:
 	rm -rf openjdk
 
 # Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/ports.stamp: stamps/clone.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports.stamp: stamps/extract.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
-	  ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-=======
 	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
 	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/patch.stamp: stamps/clone.stamp
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/extract.stamp: stamps/download.stamp
-	if ! test -d openjdk ; \
-	then \
-	  mkdir openjdk ; \
-	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-	  chmod -R ug+w openjdk ; \
-	fi
-	mkdir -p stamps
-	touch stamps/extract.stamp
-
-clean-extract:
-	rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
-=======
-stamps/extract.stamp: stamps/download.stamp
-	if ! test -d openjdk ; \
-	then \
-	  mkdir openjdk ; \
-	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-	  chmod -R ug+w openjdk ; \
-	  rm -rf $(JSCHEME_DIR)/lib; \
-	  rm -rf $(JSCHEME_DIR)/scripts; \
-	fi
-	mkdir -p stamps
-	touch stamps/extract.stamp
-
-clean-extract:
-	rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	all_patches_ok=yes; \
 	cd $(abs_top_builddir)/openjdk/jdk; \
 	for p in $(OPENJDK_PATCHES) ; \
@@ -1051,18 +890,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
-=======
 	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  then \
 	    echo Applying $$p ; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	    $(PATCH) -l -p0 < $$p ; \
-=======
 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -1081,7 +912,6 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
@@ -1095,20 +925,9 @@ clean-patch:
 	do \
 	  echo Checking $$p ; \
 	  if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
-=======
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  then \
 	    echo Reverting $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	    $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	    $(PATCH) -l -p0 -R < $$p ; \
-=======
-	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -1119,11 +938,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
-=======
 	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -1141,45 +956,19 @@ clean-clone-ecj:
 	rm -rf openjdk-ecj
 
 # Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
 	  ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
-	  ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-=======
 	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
 	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
@@ -1213,13 +1002,7 @@ clean-patch-ecj:
 # bootstrap/icedtea.
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-||||||| /tmp/Makefile.in~base.9SzsA6
-	ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-=======
-	ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test -d bootstrap/icedtea/include; then \
 	  ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
 	fi
@@ -1287,35 +1070,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-=======
 	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-		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; \
-=======
 		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
-=======
+	fi
 	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6


From gnu_andrew at member.fsf.org  Sun Jun 22 12:35:02 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 19:35:02 +0000
Subject: changeset in /hg/icedtea: Remove component patch.
Message-ID: <hg.837aa402fd1c.1214163302.-6899778133799504387@icedtea.classpath.org>

changeset 837aa402fd1c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=837aa402fd1c
description:
	Remove component patch.

diffstat:

2 files changed, 5 insertions(+), 159 deletions(-)
ChangeLog                       |    5 +
patches/icedtea-component.patch |  159 ---------------------------------------

diffs (175 lines):

diff -r 0c781f5b6de5 -r 837aa402fd1c ChangeLog
--- a/ChangeLog	Sun Jun 22 20:30:20 2008 +0100
+++ b/ChangeLog	Sun Jun 22 20:31:08 2008 +0100
@@ -1,3 +1,8 @@ 2008-06-22  Andrew John Hughes  <gnu_and
+2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* patches/icedtea-component.patch:
+	Removed.
+	
 2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 0c781f5b6de5 -r 837aa402fd1c patches/icedtea-component.patch
--- a/patches/icedtea-component.patch	Sun Jun 22 20:30:20 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
---- openjdk.old/jdk/src/share/classes/java/awt/Component.java	Fri Mar 14 20:40:09 2008 +0300
-+++ openjdk/jdk/src/share/classes/java/awt/Component.java	Tue Mar 18 12:04:20 2008 +0300
-@@ -634,6 +634,11 @@ public abstract class Component implemen
-      */
-     private PropertyChangeSupport changeSupport;
- 
-+    private transient final Object changeSupportLock = new Object();
-+    private Object getChangeSupportLock() {
-+        return changeSupportLock;
-+    }
-+
-     boolean isPacked = false;
- 
-     /**
-@@ -7839,15 +7844,17 @@ public abstract class Component implemen
-      * @see #getPropertyChangeListeners
-      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-      */
--    public synchronized void addPropertyChangeListener(
-+    public void addPropertyChangeListener(
-                                                        PropertyChangeListener listener) {
--        if (listener == null) {
--            return;
--        }
--        if (changeSupport == null) {
--            changeSupport = new PropertyChangeSupport(this);
--        }
--        changeSupport.addPropertyChangeListener(listener);
-+        synchronized (getChangeSupportLock()) {
-+            if (listener == null) {
-+                return;
-+            }
-+            if (changeSupport == null) {
-+                changeSupport = new PropertyChangeSupport(this);
-+            }
-+            changeSupport.addPropertyChangeListener(listener);
-+        }
-     }
- 
-     /**
-@@ -7863,12 +7870,14 @@ public abstract class Component implemen
-      * @see #getPropertyChangeListeners
-      * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
-      */
--    public synchronized void removePropertyChangeListener(
-+    public void removePropertyChangeListener(
-                                                           PropertyChangeListener listener) {
--        if (listener == null || changeSupport == null) {
--            return;
--        }
--        changeSupport.removePropertyChangeListener(listener);
-+        synchronized (getChangeSupportLock()) {
-+            if (listener == null || changeSupport == null) {
-+                return;
-+            }
-+            changeSupport.removePropertyChangeListener(listener);
-+        }
-     }
- 
-     /**
-@@ -7885,11 +7894,13 @@ public abstract class Component implemen
-      * @see      java.beans.PropertyChangeSupport#getPropertyChangeListeners
-      * @since    1.4
-      */
--    public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
--        if (changeSupport == null) {
--            return new PropertyChangeListener[0];
--        }
--        return changeSupport.getPropertyChangeListeners();
-+    public PropertyChangeListener[] getPropertyChangeListeners() {
-+        synchronized (getChangeSupportLock()) {
-+            if (changeSupport == null) {
-+                return new PropertyChangeListener[0];
-+            }
-+            return changeSupport.getPropertyChangeListeners();
-+        }
-     }
- 
-     /**
-@@ -7923,16 +7934,18 @@ public abstract class Component implemen
-      * @see #getPropertyChangeListeners(java.lang.String)
-      * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-      */
--    public synchronized void addPropertyChangeListener(
-+    public void addPropertyChangeListener(
-                                                        String propertyName,
-                                                        PropertyChangeListener listener) {
--        if (listener == null) {
--            return;
--        }
--        if (changeSupport == null) {
--            changeSupport = new PropertyChangeSupport(this);
--        }
--        changeSupport.addPropertyChangeListener(propertyName, listener);
-+        synchronized (getChangeSupportLock()) {
-+            if (listener == null) {
-+                return;
-+            }
-+            if (changeSupport == null) {
-+                changeSupport = new PropertyChangeSupport(this);
-+            }
-+            changeSupport.addPropertyChangeListener(propertyName, listener);
-+        }
-     }
- 
-     /**
-@@ -7951,13 +7964,15 @@ public abstract class Component implemen
-      * @see #getPropertyChangeListeners(java.lang.String)
-      * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
-      */
--    public synchronized void removePropertyChangeListener(
-+    public void removePropertyChangeListener(
-                                                           String propertyName,
-                                                           PropertyChangeListener listener) {
--        if (listener == null || changeSupport == null) {
--            return;
--        }
--        changeSupport.removePropertyChangeListener(propertyName, listener);
-+        synchronized (getChangeSupportLock()) {
-+            if (listener == null || changeSupport == null) {
-+                return;
-+            }
-+            changeSupport.removePropertyChangeListener(propertyName, listener);
-+        }
-     }
- 
-     /**
-@@ -7974,12 +7989,14 @@ public abstract class Component implemen
-      * @see #getPropertyChangeListeners
-      * @since 1.4
-      */
--    public synchronized PropertyChangeListener[] getPropertyChangeListeners(
-+    public PropertyChangeListener[] getPropertyChangeListeners(
-                                                                             String propertyName) {
--        if (changeSupport == null) {
--            return new PropertyChangeListener[0];
--        }
--        return changeSupport.getPropertyChangeListeners(propertyName);
-+        synchronized (getChangeSupportLock()) {
-+            if (changeSupport == null) {
-+                return new PropertyChangeListener[0];
-+            }
-+            return changeSupport.getPropertyChangeListeners(propertyName);
-+        }
-     }
- 
-     /**
-@@ -7994,7 +8011,10 @@ public abstract class Component implemen
-      */
-     protected void firePropertyChange(String propertyName,
-                                       Object oldValue, Object newValue) {
--        PropertyChangeSupport changeSupport = this.changeSupport;
-+        PropertyChangeSupport changeSupport;
-+        synchronized (getChangeSupportLock()) {
-+            changeSupport = this.changeSupport;
-+        }
-         if (changeSupport == null ||
-             (oldValue != null && newValue != null && oldValue.equals(newValue))) {
-             return;


From bugzilla-daemon at icedtea.classpath.org  Sun Jun 22 14:49:27 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Jun 2008 21:49:27 +0000
Subject: [Bug 140] no source included for jscheme*jar
Message-ID: <E1KAXR9-0004Ad-EH@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org
                   |.org                        |
             Status|ASSIGNED                    |NEW




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


From bugzilla-daemon at icedtea.classpath.org  Sun Jun 22 14:51:00 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Jun 2008 21:51:00 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1KAXSe-0004B2-H1@icedtea.classpath.org>

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


Bug 138 depends on bug 140, which changed state.

Bug 140 Summary: no source included for jscheme*jar
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|ASSIGNED                    |NEW
             Status|NEW                         |RESOLVED
         Resolution|                            |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 gnu_andrew at member.fsf.org  Sun Jun 22 12:33:38 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 22 Jun 2008 20:33:38 +0100
Subject: FYI: Update IcedTea tree with latest IcedTea6 changes
Message-ID: <20080622193338.GA10519@rivendell.middle-earth.co.uk>

I've updated the IcedTea tree to take in the latest changes
from the IcedTea6 tree.  The attached patch details post-merge
changes needed to make the tree compile.

ChangeLog:

2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* patches/icedtea-component.patch:
	Removed.
	
2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Remove unneeded component patch.
	* Makefile.in,
	* configure:
	Regenerated.
	* patches/icedtea-copy-plugs.patch,
	* patches/icedtea-core-build.patch,
	* patches/icedtea-ecj.patch,
	* patches/icedtea-sparc64-linux.patch:
	Regenerated against OpenJDK b26.

2008-06-20  Gary Benson  <gbenson at redhat.com>

	* patches/icedtea-zero-build.patch: Correctly set CPU.

2008-06-20  Gary Benson  <gbenson at redhat.com>

	* patches/icedtea-core-build.patch: Defuzz.
	
2008-06-19  Lillian Angel  <langel at redhat.com>

	Fixes Bug #159
	* patches/icedtea-component.patch: New file.
	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
	* Makefile.in: Regenerated.

2008-06-18  Keith Seitz  <keiths at redhat.com>

	* patches/icedtea-dnd-updatecursor.patch: New file.
	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
	* Makefile.in: Regenerated.

2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	PR icedtea/140:
	* Makefile.am: Add icedtea-jscheme.patch and
	remove jscheme jar files and scripts after
	unzipping OpenJDK.
	* Makefile.in: Regenerated.
	* patches/icedtea-ecj.patch: Updated for post-jscheme
	tree.
	* patches/icedtea-jscheme.patch: Added.
	
2008-06-11  Lillian Angel  <langel at redhat.com>

	* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
	like the Sun's verify Java version applet, check for the "_" in the
	version string. Our version string format is now correct:
	java version "1.7.0_0"
	OpenJDK  Runtime Environment (build 1.7.0_0-b26)
	OpenJDK Server VM (build 1.7.0_0-b26, mixed mode)
	* Makefile.in: Regenerated.

2008-06-10  Lillian Angel  <langel at redhat.com>

	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* configure: Likewise.
	* generated/sun/misc/Version.java: Likewise.
	* generated/sun/tools/jconsole/Version.java: Likewise.

2008-06-10  Matthias Klose  <doko at ubuntu.com>

	* patches/icedtea-no-bcopy.patch: New.
	* Makefile.am (ICEDTEA_PATCHES): Add patch.
	* Makefile.in: Regenerate.

2008-06-10  Tom Callaway <tcallawa at redhat.com>
	    Dennis Gilmore <dennis at ausil.us>

	* patches/icedtea-sparc64-linux.patch,
	patches/icedtea-sparc-ptracefix.patch,
	patches/icedtea-sparc-trapsfix.patch: New.
	* Makefile.am (ICEDTEA_PATCHES): Add above patches.
	* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
	symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
	* acinclude.m4: Set JRE_ARCH_DIR.
	* Makefile.in, configure: Regenerate.

2008-06-09  Joshua Sumali  <jsumali at redhat.com>

	* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
	starting the application.
	* rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
	dashes in xml comments.
	(sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
	(expectedInput(String, char)): New method.
	
2008-06-08  Mark Wielaard  <mark at klomp.org>

	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	Import Gervill CVS source reformatting.

2008-06-08  Mark Wielaard  <mark at klomp.org>

	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
	Import Gervill fixes from CVS. See CHANGES.txt.
	* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.

2008-06-08  Mark Wielaard  <mark at klomp.org>

	* Makefile.am (ZERO_PATCHES): Add
	patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
	* Makefile.in: Regenerate.
	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.


-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 6a9207d80a39 Makefile.am
--- a/Makefile.am	Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.am	Sun Jun 22 20:27:09 2008 +0100
@@ -353,7 +353,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
-	patches/icedtea-component.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) \
 	patches/icedtea-xslfix.patch \
diff -r 6a9207d80a39 Makefile.in
--- a/Makefile.in	Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.in	Sun Jun 22 20:27:09 2008 +0100
@@ -251,18 +251,8 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_VERSION = b26
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
-=======
-OPENJDK_DATE = 30_may_2008
-OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
-OPENJDK_VERSION = b10
 JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -281,32 +271,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 LINUX_DIR = linux-$(BUILD_ARCH_DIR)
 BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
 ICEDTEA_BUILD_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
-=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_RT = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-=======
 	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
-=======
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_BOOT_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/bootstrap/jdk1.6.0
-=======
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -318,26 +292,12 @@ JDK_UPDATE_VERSION = 0
 @ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
 ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-	"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" \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
 	"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -355,54 +315,24 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
-=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_2) $(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
-||||||| /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
-=======
-	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_CLS_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
-||||||| /tmp/Makefile.in~base.9SzsA6
-	$(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-=======
-	$(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
 	"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-	"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" \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	"JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
-	"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
-	"JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
-	"HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+	"HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
 	"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -426,27 +356,15 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
-=======
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	$(am__append_5) $(am__append_6)
 
 # OpenJDK Source Preparation Targets
 # ==================================
 
 # Download OpenJDK sources.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
 @USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = 
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-=======
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
 
@@ -468,15 +386,9 @@ ZERO_PATCHES = \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch \
-	patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+	patches/icedtea-ia64-bugfix.patch
 
-
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
-	patches/icedtea-eclipse-hotspot-6614100-6b06.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = 
 @ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
 ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
@@ -505,40 +417,27 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-arm-uname.patch \
+	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
+	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch \
-	$(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
-	patches/icedtea-xslfix.patch patches/icedtea-override.patch \
-	$(am__append_7)
-||||||| /tmp/Makefile.in~base.9SzsA6
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
-=======
-	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	$(ZERO_PATCHES_COND) \
+	patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch \
-	patches/icedtea-component.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
+	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
+	patches/icedtea-override.patch $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-=======
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
 @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = 
 @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = 
@@ -954,84 +853,24 @@ clean-clone:
 	rm -rf openjdk
 
 # Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/ports.stamp: stamps/clone.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports.stamp: stamps/extract.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
-	  ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports.stamp: stamps/extract.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
-	  ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-=======
 	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
 	  ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/patch.stamp: stamps/clone.stamp
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/extract.stamp: stamps/download.stamp
-	if ! test -d openjdk ; \
-	then \
-	  mkdir openjdk ; \
-	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-	  chmod -R ug+w openjdk ; \
-	fi
-	mkdir -p stamps
-	touch stamps/extract.stamp
-
-clean-extract:
-	rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
-=======
-stamps/extract.stamp: stamps/download.stamp
-	if ! test -d openjdk ; \
-	then \
-	  mkdir openjdk ; \
-	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
-	  chmod -R ug+w openjdk ; \
-	  rm -rf $(JSCHEME_DIR)/lib; \
-	  rm -rf $(JSCHEME_DIR)/scripts; \
-	fi
-	mkdir -p stamps
-	touch stamps/extract.stamp
-
-clean-extract:
-	rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	all_patches_ok=yes; \
 	cd $(abs_top_builddir)/openjdk/jdk; \
 	for p in $(OPENJDK_PATCHES) ; \
@@ -1051,18 +890,10 @@ stamps/patch.stamp: stamps/extract.stamp
 	do \
 	  if test x$${all_patches_ok} == "xyes" \
 	     && echo Checking $$p \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
-=======
 	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  then \
 	    echo Applying $$p ; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	    $(PATCH) -l -p0 < $$p ; \
-=======
 	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  else \
 	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
@@ -1081,7 +912,6 @@ clean-patch:
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
 	  echo Checking $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
 	  then \
 	    echo Reverting $$p ; \
@@ -1095,20 +925,9 @@ clean-patch:
 	do \
 	  echo Checking $$p ; \
 	  if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
-=======
-	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  then \
 	    echo Reverting $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	    $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	    $(PATCH) -l -p0 -R < $$p ; \
-=======
-	    $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  else \
 	    all_patches_ok=no ; \
 	  fi ; \
@@ -1119,11 +938,7 @@ clean-patch:
 	fi
 
 stamps/overlay.stamp: stamps/patch.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
-=======
 	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -1141,45 +956,19 @@ clean-clone-ecj:
 	rm -rf openjdk-ecj
 
 # Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
 	  ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in ports/hotspot/build/*/makefiles/* \
-		      ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
-	  ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
-	  ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-=======
 	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
 	  ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 	mkdir -p stamps
 	touch stamps/ports-ecj.stamp
@@ -1213,13 +1002,7 @@ clean-patch-ecj:
 # bootstrap/icedtea.
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-||||||| /tmp/Makefile.in~base.9SzsA6
-	ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-=======
-	ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	if ! test -d bootstrap/icedtea/include; then \
 	  ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
 	fi
@@ -1287,35 +1070,16 @@ stamps/bootstrap-directory-ecj.stamp:
 	    --with-gcj-home=/path/to/java-gcj-devel ; \
           exit 1; \
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-=======
 	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-		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; \
-=======
 		mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
 		ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	            $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
-=======
 	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-			bootstrap/ecj/jre/lib/rt.jar; \
-=======
 		cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 			$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
@@ -1353,18 +1117,10 @@ icedtea: stamps/bootstrap-directory-syml
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
-=======
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp rt/net/sourceforge/jnlp/resources/about.jnlp \
-=======
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -1384,18 +1140,10 @@ icedtea-debug: stamps/bootstrap-director
 	  cp -pPRf gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-=======
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-=======
 	cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
@@ -1504,53 +1252,25 @@ clean-copy:
 
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
-=======
 	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
-	for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
-=======
-
-	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
-	for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
-=======
-
-	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
 	    hotspot-tools/$$copy_dir ; \
 	done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
-	for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
-=======
-
-	for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	do \
 	  mkdir -p hotspot-tools/$$copy_dir ; \
 	  cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
@@ -1569,22 +1289,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-            -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
             -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -source 1.5 \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
             -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
-	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	    -bootclasspath '' @$< ; \
 	fi
 	mkdir -p stamps
@@ -1612,26 +1322,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	  ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
-=======
 	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	fi
 
 # rt-closed.jar class files.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
 rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
 	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
-||||||| /tmp/Makefile.in~base.9SzsA6
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find rt -name '*.java' | sort > $@
-=======
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
@@ -1639,33 +1336,15 @@ stamps/rt-class-files.stamp: rt-source-f
         then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
             -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
-	    -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	    -bootclasspath '' @$< ; \
         else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
             -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
             -bootclasspath '' @$< ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
         fi
 	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
-||||||| /tmp/Makefile.in~base.9SzsA6
-	fi
-	cp -r rt/net/sourceforge/jnlp/resources \
-=======
-	fi
-	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
 	touch stamps/rt-class-files.stamp
@@ -1693,11 +1372,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
 # extras -- used to create about.jar for javaws.
 extra-source-files.txt:
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	find extra -name '*.java' | sort > $@
-=======
 	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -1706,11 +1381,7 @@ stamps/extra-class-files.stamp: extra-so
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-=======
 	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -1718,11 +1389,7 @@ stamps/extra-class-files.stamp: extra-so
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-	cp -r extra/net/sourceforge/jnlp/about/resources \
-=======
 	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
 	touch $@
diff -r 6a9207d80a39 configure
--- a/configure	Sun Jun 22 01:28:42 2008 +0100
+++ b/configure	Sun Jun 22 20:27:09 2008 +0100
@@ -13171,11 +13171,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-<<<<<<< /tmp/configure~base._zwsjU
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-=======
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
->>>>>>> /tmp/configure~other.lgMy65
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 6a9207d80a39 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-copy-plugs.patch	Sun Jun 22 20:27:09 2008 +0100
@@ -1,83 +1,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
-diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 04:01:56.000000000 -0400
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 17:17:28.000000000 -0400
-@@ -78,6 +78,9 @@
-      */
-     public long            timeStamp ;
- 
-+    // TODO: IcedTea: I am a stub.
-+    static public int trapAuthenticationFailure = 0;
-+
- 
- 
-     /**
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java	2008-02-14 16:23:01.000000000 -0500
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-02-14 16:22:15.000000000 -0500
-@@ -1628,7 +1628,7 @@
-     }
- 
-     private static String[] getAnnotationValue(Constructor<?> constructor) {
--        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
-         return (annotation != null)
-                 ? annotation.value()
-                 : null;
---- penjdk6/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-02-12 04:05:12.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-02-14 17:27:39.000000000 -0500
-@@ -1154,7 +1154,7 @@
-             Set<BitSet> getterIndexSets = newSet();
-             for (Constructor<?> constr : annotatedConstrList) {
-                 String[] propertyNames =
--                    constr.getAnnotation(propertyNamesClass).value();
-+		    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
- 
-                 Type[] paramTypes = constr.getGenericParameterTypes();
-                 if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-05-23 20:13:24.000000000 +0100
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-05-23 20:22:20.000000000 +0100
- com/sun/jmx/snmp/SnmpDataTypeEnums.class \
- com/sun/jmx/snmp/SnmpDefinitions.class \
- com/sun/jmx/snmp/SnmpOid.class \
--com/sun/jmx/snmp/SnmpOidDatabase.class \
--com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
- com/sun/jmx/snmp/SnmpOidRecord.class \
- com/sun/jmx/snmp/SnmpOidTable.class \
- com/sun/jmx/snmp/SnmpOidTableSupport.class \
- com/sun/jmx/snmp/SnmpParameters.class \
- com/sun/jmx/snmp/SnmpPduPacket.class \
- com/sun/jmx/snmp/SnmpPeer.class \
-+rt/com/sun/jmx/snmp/SnmpSession.class \
- com/sun/jmx/snmp/SnmpTimeticks.class \
- com/sun/jmx/snmp/SnmpVarBind.class \
- com/sun/jmx/snmp/SnmpVarBindList.class \
--com/sun/jmx/snmp/Timestamp.class \
- com/sun/jmx/snmp/daemon/SendQ.class \
- com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
--com/sun/jmx/snmp/daemon/SnmpQManager.class \
--com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
--com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
--com/sun/jmx/snmp/daemon/SnmpSendServer.class \
--com/sun/jmx/snmp/daemon/SnmpSession.class \
--com/sun/jmx/snmp/daemon/SnmpSocket.class \
--com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
--com/sun/jmx/snmp/daemon/WaitQ.class
-+com/sun/jmx/snmp/daemon/SnmpSession.class
- 
- # Class list temp files (used by both import and export of plugs)
- 
-+PLUG_GNU_CLASS_NAMES = gnu
-+
-+PLUG_JAVAX_CLASS_NAMES = javax/jnlp
-+
-+PLUG_NETX_CLASS_NAMES = net
-+
- PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf
-+PLUG_CLASS_AREAS = jmf gnu javax netx
- PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
- 
- # Create jargs file command
-@@ -93,11 +90,32 @@
+diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-22 02:47:03.000000000 +0100
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-22 02:51:22.000000000 +0100
+@@ -147,6 +147,21 @@
  	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
  	  $(ECHO) "$$i" >> $@; \
  	done
@@ -96,10 +20,12 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +	@for i in $(PLUG_NETX_CLASS_NAMES) ; do \
 +	  $(ECHO) "$$i" >> $@ ; \
 +	done
- $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
+ $(PLUG_TEMPDIR)/sound.clist:
  	@$(prep-target)
- 	$(CAT) $(PLUG_CLISTS) > $@
- $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
+ 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
+@@ -159,6 +174,12 @@
+ 	$(plug-create-jargs)
+ $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
@@ -110,7 +36,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -183,9 +201,9 @@
+@@ -183,9 +204,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -122,23 +48,40 @@ diff -urN openjdk.orig/jdk/src/share/cla
  endef # import-binary-plug-classes
  
  # Import specific area classes (the classes are always created)
-@@ -194,12 +212,21 @@
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
-+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
-+	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
-+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
-+	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/javax.clist)
-+import-binary-plug-netx-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netx.clist
-+	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netx.clist)
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-05-27 22:30:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-06-22 02:48:42.000000000 +0100
+@@ -1154,7 +1154,7 @@
+             Set<BitSet> getterIndexSets = newSet();
+             for (Constructor<?> constr : annotatedConstrList) {
+                 String[] propertyNames =
+-                    constr.getAnnotation(propertyNamesClass).value();
++		    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
  
- # Import all classes from the jar file
+                 Type[] paramTypes = constr.getGenericParameterTypes();
+                 if (paramTypes.length != propertyNames.length) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-05-27 22:30:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-06-22 02:48:42.000000000 +0100
+@@ -78,6 +78,9 @@
+      */
+     public long            timeStamp ;
  
- import-binary-plug-jar: \
--	     import-binary-plug-jmf-classes
-+	     import-binary-plug-jmf-classes \
-+	     import-binary-plug-gnu-classes \
-+	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes
++    // TODO: IcedTea: I am a stub.
++    static public int trapAuthenticationFailure = 0;
++
  
- # Binary plug start/complete messages
  
+     /**
+diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java	2008-05-27 22:30:16.000000000 +0100
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-06-22 02:48:42.000000000 +0100
+@@ -1564,7 +1564,7 @@
+     }
+ 
+     private static String[] getAnnotationValue(Constructor<?> constructor) {
+-        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+         return (annotation != null)
+                 ? annotation.value()
+                 : null;
diff -r 6a9207d80a39 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-core-build.patch	Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common
 diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk	2008-05-16 22:13:14.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk	2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk	2008-05-27 22:28:05.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk	2008-06-22 03:10:05.000000000 +0100
 @@ -250,7 +250,12 @@
  # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
  # the library itself should not.
@@ -16,8 +16,8 @@ diff -Nru openjdk.orig/corba/make/common
  JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
  
 diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-06-22 03:10:05.000000000 +0100
 @@ -97,6 +97,7 @@
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
@@ -32,8 +32,8 @@ diff -Nru openjdk.orig/hotspot/build/lin
  endif
 +endif
 diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile	2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/make/Makefile	2008-05-23 23:09:47.000000000 +0100
+--- openjdk.orig/hotspot/make/Makefile	2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/make/Makefile	2008-06-22 03:10:05.000000000 +0100
 @@ -91,6 +91,15 @@
  all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
  all_optimized: optimized optimized1 optimizedkernel docs export_optimized
@@ -104,18 +104,10 @@ diff -Nru openjdk.orig/hotspot/make/Make
  
  # Bin files (windows)
  ifeq ($(OSNAME),windows)
-@@ -264,6 +292,7 @@ endif
- 
- # Xusage file
- $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt: $(XUSAGE)
-+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
- 	$(prep-target)
- 	$(RM) $@.temp
- 	$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
-diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-12 04:14:24.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-02-14 17:39:45.000000000 -0500
-@@ -89,8 +89,12 @@
+diff -Nru 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	2008-05-27 22:28:30.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-06-22 03:10:05.000000000 +0100
+@@ -94,8 +94,12 @@
  #ifdef TIERED
    #define VMTYPE "Server"
  #else
@@ -130,9 +122,267 @@ diff -r 79d639c8a75f openjdk/hotspot/src
  #endif // TIERED
  #endif // KERNEL
  
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-05-27 22:28:30.000000000 +0100
+@@ -0,0 +1,254 @@
++/*
++ * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * 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/_vm_version.cpp.incl"
++
++const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
++const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
++bool Abstract_VM_Version::_supports_cx8 = false;
++unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
++
++#ifndef HOTSPOT_RELEASE_VERSION
++  #error HOTSPOT_RELEASE_VERSION must be defined
++#endif
++#ifndef JRE_RELEASE_VERSION
++  #error JRE_RELEASE_VERSION must be defined
++#endif
++#ifndef HOTSPOT_BUILD_TARGET
++  #error HOTSPOT_BUILD_TARGET must be defined
++#endif
++
++#ifdef PRODUCT
++  #define VM_RELEASE HOTSPOT_RELEASE_VERSION
++#else
++  #define VM_RELEASE HOTSPOT_RELEASE_VERSION "-" HOTSPOT_BUILD_TARGET
++#endif
++
++// HOTSPOT_RELEASE_VERSION must follow the release version naming convention
++// <major_ver>.<minor_ver>-b<nn>[-<identifier>][-<debug_target>]
++int Abstract_VM_Version::_vm_major_version = 0;
++int Abstract_VM_Version::_vm_minor_version = 0;
++int Abstract_VM_Version::_vm_build_number = 0;
++bool Abstract_VM_Version::_initialized = false;
++int Abstract_VM_Version::_parallel_worker_threads = 0;
++bool Abstract_VM_Version::_parallel_worker_threads_initialized = false;
++
++void Abstract_VM_Version::initialize() {
++  if (_initialized) {
++    return;
++  }
++  char* vm_version = os::strdup(HOTSPOT_RELEASE_VERSION);
++
++  // Expecting the next vm_version format:
++  // <major_ver>.<minor_ver>-b<nn>[-<identifier>]
++  char* vm_major_ver = vm_version;
++  assert(isdigit(vm_major_ver[0]),"wrong vm major version number");
++  char* vm_minor_ver = strchr(vm_major_ver, '.');
++  assert(vm_minor_ver != NULL && isdigit(vm_minor_ver[1]),"wrong vm minor version number");
++  vm_minor_ver[0] = '\0'; // terminate vm_major_ver
++  vm_minor_ver += 1;
++  char* vm_build_num = strchr(vm_minor_ver, '-');
++  assert(vm_build_num != NULL && vm_build_num[1] == 'b' && isdigit(vm_build_num[2]),"wrong vm build number");
++  vm_build_num[0] = '\0'; // terminate vm_minor_ver
++  vm_build_num += 2;
++
++  _vm_major_version = atoi(vm_major_ver);
++  _vm_minor_version = atoi(vm_minor_ver);
++  _vm_build_number  = atoi(vm_build_num);
++
++  os::free(vm_version);
++  _initialized = true;
++}
++
++#if defined(_LP64)
++  #define VMLP "64-Bit "
++#else
++  #define VMLP ""
++#endif
++
++#ifdef KERNEL
++  #define VMTYPE "Kernel"
++#else // KERNEL
++#ifdef TIERED
++  #define VMTYPE "Server"
++#else
++  #define VMTYPE COMPILER1_PRESENT("Client")   \
++                 COMPILER2_PRESENT("Server")
++#endif // TIERED
++#endif // KERNEL
++
++#ifndef HOTSPOT_VM_DISTRO
++  #error HOTSPOT_VM_DISTRO must be defined
++#endif
++#define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM"
++
++const char* Abstract_VM_Version::vm_name() {
++  return VMNAME;
++}
++
++
++const char* Abstract_VM_Version::vm_vendor() {
++#ifdef VENDOR
++  return XSTR(VENDOR);
++#else
++  return "Sun Microsystems Inc.";
++#endif
++}
++
++
++const char* Abstract_VM_Version::vm_info_string() {
++  switch (Arguments::mode()) {
++    case Arguments::_int:
++      return UseSharedSpaces ? "interpreted mode, sharing" : "interpreted mode";
++    case Arguments::_mixed:
++      return UseSharedSpaces ? "mixed mode, sharing"       :  "mixed mode";
++    case Arguments::_comp:
++      return UseSharedSpaces ? "compiled mode, sharing"    : "compiled mode";
++  };
++  ShouldNotReachHere();
++  return "";
++}
++
++// NOTE: do *not* use stringStream. this function is called by
++//       fatal error handler. if the crash is in native thread,
++//       stringStream cannot get resource allocated and will SEGV.
++const char* Abstract_VM_Version::vm_release() {
++  return VM_RELEASE;
++}
++
++#define OS       LINUX_ONLY("linux")             \
++                 WINDOWS_ONLY("windows")         \
++                 SOLARIS_ONLY("solaris")
++
++#define CPU      IA32_ONLY("x86")                \
++                 IA64_ONLY("ia64")               \
++                 AMD64_ONLY("amd64")             \
++                 SPARC_ONLY("sparc")
++
++const char *Abstract_VM_Version::vm_platform_string() {
++  return OS "-" CPU;
++}
++
++const char* Abstract_VM_Version::internal_vm_info_string() {
++  #ifndef HOTSPOT_BUILD_USER
++    #define HOTSPOT_BUILD_USER unknown
++  #endif
++
++  #ifndef HOTSPOT_BUILD_COMPILER
++    #ifdef _MSC_VER
++      #if   _MSC_VER == 1100
++        #define HOTSPOT_BUILD_COMPILER "MS VC++ 5.0"
++      #elif _MSC_VER == 1200
++        #define HOTSPOT_BUILD_COMPILER "MS VC++ 6.0"
++      #elif _MSC_VER == 1310
++        #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1"
++      #elif _MSC_VER == 1400
++        #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0"
++      #else
++        #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
++      #endif
++    #elif defined(__SUNPRO_CC)
++      #if   __SUNPRO_CC == 0x420
++        #define HOTSPOT_BUILD_COMPILER "Workshop 4.2"
++      #elif __SUNPRO_CC == 0x500
++        #define HOTSPOT_BUILD_COMPILER "Workshop 5.0 compat=" XSTR(__SUNPRO_CC_COMPAT)
++      #elif __SUNPRO_CC == 0x520
++        #define HOTSPOT_BUILD_COMPILER "Workshop 5.2 compat=" XSTR(__SUNPRO_CC_COMPAT)
++      #elif __SUNPRO_CC == 0x580
++        #define HOTSPOT_BUILD_COMPILER "Workshop 5.8"
++      #elif __SUNPRO_CC == 0x590
++        #define HOTSPOT_BUILD_COMPILER "Workshop 5.9"
++      #else
++        #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
++      #endif
++    #elif defined(__GNUC__)
++        #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__
++    #else
++      #define HOTSPOT_BUILD_COMPILER "unknown compiler"
++    #endif
++  #endif
++
++
++  return VMNAME " (" VM_RELEASE ") for " OS "-" CPU
++         " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
++         " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
++}
++
++unsigned int Abstract_VM_Version::jvm_version() {
++  return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) |
++         ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) |
++         (Abstract_VM_Version::vm_build_number() & 0xFF);
++}
++
++
++void VM_Version_init() {
++  VM_Version::initialize();
++
++#ifndef PRODUCT
++  if (PrintMiscellaneous && Verbose) {
++    os::print_cpu_info(tty);
++  }
++#endif
++}
++
++unsigned int Abstract_VM_Version::nof_parallel_worker_threads(
++                                                      unsigned int num,
++                                                      unsigned int den,
++                                                      unsigned int switch_pt) {
++  if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
++    assert(ParallelGCThreads == 0, "Default ParallelGCThreads is not 0");
++    // For very large machines, there are diminishing returns
++    // for large numbers of worker threads.  Instead of
++    // hogging the whole system, use a fraction of the workers for every
++    // processor after the first 8.  For example, on a 72 cpu machine
++    // and a chosen fraction of 5/8
++    // use 8 + (72 - 8) * (5/8) == 48 worker threads.
++    unsigned int ncpus = (unsigned int) os::active_processor_count();
++    return (ncpus <= switch_pt) ?
++           ncpus :
++          (switch_pt + ((ncpus - switch_pt) * num) / den);
++  } else {
++    return ParallelGCThreads;
++  }
++}
++
++unsigned int Abstract_VM_Version::calc_parallel_worker_threads() {
++  return nof_parallel_worker_threads(5, 8, 8);
++}
++
++
++// Does not set the _initialized flag since it is
++// a global flag.
++unsigned int Abstract_VM_Version::parallel_worker_threads() {
++  if (!_parallel_worker_threads_initialized) {
++    if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
++      _parallel_worker_threads = VM_Version::calc_parallel_worker_threads();
++    } else {
++      _parallel_worker_threads = ParallelGCThreads;
++    }
++    _parallel_worker_threads_initialized = true;
++  }
++  return _parallel_worker_threads;
++}
 diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk	2008-05-23 22:59:36.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk	2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2008-06-22 03:01:01.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk	2008-06-22 03:10:05.000000000 +0100
 @@ -258,7 +258,12 @@
  # -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
  # the library itself should not.
@@ -148,8 +398,8 @@ diff -Nru openjdk.orig/jdk/make/common/D
  JAVALIB         = -ljava $(JVMLIB)
  
 diff -Nru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile	2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/java/redist/Makefile	2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/jdk/make/java/redist/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk/jdk/make/java/redist/Makefile	2008-06-22 03:10:05.000000000 +0100
 @@ -95,10 +95,12 @@
  endif # INCLUDE_SA
  
@@ -181,8 +431,8 @@ diff -Nru openjdk.orig/jdk/make/java/red
  
  endif # PLATFORM
 diff -Nru openjdk.orig/make/hotspot-rules.gmk openjdk/make/hotspot-rules.gmk
---- openjdk.orig/make/hotspot-rules.gmk	2008-05-23 23:04:41.000000000 +0100
-+++ openjdk/make/hotspot-rules.gmk	2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/make/hotspot-rules.gmk	2008-05-27 22:27:57.000000000 +0100
++++ openjdk/make/hotspot-rules.gmk	2008-06-22 03:10:05.000000000 +0100
 @@ -72,6 +72,10 @@
    HOTSPOT_TARGET = all_fastdebug
  endif
diff -r 6a9207d80a39 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-ecj.patch	Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2008-05-26 01:35:35.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile	2008-06-22 19:05:57.000000000 +0100
 @@ -42,7 +42,7 @@
  # the rmic iiop backend needs some classes that are part of the impl/util
  # package.  These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
  
 diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
 --- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2008-05-26 01:35:35.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile	2008-06-22 19:05:57.000000000 +0100
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -52,1531 +52,9 @@ diff -Nru openjdk-ecj.orig/corba/make/co
 +# Include
 +#
 +include $(BUILDDIR)/common/Classes.gmk
---- iopenjdk/jdk/make/common/Rules.gmk	2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/common/Rules.gmk	2007-11-07 11:02:53.000000000 -0500
-@@ -235,8 +235,9 @@
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- 	  $(CAT) $(JAVA_SOURCE_LIST); \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
--	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	   $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+         -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+         $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- 	fi
- 	@$(java-vm-cleanup)
- 
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
- 
-+
-+ifdef ALT_LANGTOOLS_DIST
-+  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+  LANGTOOLS_DIST =
-+endif 
-+
- #
- # Get platform definitions
- #
-@@ -129,8 +136,6 @@
- # for build tool jar files
- BUILDTOOLJARDIR     = $(OUTPUTDIR)/btjars
- ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
--# for generated java source files
--GENSRCDIR           = $(OUTPUTDIR)/gensrc
- # for generated C source files (not javah)
- GENNATIVESRCDIR     = $(OUTPUTDIR)/gennativesrc
- # for imported source files
-@@ -231,7 +236,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
- 
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
---- openjdk-ecj.orig/corba/make/common/Rules.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk	2008-05-26 01:35:35.000000000 +0100
-@@ -197,8 +197,10 @@
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- 	  $(CAT) $(JAVA_SOURCE_LIST); \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
--	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- 	fi
- 	@$(java-vm-cleanup)
- 
-diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-05-26 01:35:42.000000000 +0100
-@@ -117,31 +117,13 @@
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
- 
--# Langtools
--ifdef LANGTOOLS_DIST
--  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
--  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
--  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
--  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
--  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAC_JAR)" \
--		-jar $(JAVAC_JAR) $(JAVACFLAGS)
--  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
--		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
--  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
--		-jar $(JAVADOC_JAR)
--else
--  # If no explicit tools, use boot tools (add VM flags in this case)
--  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- 		  $(JAVACFLAGS)
--  JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
- 
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
-diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -93,8 +93,6 @@
- POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
- 
- $(POAGENERATEDFILES):: $(POA.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
--	$(RM) -r $(POAHELHOLFILES)
- 
- poa.compile: $(POAGENERATEDFILES)
- 
-@@ -110,10 +108,6 @@
- 
- # Generating and deleting unused files to reduce images size
- $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
--	$(RM) $(DYNANY_DIR)/*POA*
--	$(RM) $(DYNANY_DIR)/*Holder*
--	$(RM) $(DYNANYDELETEFILES)
- 
- dynany.compile: $(DYNANYFILES)
- 
-@@ -125,12 +119,6 @@
- TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
- 
- $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
- 
- tr.compile: $(TRGENERATEDFILES)
- 
-@@ -144,7 +132,6 @@
- # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
- # to GENSRC directory. Note that these two classes are deprecated.
- $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
- 
- ns.compile: $(NSGENERATEDFILES)
- 
-@@ -156,8 +143,6 @@
- IOPDELETEFILES =    $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
- 
- $(IOPGENERATEDFILES):: $(IOP.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
--	$(RM) -r $(IOPDELETEFILES)
- 
- iop.compile: $(IOPGENERATEDFILES)
- 
-@@ -169,8 +154,6 @@
- CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
- 
- $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
--	$(RM) $(CORBAXDUPLICATEFILES)
- 
- corbax.compile: $(CORBAXGENERATEDFILES)
- 
-@@ -181,7 +164,6 @@
- MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
- 
- $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
- 
- messaging.compile: $(MESSAGINGGENERATEDFILES)
- 
-@@ -195,8 +177,6 @@
- PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
- 
- $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
--	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
--	$(RM) $(PIHELHOLFILES)
- 
- pi.compile: $(PIGENERATEDFILES)
- 
-diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -173,7 +173,6 @@
- ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
- 
- $(ACTIVATIONFILES): $(ACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
- 
- activation.idl.compile: $(ACTIVATIONFILES)
- 
-@@ -196,7 +195,6 @@
- 
- # REVISIT: remove -oldImplBase
- $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
--	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
- 
- portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
- 
-diff -Nru openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm
---- openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2008-05-26 01:35:42.000000000 +0100
-@@ -332,7 +332,6 @@
- 	    (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- 	(.println pw "//")
- 	(.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
--	(.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- 	(.println pw)))
- 
- (define (write-factory-method class-name exception-group-name pw)
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
---- openjdk-ecj.orig/hotspot/build/linux/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -249,28 +249,24 @@
- 
- $(TARGETS_C2):  $(SUBDIRS_C2)
- 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
- 
- $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
- 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
- 
- $(TARGETS_C1):  $(SUBDIRS_C1)
- 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
- 
- $(TARGETS_CORE):  $(SUBDIRS_CORE)
- 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make	2008-05-26 01:35:42.000000000 +0100
-@@ -72,7 +72,7 @@
- 	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
- 	  mkdir -p $(SA_CLASSDIR);        \
- 	fi
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
- 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- 	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
-diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile	2008-05-26 01:35:42.000000000 +0100
-@@ -80,7 +80,7 @@
- endif
- 
- ifdef ALT_BOOTDIR
--  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
- 
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml	2008-05-26 01:35:42.000000000 +0100
-@@ -71,7 +71,10 @@
-       <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"
-+		fork="true"
-+		executable="${javac.executable}"
-+		source="1.5"/>
-       <taskdef name="pstrip"
- 		 classname="StripPropertiesTask"
- 		 classpath="${build.toolclasses.dir}/"/>
-@@ -85,7 +88,9 @@
-              destdir="${build.classes.dir}"
-              memoryInitialSize="${javac.memoryInitialSize}"
-              memoryMaximumSize="${javac.memoryMaximumSize}"
--             target="${javac.target}">
-+             target="${javac.target}"
-+             executable="${javac.executable}"
-+             source="1.5">
-          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
-          <compilerarg line="${javac.version.opt}"/>
-       </javac>
-diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile	2008-05-26 01:35:42.000000000 +0100
-@@ -80,8 +80,8 @@
- endif
- 
- ifdef ALT_BOOTDIR
--  ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
--  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
- 
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties	2008-05-26 01:35:35.000000000 +0100
-@@ -37,7 +37,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
- 
- # JVM memory size
- javac.memoryInitialSize = 128m
-diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml	2008-05-26 01:35:42.000000000 +0100
-@@ -84,7 +84,10 @@
-       <mkdir dir="${build.toolclasses.dir}"/>
-       <javac srcdir="${make.tools.dir}/StripProperties"
- 		destdir="${build.toolclasses.dir}/"
--		classpath="${ant.home}/lib/ant.jar"/>
-+		fork="true"
-+                executable="${javac.executable}"
-+		classpath="${ant.home}/lib/ant.jar"
-+		source="1.5"/>
-       <taskdef name="pstrip"
- 		 classname="StripPropertiesTask"
- 		 classpath="${build.toolclasses.dir}/"/>
-@@ -96,12 +99,14 @@
-       <javac fork="true"
-              srcdir="${src.classes.dir}"
-              destdir="${build.classes.dir}"
-+             executable="${javac.executable}"
-              memoryInitialSize="${javac.memoryInitialSize}"
-              memoryMaximumSize="${javac.memoryMaximumSize}"
-              target="${javac.target}"
--             excludes="com/sun/tools/internal/txw2/**">
--	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
--         <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
-+             excludes="com/sun/tools/internal/txw2/**"
-+	     source="1.5">
-+         <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
-+	 <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
-          <compilerarg line="${javac.version.opt}"/>
-          <compilerarg line="${javac.no.jdk.warnings}"/>
-       </javac>
-diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -239,7 +239,7 @@
- 
- all build:: sanity-all post-sanity-all
- 
--SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
-+SUBDIRS    = tools java javax org sun sunw com jpda mksample launchers
- all build::
- 	$(SUBDIRS-loop)
- 
-diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk	2008-05-26 01:35:35.000000000 +0100
-@@ -43,7 +43,8 @@
- 	@$(prep-target)
- 	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- 	$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
--	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+	    $(BUILDTOOL_MAIN_SOURCE_FILE)
- 	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- 	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- 	    $(JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2008-05-26 01:35:42.000000000 +0100
-@@ -649,10 +649,11 @@
- $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
- 	$(prep-target)
- 	$(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)
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
- 	@$(java-vm-cleanup)
- 
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +709,11 @@
- $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
- 	$(prep-target)
- 	$(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)
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
- 	@$(java-vm-cleanup)
- 
- # Meta-index construction to make core class loaders lazier
-@@ -949,19 +951,6 @@
- 	@$(java-vm-cleanup)
- 	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
- 	@#
--	@# lib/ct.sym
--	@#
--	$(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
--	$(JAVAC_CMD) -XDprocess.packages -proc:only \
--	    -processor com.sun.tools.javac.sym.CreateSymbols \
--	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
--	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
--	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
--	$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
--	    -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
--	@$(java-vm-cleanup)
--	$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
--	@#
- 	@# CORBA supported orb.idl and ir.idl should be copied to lib
- 	@#
- 	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1038,16 +1027,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
--	@#
--	@# demo, include
--	@#
--	$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
--	$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
--	$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
--	@#
--	@# Swing BeanInfo generation
--	@#
--	$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
- ifneq ($(PLATFORM), windows)
- 	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
- endif # !windows
-diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk	2008-05-26 01:41:27.000000000 +0100
-@@ -237,8 +237,9 @@
- 	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
- 	  $(CAT) $<.filtered; \
- 	  $(ECHO) "# Running javac:"; \
--	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
--	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+          -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+          $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- 	fi
- 	@$(java-vm-cleanup)
- 
-@@ -304,6 +305,8 @@
- 	$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
- 		$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
- 	@$(java-vm-cleanup)
-+	-mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
-+	  $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
- 	@$(TOUCH) $@
- 
- classheaders.clean:
-diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk~ openjdk-ecj/jdk/make/common/Rules.gmk~
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk~	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk~	2008-05-26 01:35:35.000000000 +0100
-@@ -0,0 +1,339 @@
-+#
-+# Copyright 1995-2007 Sun Microsystems, Inc.  All Rights Reserved.
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# This code is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 only, as
-+# published by the Free Software Foundation.  Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun in the LICENSE file that accompanied this code.
-+#
-+# This code is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+# version 2 for more details (a copy is included in the LICENSE file that
-+# accompanied this code).
-+#
-+# You should have received a copy of the GNU General Public License version
-+# 2 along with this work; if not, write to the Free Software Foundation,
-+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+
-+#
-+#
-+# Rules shared by all Java makefiles.
-+#
-+# Used to apply to source file $<, checks code conventions, issues warnings.
-+define check-conventions
-+  if [ "$(CONVENTION_WATCH)" = "true" ] ; then \
-+    if [ "`$(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]'`" != "" ] ; then \
-+      $(ECHO) "WARNING: File contains tabs, ^M, or ^L characters: $<"; \
-+      if [ "$(CONVENTION_DETAILS)" = "true" ] ; then \
-+        $(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]' ; \
-+      fi; \
-+    fi; \
-+  fi
-+endef
-+
-+# Make sure the default rule is all
-+rules_default_rule: all
-+
-+#
-+# Directory set up.  (Needed by deploy workspace)
-+# 
-+$(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBDIR)/$(LIBARCH) $(TEMPDIR) $(EXTDIR):
-+	$(MKDIR) -p $@ 
-+
-+#
-+# All source tree areas for java/properties files (a few may be closed)
-+#
-+ifdef OPENJDK
-+  ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-+else
-+  ALL_CLASSES_SRC = \
-+	$(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
-+	$(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-+endif
-+
-+#
-+# If AUTO_FILES_PROPERTIES_DIRS used, automatically find properties files
-+#
-+ifdef AUTO_FILES_PROPERTIES_DIRS
-+  AUTO_FILES_PROPERTIES_FILTERS1  = $(SCM_DIRs) 'X-*' '*-X-*' ',*'
-+  AUTO_FILES_PROPERTIES_FILTERS1 += $(AUTO_PROPERTIES_PRUNE)
-+  FILES_properties_find_filters1 = $(AUTO_FILES_PROPERTIES_FILTERS1:%=-name % -prune -o)
-+  FILES_properties_auto1 := \
-+     $(shell \
-+        for dir in $(ALL_CLASSES_SRC) ; do \
-+          if [ -d $$dir ] ; then \
-+            ( $(CD) $$dir; \
-+              for sdir in $(AUTO_FILES_PROPERTIES_DIRS); do \
-+                if [ -d $$sdir ] ; then \
-+                  $(FIND) $$sdir $(FILES_properties_find_filters1) \
-+                                 -name '*.properties' -print ; \
-+                fi ; \
-+              done \
-+            ); \
-+          fi; \
-+        done \
-+      )
-+else
-+  FILES_properties_auto1 =
-+endif # AUTO_FILES_PROPERTIES_DIRS
-+
-+# Add any automatically found properties files to the properties file list
-+FILES_properties += $(FILES_properties_auto1)
-+
-+#
-+# Get Resources help
-+#
-+include $(JDK_TOPDIR)/make/common/internal/Resources.gmk
-+
-+#
-+# Compiling .java files.
-+#
-+
-+#
-+# Automatically add to FILES_java if AUTO_FILES_JAVA_DIRS is defined
-+#
-+#    There are two basic types of sources, normal source files and the
-+#    generated ones. The Normal sources will be located in:
-+#         $(ALL_CLASSES_SRC)
-+#    The generated sources, which might show up late to dinner, are at:
-+#         $(GENSRCDIR)
-+#    and since they could be generated late, we need to be careful that
-+#    we look for these sources late and not use the ':=' assignment which
-+#    might miss their generation.
-+
-+ifdef AUTO_FILES_JAVA_DIRS
-+  # Filter out these files or directories
-+  AUTO_FILES_JAVA_SOURCE_FILTERS1  = $(SCM_DIRs) 'X-*' '*-X-*' '*-template.java' ',*'
-+  AUTO_FILES_JAVA_SOURCE_FILTERS2  = 
-+  AUTO_FILES_JAVA_SOURCE_FILTERS1 += $(AUTO_JAVA_PRUNE)
-+  AUTO_FILES_JAVA_SOURCE_FILTERS2 += $(AUTO_JAVA_PRUNE)
-+
-+  # First list is the normal sources that should always be there,
-+  #   by using the ':=', which means we do this processing once.
-+  FILES_java_find_filters1 = $(AUTO_FILES_JAVA_SOURCE_FILTERS1:%=-name % -prune -o)
-+  FILES_java_auto1 := \
-+     $(shell \
-+        for dir in $(ALL_CLASSES_SRC) ; do \
-+          if [ -d $$dir ] ; then \
-+            ( $(CD) $$dir; \
-+              for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+                if [ -d $$sdir ] ; then \
-+                  $(FIND) $$sdir $(FILES_java_find_filters1) \
-+                                 -name '*.java' -print ; \
-+                fi ; \
-+              done \
-+            ); \
-+          fi; \
-+        done \
-+      )
-+  # Second list is the generated sources that should be rare, but will likely
-+  #   show up late and we need to look for them at the last minute, so we
-+  #   cannot use the ':=' assigment here. But if this gets expanded multiple
-+  #   times, the if tests should make them relatively cheap.
-+  FILES_java_find_filters2 = $(AUTO_FILES_JAVA_SOURCE_FILTERS2:%=-name % -prune -o)
-+  FILES_java_auto2 = \
-+     $(shell \
-+        for dir in $(GENSRCDIR); do \
-+          if [ -d $$dir ] ; then \
-+            ( $(CD) $$dir; \
-+              for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+                if [ -d $$sdir ] ; then \
-+                  $(FIND) $$sdir $(FILES_java_find_filters2) \
-+                                 -name '*.java' -print ; \
-+                fi ; \
-+              done \
-+            ); \
-+          fi; \
-+        done \
-+      )
-+else
-+  FILES_java_auto1 =
-+  FILES_java_auto2 =
-+endif
-+
-+# Add all found java sources to FILES_java macro (if AUTO_FILES_JAVA_DIRS used)
-+FILES_java += $(FILES_java_auto1) $(FILES_java_auto2)
-+
-+# File that will hold java source names that need compiling
-+JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
-+
-+# Add a java source to the list
-+define add-java-file
-+$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
-+$(check-conventions)
-+endef
-+
-+ifdef DEMOS
-+$(CLASSDESTDIR)/%.class: $(SOURCEPATH)/%.java
-+	@$(add-java-file)
-+#Redirect zh_HK java files to tmp directory which created from zh_TW
-+#$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
-+#	@$(add-java-file)
-+else
-+
-+#
-+# Rules for closed files
-+#
-+# If filenames are duplicated between open/closed workspaces, prefer
-+# the closed files.
-+#
-+# Rule ordering in this Makefile is important: some targets depend
-+# on closed files replacing open ones, and thus the closed file rules
-+# must be found before the open ones.
-+#
-+# Don't reorder without consulting teams that depend on this behavior.
-+#
-+ifndef OPENJDK
-+$(CLASSDESTDIR)/%.class: $(CLOSED_PLATFORM_SRC)/classes/%.java
-+	@$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(CLOSED_SHARE_SRC)/classes/%.java
-+	@$(add-java-file)
-+endif
-+
-+$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
-+	@$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
-+	@$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
-+	@$(add-java-file)
-+
-+#Redirect zh_HK java files to tmp directory which created from zh_TW
-+$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
-+	@$(add-java-file)
-+endif
-+
-+# List of class files needed
-+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Got to include exported files.
-+FILES_class += $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Construct list of java sources we need to compile
-+source_list_prime:
-+	@$(MKDIR) -p $(TEMPDIR)
-+# Note that we slip resources in so that compiled properties files get created:
-+$(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class)
-+	@$(TOUCH) $@
-+
-+.delete.classlist:
-+	@$(RM) $(JAVA_SOURCE_LIST)
-+
-+# Make sure all newer sources are compiled (in a batch)
-+classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
-+
-+.compile.classlist : $(JAVA_SOURCE_LIST)
-+	@$(MKDIR) -p $(CLASSDESTDIR)
-+	@$(RM) $<.filtered
-+	@$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered
-+	@if [ `$(CAT) $<.filtered | $(WC) -l` -ge 1 ] ; then \
-+	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
-+	  $(CAT) $<.filtered; \
-+	  $(ECHO) "# Running javac:"; \
-+	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+	fi
-+	@$(java-vm-cleanup)
-+
-+clobber clean::
-+	$(RM) $(JAVA_SOURCE_LIST)
-+
-+ifndef DONT_CLOBBER_CLASSES
-+  ifndef PACKAGE
-+    DONT_CLOBBER_CLASSES = true
-+  else
-+    DONT_CLOBBER_CLASSES = false
-+  endif
-+endif
-+
-+packages.clean:
-+ifeq ($(DONT_CLOBBER_CLASSES),false)
-+  ifdef AUTO_FILES_JAVA_DIRS
-+	@for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+	  $(ECHO) "$(RM) -r $(CLASSDESTDIR)/$$sdir"; \
-+	  $(RM) -r $(CLASSDESTDIR)/$$sdir; \
-+        done
-+  else
-+	$(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
-+  endif
-+endif
-+
-+ifdef DEMOS
-+classes.clean:
-+	$(RM) -r $(DEMODST) $(CLASSDESTDIR)
-+else
-+classes.clean: packages.clean
-+	$(RM) $(JAVA_SOURCE_LIST)
-+endif
-+
-+#
-+# C and C++ make dependencies
-+#
-+include $(JDK_TOPDIR)/make/common/internal/NativeCompileRules.gmk
-+
-+#
-+# Running Javah to generate stuff into CClassHeaders.
-+#
-+
-+ifdef FILES_export
-+
-+CLASSES.export  = $(subst /,.,$(FILES_export:%.java=%))
-+CLASSES.export += $(subst /,.,$(FILES_export2:%.java=%))
-+CLASSES.export += $(subst /,.,$(FILES_export3:%.java=%))
-+CLASSES_export  = $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-+CLASSES_export += $(FILES_export2:%.java=$(CLASSDESTDIR)/%.class)
-+CLASSES_export += $(FILES_export3:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Fix when deploy workspace makefiles don't depend on this name
-+#CLASSHDR_DOTFILE=$(CLASSHDRDIR)/.classheaders
-+
-+CLASSHDR_DOTFILE=$(OBJDIR)/.class.headers.$(ARCH)
-+
-+classheaders: classes $(CLASSHDR_DOTFILE)
-+
-+$(CLASSHDR_DOTFILE): $(CLASSES_export)
-+	$(prep-target)
-+	@$(ECHO) "# Running javah:"
-+	$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
-+		$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
-+	@$(java-vm-cleanup)
-+	-mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
-+	  $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
-+	@$(TOUCH) $@
-+
-+classheaders.clean:
-+	$(RM) $(CLASSHDR_DOTFILE)
-+	$(RM) -r $(CLASSHDRDIR)
-+
-+else # FILES_export
-+
-+classheaders: classes
-+
-+classheaders.clean: 
-+
-+endif # FILES_export
-+
-+clean clobber:: classheaders.clean classes.clean .delete.classlist
-+
-+# 
-+# Default dependencies
-+#
-+
-+all: build
-+
-+build: classheaders
-+
-+default: all
-+
-+.PHONY: all build clean clobber \
-+        .delete.classlist classes .compile.classlist classes.clean \
-+	 classheaders classheaders.clean \
-+	 batch_compile
-+
-diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2008-05-26 01:35:42.000000000 +0100
-@@ -118,30 +118,19 @@
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
- 
- # Langtools
- ifdef LANGTOOLS_DIST
--  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
--  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
-   JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-   DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
--  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAC_JAR)" \
--		-jar $(JAVAC_JAR) $(JAVACFLAGS)
--  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
--		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
-   JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- 		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
- 		-jar $(JAVADOC_JAR)
--else
--  # If no explicit tools, use boot tools (add VM flags in this case)
-   JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- 		  $(JAVACFLAGS)
-   JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
- endif
- 
- # Override of what javac to use (see deploy workspace)
-diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial -Werror
- include $(BUILDDIR)/common/Defs.gmk
- 
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
---- openjdk-ecj.orig/jdk/make/java/text/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -80,8 +80,8 @@
- 		-sourcepath $(TEXT_SRCDIR) \
- 		$(TEXT_SOURCES)
- 	$(MKDIR) -p  $(TEXT_CLASSDIR)
--	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
--		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+	$(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
-+		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- 		-o $(TEXT_CLASSDIR) \
- 		-spec $(UNICODEDATA)/UnicodeData.txt
- 	@$(java-vm-cleanup)
-diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -400,10 +400,9 @@
- COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
- 
- $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
--    $(COMPILEFONTCONFIG_JARFILE)
--	$(prep-target)
--	$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
--	$(CHMOD) 444 $(@)
-+	$(COMPILEFONTCONFIG_JARFILE)
-+	$(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
-+	$(CHMOD) 444 $(LIBDIR)/*.bfc
- 	@$(java-vm-cleanup)
- 
- fontconfigs.clean :
-diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -62,7 +62,8 @@
- $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
- 	$(RM) -r $(@D)
- 	$(prep-target)
--	$(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
-+	$(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
-+		build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
- 	@$(java-vm-cleanup)
- 
- $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
---- openjdk-ecj.orig/jdk/make/sun/text/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile	2008-05-26 01:35:35.000000000 +0100
-@@ -85,8 +85,9 @@
- 	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- 		-sourcepath $(TEXT_SRCDIR) \
- 		$(BIRULES) $(BIINFO)
--	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
--		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+	$(BOOT_JAVA_CMD)  \
-+		-cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
-+		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- 		-o $(CLASSDESTDIR)/sun/text/resources \
- 		-spec $(UNICODEDATA)/UnicodeData.txt \
- 		-language th
-diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2008-05-26 01:39:25.000000000 +0100
-@@ -276,11 +276,7 @@
- 
- TEMPDIR_CLASSES = $(TEMPDIR)/classes
- 
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
--	@$(prep-target)
--	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
--
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-+$(TEMPDIR)/.gen_icons: $(ICONS)
- 	$(prep-target)
- 	for i in $(ICONS); do \
-             filename=`basename $$i`; \
-@@ -290,20 +286,14 @@
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- 	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ;  \
- 	    $(ECHO) "}; }" >> $$classname;  \
-             classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
- 	    $(RM) $$classname; \
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- 	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ; \
- 	    $(ECHO) "}; }" >> $$classname;  \
- 	done
- 	$(TOUCH) $@
-diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile~ openjdk-ecj/jdk/make/sun/xawt/Makefile~
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile~	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile~	2008-05-26 01:39:20.000000000 +0100
-@@ -0,0 +1,304 @@
-+#
-+# Copyright 2002-2008 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.
-+#
-+
-+BUILDDIR = ../..
-+PACKAGE = sun.awt.X11
-+LIBRARY = mawt
-+LIBRARY_OUTPUT = xawt
-+LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/xawt
-+PRODUCT = sun
-+
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+GEN_DIR=$(GENSRCDIR)/sun/awt/X11
-+
-+CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers
-+
-+.PHONY: generated.clean
-+
-+#
-+# Files
-+#
-+include FILES_c_unix.gmk
-+include FILES_export_unix.gmk
-+AUTO_FILES_JAVA_DIRS = sun/awt/X11
-+AUTO_JAVA_PRUNE = WrapperGenerator.java
-+
-+LDFLAGS += -L$(OPENWIN_LIB)
-+
-+ifeq ($(PLATFORM), linux)
-+LDFLAGS += -lpthread
-+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-+endif
-+
-+# Since this library will be living in a subdirectory below the other libraries
-+#   we need to add an extra runpath so that libraries in the upper directory
-+#   are found at runtime.
-+LD_RUNPATH_EXTRAS = ..
-+
-+#
-+# Rules.
-+#
-+include $(BUILDDIR)/common/Mapfile-vers.gmk
-+include $(BUILDDIR)/common/Library.gmk
-+
-+#
-+# Add to the ambient vpath to pick up files in subdirectories
-+#
-+vpath %.c   $(SHARE_SRC)/native/sunawt/alphacomposite
-+vpath %.c   $(PLATFORM_SRC)/native/sun/xawt
-+vpath %.c   $(PLATFORM_SRC)/native/sun/awt
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/debug
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/image
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/image/gif
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/image/cvutils
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/shell
-+vpath %.c   $(SHARE_SRC)/native/sun/java2d
-+vpath %.c   $(SHARE_SRC)/native/sun/java2d/loops
-+vpath %.c   $(SHARE_SRC)/native/sun/java2d/pipe
-+vpath %.c   $(SHARE_SRC)/native/sun/awt/medialib
-+vpath %.cpp $(SHARE_SRC)/native/sun/image
-+vpath %.c   $(SHARE_SRC)/native/sun/font
-+vpath %.c   $(PLATFORM_SRC)/native/sun/awt/robot_child
-+vpath %.c   $(SHARE_SRC)/native/sun/java2d/opengl
-+vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/opengl
-+vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/x11
-+
-+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \
-+                   $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
-+
-+ifeq  ($(PLATFORM), solaris)
-+CPPFLAGS += -DFUNCPROTO=15
-+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-+endif
-+
-+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-+
-+CPPFLAGS += -DXAWT -DXAWT_HACK \
-+        -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
-+        -I$(PLATFORM_SRC)/native/sun/awt \
-+	-I$(PLATFORM_SRC)/native/sun/xawt \
-+        -I$(PLATFORM_SRC)/native/sun/jdga \
-+        -I$(SHARE_SRC)/native/sun/awt/debug \
-+        -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
-+        -I$(SHARE_SRC)/native/sun/java2d \
-+	-I$(SHARE_SRC)/native/sun/java2d/loops \
-+	-I$(SHARE_SRC)/native/sun/awt/image/cvutils \
-+	-I$(SHARE_SRC)/native/sun/awt/image \
-+	-I$(SHARE_SRC)/native/sun/font \
-+	-I$(PLATFORM_SRC)/native/sun/java2d \
-+	-I$(SHARE_SRC)/native/sun/java2d/pipe \
-+	-I$(SHARE_SRC)/native/sun/java2d/opengl \
-+	-I$(PLATFORM_SRC)/native/sun/java2d/opengl \
-+	-I$(PLATFORM_SRC)/native/sun/java2d/x11 \
-+	-I$(SHARE_SRC)/native/sun/dc/path \
-+	-I$(SHARE_SRC)/native/sun/dc/doe \
-+	-I$(SHARE_SRC)/native/sun/awt/alphacomposite \
-+        -I$(SHARE_SRC)/native/sun/awt/medialib \
-+	-I$(PLATFORM_SRC)/native/sun/awt/medialib \
-+        -I$(PLATFORM_SRC)/native/sun/font \
-+        -I$(SHARE_SRC)/native/sun/awt \
-+        -I$(PLATFORM_SRC)/native/sun/awt 
-+
-+ifeq ($(PLATFORM), linux)
-+# Allows for builds on Debian GNU Linux, X11 is in a different place 
-+  CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
-+              -I/usr/include/X11/extensions \
-+              -I$(OPENWIN_HOME)/include 
-+endif
-+
-+ifeq ($(PLATFORM), solaris)
-+  CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
-+endif
-+
-+ifeq ($(MILESTONE), internal)
-+  CPPFLAGS += -DINTERNAL_BUILD
-+endif
-+
-+#
-+# Generation of wrappers
-+#
-+SIZER_DIR=$(GEN_DIR)/generator
-+SIZER = $(SIZER_DIR)/sizer
-+SIZER_32_C = $(SIZER).32.c
-+SIZER_64_C = $(SIZER).64.c
-+CFLAGS_32=$(CFLAGS)
-+CFLAGS_64=$(CFLAGS)
-+
-+ifeq ($(PLATFORM), solaris)
-+
-+isalist:=$(shell $(ISAINFO))
-+
-+ifneq (,$(findstring sparcv9, $(isalist)))
-+# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-+# On sparcv9 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-+CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-+SIZERS = $(SIZER).32 $(SIZER).64
-+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-+CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-+else
-+ifneq (,$(findstring amd64, $(isalist)))
-+# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-+# On amd64 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-+CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-+SIZERS = $(SIZER).32 $(SIZER).64
-+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-+CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-+else # !sparcv9 : includes (32-bit) sparc, i586
-+SIZERS = $(SIZER).32
-+SIZERS_C = $(SIZER_32_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+endif # amd64
-+endif # sparcv9
-+
-+else # !solaris
-+
-+ifeq ($(ARCH_DATA_MODEL), 32)
-+SIZERS = $(SIZER).32
-+SIZERS_C = $(SIZER_32_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+else # !32
-+SIZERS = $(SIZER).64
-+SIZERS_C = $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
-+endif # 32
-+
-+endif # solaris
-+
-+# XXX Hack for 6185483 - use hard-coded sizes.
-+# Add the 64-bit platforms that need to be included into 32-bit build
-+# and have sizes.64-$(PLATFORM)-$(LIBARCH) hardcoded in the workspace
-+ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
-+# If you define DOHACK=true for some combination of $(PLATFORM)-$(LIBARCH),
-+# make sure you have sizes.64-$(PLATFORM)-$(LIBARCH) pre-generated in
-+# $(PLATFORM_SRC)/classes/sun/awt/X11/generator/
-+DOHACK=true
-+endif # Hack
-+
-+ifeq ($(DOHACK), true)
-+PREDEFINED_SIZES_TMPL=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH)
-+PREDEFINED_SIZES=$(WRAPPER_GENERATOR_DIR)/sizes.64
-+SIZES += $(WRAPPER_GENERATOR_DIR)/sizes.64
-+endif
-+
-+ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-+DOCOMPARE=true
-+endif
-+# 64 bit sizers are generated on platform-libarch (left) for use 
-+# on platform-libarch (right) and stored under the latter name.
-+# Do compare manually stored and automatically generated pair(s) 
-+# if DOCOMPARE=true, just after the generation.
-+STORED_SIZES_TMPL_solaris_amd64=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-solaris-i386
-+
-+WRAPPER_GENERATOR_JAVA=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/WrapperGenerator.java
-+WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator
-+WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
-+WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
-+XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
-+
-+$(SIZERS): $(SIZERS_C) 
-+	$(prep-target)
-+	$(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
-+
-+$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
-+	$(prep-target)
-+	$(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA)
-+
-+$(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
-+	$(prep-target)
-+	$(MKDIR) -p $(WRAPPER_GENERATOR_TEMPDIR)
-+	$(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
-+	    $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
-+
-+$(SIZES): $(SIZERS)
-+	@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
-+	    $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
-+	    $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
-+	    $(CHMOD) +w $@;\
-+	else	\
-+	    $(ECHO) GENERATING $@; \
-+	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
-+	fi
-+	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
-+	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
-+	    $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
-+	fi
-+
-+$(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
-+	$(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
-+	    $(GEN_DIR) $(XLIBTYPES) "gen" $(WRAPPER_GENERATOR_DIR)/sizes
-+
-+touch.wrappers: $(TEMPDIR)/.gen.wrappers
-+	$(MKDIR) -p $(TEMPDIR)
-+	$(TOUCH) $(TEMPDIR)/.gen.wrappers
-+
-+generated.clean:
-+	$(RM) -r $(WRAPPER_GENERATOR_TEMPDIR)
-+	$(RM) -r $(WRAPPER_GENERATOR_DIR)
-+	$(RM) -r $(GEN_DIR)/*.java
-+	$(RM) -r $(TEMPDIR)/.gen_icons
-+
-+ifdef OPENJDK
-+    ICONS_PATH_PREFIX=$(PLATFORM_SRC)
-+else
-+    ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris
-+endif
-+
-+ICONS = \
-+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
-+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
-+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
-+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
-+
-+TEMPDIR_CLASSES = $(TEMPDIR)/classes
-+
-+$(TEMPDIR)/.gen_icons: $(ICONS)
-+	$(prep-target)
-+	for i in $(ICONS); do \
-+            filename=`basename $$i`; \
-+	    name=`$(ECHO) $$filename | $(TR) '\-.' '__'`;  \
-+            classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \
-+	    $(RM) $$classname; \
-+	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-+	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
-+	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
-+	    $(ECHO) "0,0" >> $$classname ;  \
-+	    $(ECHO) "}; }" >> $$classname;  \
-+            classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-+	    $(RM) $$classname; \
-+	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-+	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
-+	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
-+ 	    $(ECHO) "0,0" >> $$classname ; \
-+	    $(ECHO) "}; }" >> $$classname;  \
-+	done
-+	$(TOUCH) $@
-+
-+clean clobber:: generated.clean
-+
-+.PHONY: generated.clean robot_child
-+
-diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2008-05-26 01:35:35.000000000 +0100
-@@ -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 " +
--            new java.util.Date() + commentEnd);
-         int marklen = commandMarker.length();
-         LOOP: while(true) {
-             try {
-@@ -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  ");
--        result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n  ");
- 
-                 if (plane == 0 && bLatin1 == false) {
-             genCaseMapTableDeclaration(result);
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java	2008-05-26 01:35:42.000000000 +0100
-@@ -76,7 +76,7 @@
-      * {@code 0x1.fffffffffffffP+1023} and also equal to
-      * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
-      */
--    public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
-+    public static final double MAX_VALUE = 1.7976931348623157e+308;
- 
-     /**
-      * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
-      *
-      * @since 1.6
-      */
--    public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
-+    public static final double MIN_NORMAL = 2.2250738585072014E-308;
- 
-     /**
-      * A constant holding the smallest positive nonzero value of type
-@@ -95,7 +95,7 @@
-      * {@code 0x0.0000000000001P-1022} and also equal to
-      * {@code Double.longBitsToDouble(0x1L)}.
-      */
--    public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
-+    public static final double MIN_VALUE = 4.9e-324;
- 
-     /**
-      * Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java	2008-05-26 01:35:42.000000000 +0100
-@@ -76,7 +76,7 @@
-      * {@code 0x1.fffffeP+127f} and also equal to
-      * {@code Float.intBitsToFloat(0x7f7fffff)}.
-      */
--    public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
-+    public static final float MAX_VALUE = 3.4028235e+38f;
- 
-     /**
-      * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
-      *
-      * @since 1.6
-      */
--    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+    public static final float MIN_NORMAL = 1.17549435E-38f;
- 
-     /**
-      * A constant holding the smallest positive nonzero value of type
-@@ -94,7 +94,7 @@
-      * hexadecimal floating-point literal {@code 0x0.000002P-126f}
-      * and also equal to {@code Float.intBitsToFloat(0x1)}.
-      */
--    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-+    public static final float MIN_VALUE = 1.4e-45f;
- 
-     /**
-      * Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/langtools/make/Makefile	2008-01-16 10:23:52.000000000 -0500
-+++ openjdk-ecj/langtools/make/Makefile	2008-01-16 10:42:51.000000000 -0500
-@@ -113,7 +113,7 @@
- 
- ifdef ALT_BOOTDIR
-   ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
--  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
- 
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
---- openjdk-ecj.orig/langtools/make/build.properties	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.properties	2008-05-26 01:35:35.000000000 +0100
-@@ -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 -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml	2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml	2008-05-26 01:35:42.000000000 +0100
-@@ -497,7 +497,10 @@
-                        includes="@{includes}"
-                        sourcepath=""
-                        includeAntRuntime="no"
--                       target="@{javac.target}">
-+                       target="@{javac.target}"
-+		       executable="${javac.executable}"
-+                       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 +514,10 @@
-                        includeAntRuntime="no"
-                        target="@{javac.target}"
-                        debug="${javac.debug}" 
--                       debuglevel="${javac.debuglevel}">
-+		       executable="${javac.executable}"
-+                       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}"/>
-@@ -562,8 +568,11 @@
-     <target name="-def-pcompile">
-         <mkdir dir="${build.toolclasses.dir}"/>
-         <javac srcdir="${make.tools.dir}/CompileProperties"
-+	       fork="true"
-                destdir="${build.toolclasses.dir}/"
--               classpath="${ant.home}/lib/ant.jar"/>
-+               classpath="${ant.home}/lib/ant.jar"
-+	       executable="${javac.executable}"
-+               source="1.5"/>
-         <taskdef name="pcompile"
-                  classname="CompilePropertiesTask" 
-                  classpath="${build.toolclasses.dir}/"/>
-diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk	2008-05-26 01:43:34.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk	2008-05-26 01:35:42.000000000 +0100
-@@ -63,7 +63,7 @@
- endif
- 
- ifndef DEV_ONLY
--  JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
-+  JDK_BUILD_TARGETS = sanity all images
- else
-   JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
- endif
- 
- ifdef ALT_OUTPUTDIR
---- openjdk6/hotspot/build/linux/makefiles/sa.make	2008-02-12 04:14:13.000000000 -0500
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make	2008-02-15 09:23:58.000000000 -0500
-@@ -72,7 +72,7 @@
- 	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
- 	  mkdir -p $(SA_CLASSDIR);        \
- 	fi
--	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
- 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- 	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
---- openoldjdk/jdk/make/sun/xawt/Makefile	2008-02-12 04:04:04.000000000 -0500
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2008-02-15 09:48:16.000000000 -0500
-@@ -278,11 +278,7 @@
- 
- TEMPDIR_CLASSES = $(TEMPDIR)/classes
- 
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
--	@$(prep-target)
--	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
--
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-+$(TEMPDIR)/.gen_icons: $(ICONS)
- 	$(prep-target)
- 	for i in $(ICONS); do \
-             filename=`basename $$i`; \
-@@ -292,22 +288,14 @@
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- 	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Dawt.toolkit=sun.awt.motif.MToolkit \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ;  \
- 	    $(ECHO) "}; }" >> $$classname;  \
--            classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-+	    classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
- 	    $(RM) $$classname; \
- 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- 	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- 	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
--	    $(CAT) $$i | \
--	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
--		-Dawt.toolkit=sun.awt.motif.MToolkit \
--		-Djava.awt.headless=true \
--		sun.awt.X11.ToBin >> $$classname; \
-+	    $(ECHO) "0,0" >> $$classname ; \
- 	    $(ECHO) "}; }" >> $$classname;  \
- 	done
- 	$(TOUCH) $@
---- oldopenjdk/corba/make/common/shared/Defs-java.gmk	2008-02-12 04:15:10.000000000 -0500
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-02-15 11:01:50.000000000 -0500
-@@ -117,31 +117,13 @@
- JAVACFLAGS  += $(OTHER_JAVACFLAGS)
- 
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
- 
--# Langtools
--ifdef LANGTOOLS_DIST
--  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
--  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
--  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
--  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
--  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAC_JAR)" \
--		-jar $(JAVAC_JAR) $(JAVACFLAGS)
--  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
--		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
--  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
--		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
--		-jar $(JAVADOC_JAR)
--else
--  # If no explicit tools, use boot tools (add VM flags in this case)
--  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- 		  $(JAVACFLAGS)
--  JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
- 		  $(JAVAHFLAGS)
--  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
- 
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
---- oldopenjdk/corba/make/common/Defs-linux.gmk	2008-02-15 11:02:45.000000000 -0500
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2008-02-15 11:05:09.000000000 -0500
-@@ -261,7 +261,7 @@
- 		    fi; \
- 		  done)
- JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
--JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
- 
- #
- # We want to privatize JVM symbols on Solaris. This is so the user can
---- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	2008-06-09 03:12:48.000000000 +0100
-+++ /dev/null	2008-05-17 00:35:13.224001676 +0100
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,222 +0,0 @@
 -#
 -# Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
@@ -1800,3 +278,774 @@ diff -Nru openjdk-ecj.orig/make/jdk-rule
 -# Include
 -#
 -include $(BUILDDIR)/common/Rules.gmk
+diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -53,6 +53,13 @@
+ 
+ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
+ 
++
++ifdef ALT_LANGTOOLS_DIST
++  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
++else
++  LANGTOOLS_DIST =
++endif 
++
+ #
+ # Get platform definitions
+ #
+@@ -129,8 +136,6 @@
+ # for build tool jar files
+ BUILDTOOLJARDIR     = $(OUTPUTDIR)/btjars
+ ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
+-# for generated java source files
+-GENSRCDIR           = $(OUTPUTDIR)/gensrc
+ # for generated C source files (not javah)
+ GENNATIVESRCDIR     = $(OUTPUTDIR)/gennativesrc
+ # for imported source files
+@@ -231,7 +236,7 @@
+ # We define an intermediate variable for Java files because
+ # we use its value later to help define $SOURCEPATH
+ 
+-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
+ VPATH.java = $(VPATH0.java)
+ vpath %.java $(VPATH.java)
+ vpath %.class $(CLASSBINDIR)
+diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -262,7 +262,7 @@
+ 		    fi; \
+ 		  done)
+ JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+-JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
++JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
+ 
+ #
+ # We want to privatize JVM symbols on Solaris. This is so the user can
+diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -197,8 +197,10 @@
+ 	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
+ 	  $(CAT) $(JAVA_SOURCE_LIST); \
+ 	  $(ECHO) "# Running javac:"; \
+-	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+-	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ 	fi
+ 	@$(java-vm-cleanup)
+ 
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -117,31 +117,13 @@
+ JAVACFLAGS  += $(OTHER_JAVACFLAGS)
+ 
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+ 
+-# Langtools
+-ifdef LANGTOOLS_DIST
+-  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+-  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+-  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+-  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+-  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
+-		"-Xbootclasspath/p:$(JAVAC_JAR)" \
+-		-jar $(JAVAC_JAR) $(JAVACFLAGS)
+-  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
+-		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
+-		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
+-  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+-		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+-		-jar $(JAVADOC_JAR)
+-else
+-  # If no explicit tools, use boot tools (add VM flags in this case)
+-  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
++# If no explicit tools, use boot tools (add VM flags in this case)
++JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ 		  $(JAVACFLAGS)
+-  JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
++JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
+ 		  $(JAVAHFLAGS)
+-  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+-endif
+ 
+ # Override of what javac to use (see deploy workspace)
+ ifdef JAVAC
+diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -93,8 +93,6 @@
+ POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
+ 
+ $(POAGENERATEDFILES):: $(POA.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
+-	$(RM) -r $(POAHELHOLFILES)
+ 
+ poa.compile: $(POAGENERATEDFILES)
+ 
+@@ -110,10 +108,6 @@
+ 
+ # Generating and deleting unused files to reduce images size
+ $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
+-	$(RM) $(DYNANY_DIR)/*POA*
+-	$(RM) $(DYNANY_DIR)/*Holder*
+-	$(RM) $(DYNANYDELETEFILES)
+ 
+ dynany.compile: $(DYNANYFILES)
+ 
+@@ -125,12 +119,6 @@
+ TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
+ 
+ $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
+-#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-#	$(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+ 
+ tr.compile: $(TRGENERATEDFILES)
+ 
+@@ -144,7 +132,6 @@
+ # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
+ # to GENSRC directory. Note that these two classes are deprecated.
+ $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
+ 
+ ns.compile: $(NSGENERATEDFILES)
+ 
+@@ -156,8 +143,6 @@
+ IOPDELETEFILES =    $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
+ 
+ $(IOPGENERATEDFILES):: $(IOP.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
+-	$(RM) -r $(IOPDELETEFILES)
+ 
+ iop.compile: $(IOPGENERATEDFILES)
+ 
+@@ -169,8 +154,6 @@
+ CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
+ 
+ $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
+-	$(RM) $(CORBAXDUPLICATEFILES)
+ 
+ corbax.compile: $(CORBAXGENERATEDFILES)
+ 
+@@ -181,7 +164,6 @@
+ MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
+ 
+ $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
+ 
+ messaging.compile: $(MESSAGINGGENERATEDFILES)
+ 
+@@ -195,8 +177,6 @@
+ PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
+ 
+ $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
+-	$(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
+-	$(RM) $(PIHELHOLFILES)
+ 
+ pi.compile: $(PIGENERATEDFILES)
+ 
+diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -172,7 +172,6 @@
+ ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
+ 
+ $(ACTIVATIONFILES): $(ACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
+ 
+ activation.idl.compile: $(ACTIVATIONFILES)
+ 
+@@ -195,7 +194,6 @@
+ 
+ # REVISIT: remove -oldImplBase
+ $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
+-	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
+ 
+ portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
+ 
+diff -Nru openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm
+--- openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm	2008-06-22 19:05:57.000000000 +0100
+@@ -332,7 +332,6 @@
+ 	    (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
+ 	(.println pw "//")
+ 	(.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
+-	(.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
+ 	(.println pw)))
+ 
+ (define (write-factory-method class-name exception-group-name pw)
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
+--- openjdk-ecj.orig/hotspot/build/linux/Makefile	2008-05-27 22:28:29.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -249,28 +249,24 @@
+ 
+ $(TARGETS_C2):  $(SUBDIRS_C2)
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_C1):  $(SUBDIRS_C1)
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_CORE):  $(SUBDIRS_CORE)
+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make	2008-06-22 19:05:57.000000000 +0100
+@@ -72,7 +72,7 @@
+ 	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ 	  mkdir -p $(SA_CLASSDIR);        \
+ 	fi
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+ 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ 	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
+diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
+--- openjdk-ecj.orig/jaxp/make/build.xml	2008-05-27 22:28:40.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml	2008-06-22 19:05:57.000000000 +0100
+@@ -71,7 +71,10 @@
+       <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"
++		fork="true"
++		executable="${javac.executable}"
++		source="1.5"/>
+       <taskdef name="pstrip"
+ 		 classname="StripPropertiesTask"
+ 		 classpath="${build.toolclasses.dir}/"/>
+@@ -85,7 +88,9 @@
+              destdir="${build.classes.dir}"
+              memoryInitialSize="${javac.memoryInitialSize}"
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+-             target="${javac.target}">
++             target="${javac.target}"
++             executable="${javac.executable}"
++             source="1.5">
+          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+          <compilerarg line="${javac.version.opt}"/>
+       </javac>
+diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
+--- openjdk-ecj.orig/jaxp/make/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -80,7 +80,7 @@
+ endif
+ 
+ ifdef ALT_BOOTDIR
+-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+ 
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
+--- openjdk-ecj.orig/jaxws/make/build.properties	2008-05-27 22:28:50.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties	2008-06-22 19:05:57.000000000 +0100
+@@ -37,7 +37,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
+ 
+ # JVM memory size
+ javac.memoryInitialSize = 128m
+diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
+--- openjdk-ecj.orig/jaxws/make/build.xml	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml	2008-06-22 19:05:57.000000000 +0100
+@@ -84,7 +84,10 @@
+       <mkdir dir="${build.toolclasses.dir}"/>
+       <javac srcdir="${make.tools.dir}/StripProperties"
+ 		destdir="${build.toolclasses.dir}/"
+-		classpath="${ant.home}/lib/ant.jar"/>
++		fork="true"
++                executable="${javac.executable}"
++		classpath="${ant.home}/lib/ant.jar"
++		source="1.5"/>
+       <taskdef name="pstrip"
+ 		 classname="StripPropertiesTask"
+ 		 classpath="${build.toolclasses.dir}/"/>
+@@ -96,12 +99,14 @@
+       <javac fork="true"
+              srcdir="${src.classes.dir}"
+              destdir="${build.classes.dir}"
++             executable="${javac.executable}"
+              memoryInitialSize="${javac.memoryInitialSize}"
+              memoryMaximumSize="${javac.memoryMaximumSize}"
+              target="${javac.target}"
+-             excludes="com/sun/tools/internal/txw2/**">
+-	 <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
+-         <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
++             excludes="com/sun/tools/internal/txw2/**"
++	     source="1.5">
++         <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++	 <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+          <compilerarg line="${javac.version.opt}"/>
+          <compilerarg line="${javac.no.jdk.warnings}"/>
+       </javac>
+diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
+--- openjdk-ecj.orig/jaxws/make/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -80,8 +80,8 @@
+ endif
+ 
+ ifdef ALT_BOOTDIR
+-  ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
+-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
++  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+ 
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk	2008-05-27 22:30:13.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -43,7 +43,8 @@
+ 	@$(prep-target)
+ 	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
+ 	$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
+-	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
++	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
++	    $(BUILDTOOL_MAIN_SOURCE_FILE)
+ 	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
+ 	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
+ 	    $(JAR_JFLAGS) || $(RM) $@
+diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -649,10 +649,11 @@
+ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
+ 	$(prep-target)
+ 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
+ 	@$(java-vm-cleanup)
+ 
+ # Create jsse.jar containing SunJSSE implementation classes
+@@ -708,10 +709,11 @@
+ $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
+ 	$(prep-target)
+ 	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ 	$(prep-target)
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
+ 	@$(java-vm-cleanup)
+ 
+ # Meta-index construction to make core class loaders lazier
+@@ -949,19 +951,6 @@
+ 	@$(java-vm-cleanup)
+ 	$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
+ 	@#
+-	@# lib/ct.sym
+-	@#
+-	$(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
+-	$(JAVAC_CMD) -XDprocess.packages -proc:only \
+-	    -processor com.sun.tools.javac.sym.CreateSymbols \
+-	    -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
+-	    -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
+-	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
+-	$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
+-	    -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
+-	@$(java-vm-cleanup)
+-	$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
+-	@#
+ 	@# CORBA supported orb.idl and ir.idl should be copied to lib
+ 	@#
+ 	$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
+@@ -1038,16 +1027,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
+-	@#
+-	@# demo, include
+-	@#
+-	$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
+-	$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
+-	$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
+-	@#
+-	@# Swing BeanInfo generation
+-	@#
+-	$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
+ ifneq ($(PLATFORM), windows)
+ 	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
+ endif # !windows
+diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk	2008-06-22 19:07:43.000000000 +0100
+@@ -237,8 +237,9 @@
+ 	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
+ 	  $(CAT) $<.filtered; \
+ 	  $(ECHO) "# Running javac:"; \
+-	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+-	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
++	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
++          -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++          $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ 	fi
+ 	@$(java-vm-cleanup)
+ 
+@@ -304,6 +305,8 @@
+ 	$(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
+ 		$(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
+ 	@$(java-vm-cleanup)
++	-mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
++	  $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
+ 	@$(TOUCH) $@
+ 
+ classheaders.clean:
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -118,30 +118,19 @@
+ JAVACFLAGS  += $(OTHER_JAVACFLAGS)
+ 
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+ 
+ # Langtools
+ ifdef LANGTOOLS_DIST
+-  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+-  JAVAH_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+   JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+   DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+-  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
+-		"-Xbootclasspath/p:$(JAVAC_JAR)" \
+-		-jar $(JAVAC_JAR) $(JAVACFLAGS)
+-  JAVAH_CMD   = $(BOOT_JAVA_CMD) \
+-		"-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)"  \
+-		-jar $(JAVAH_JAR) $(JAVAHFLAGS)
+   JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+ 		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+ 		-jar $(JAVADOC_JAR)
+-else
+-  # If no explicit tools, use boot tools (add VM flags in this case)
+   JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ 		  $(JAVACFLAGS)
+   JAVAH_CMD     = $(JAVA_TOOLS_DIR)/javah \
+ 		  $(JAVAHFLAGS)
+-  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+ endif
+ 
+ # Override of what javac to use (see deploy workspace)
+diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -31,7 +31,7 @@
+ PACKAGE = java.nio
+ LIBRARY = nio
+ PRODUCT = java
+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
++OTHER_JAVACFLAGS += -Xlint:serial -Werror
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ NIO_SRC = $(SHARE_SRC)/classes/java/nio
+diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -80,8 +80,8 @@
+ 		-sourcepath $(TEXT_SRCDIR) \
+ 		$(TEXT_SOURCES)
+ 	$(MKDIR) -p  $(TEXT_CLASSDIR)
+-	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
+-		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
++	$(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
++		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
+ 		-o $(TEXT_CLASSDIR) \
+ 		-spec $(UNICODEDATA)/UnicodeData.txt
+ 	@$(java-vm-cleanup)
+diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
+--- openjdk-ecj.orig/jdk/make/Makefile	2008-05-27 22:30:13.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -239,7 +239,7 @@
+ 
+ all build:: sanity-all post-sanity-all
+ 
+-SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
++SUBDIRS    = tools java javax org sun sunw com jpda mksample launchers
+ all build::
+ 	$(SUBDIRS-loop)
+ 
+diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -400,10 +400,9 @@
+ COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
+ 
+ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
+-    $(COMPILEFONTCONFIG_JARFILE)
+-	$(prep-target)
+-	$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
+-	$(CHMOD) 444 $(@)
++	$(COMPILEFONTCONFIG_JARFILE)
++	$(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
++	$(CHMOD) 444 $(LIBDIR)/*.bfc
+ 	@$(java-vm-cleanup)
+ 
+ fontconfigs.clean :
+diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -62,7 +62,8 @@
+ $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
+ 	$(RM) -r $(@D)
+ 	$(prep-target)
+-	$(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
++	$(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
++		build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
+ 	@$(java-vm-cleanup)
+ 
+ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
+diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -85,8 +85,9 @@
+ 	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
+ 		-sourcepath $(TEXT_SRCDIR) \
+ 		$(BIRULES) $(BIINFO)
+-	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
+-		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
++	$(BOOT_JAVA_CMD)  \
++		-cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
++		build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
+ 		-o $(CLASSDESTDIR)/sun/text/resources \
+ 		-spec $(UNICODEDATA)/UnicodeData.txt \
+ 		-language th
+diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -276,11 +276,7 @@
+ 
+ TEMPDIR_CLASSES = $(TEMPDIR)/classes
+ 
+-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
+-	@$(prep-target)
+-	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
+-
+-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
++$(TEMPDIR)/.gen_icons: $(ICONS)
+ 	$(prep-target)
+ 	for i in $(ICONS); do \
+             filename=`basename $$i`; \
+@@ -290,20 +286,14 @@
+ 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
+ 	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
+ 	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
+-	    $(CAT) $$i | \
+-	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
+-		-Djava.awt.headless=true \
+-		sun.awt.X11.ToBin >> $$classname; \
++	    $(ECHO) "0,0" >> $$classname ;  \
+ 	    $(ECHO) "}; }" >> $$classname;  \
+             classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
+ 	    $(RM) $$classname; \
+ 	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
+ 	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
+ 	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
+-	    $(CAT) $$i | \
+-	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
+-		-Djava.awt.headless=true \
+-		sun.awt.X11.ToBin >> $$classname; \
++	    $(ECHO) "0,0" >> $$classname ; \
+ 	    $(ECHO) "}; }" >> $$classname;  \
+ 	done
+ 	$(TOUCH) $@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2008-06-22 19:05:57.000000000 +0100
+@@ -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 " +
+-            new java.util.Date() + commentEnd);
+         int marklen = commandMarker.length();
+         LOOP: while(true) {
+             try {
+@@ -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  ");
+-        result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n  ");
+ 
+                 if (plane == 0 && bLatin1 == false) {
+             genCaseMapTableDeclaration(result);
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java	2008-05-27 22:30:18.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java	2008-06-22 19:05:57.000000000 +0100
+@@ -76,7 +76,7 @@
+      * {@code 0x1.fffffffffffffP+1023} and also equal to
+      * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
+      */
+-    public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
++    public static final double MAX_VALUE = 1.7976931348623157e+308;
+ 
+     /**
+      * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+      *
+      * @since 1.6
+      */
+-    public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
++    public static final double MIN_NORMAL = 2.2250738585072014E-308;
+ 
+     /**
+      * A constant holding the smallest positive nonzero value of type
+@@ -95,7 +95,7 @@
+      * {@code 0x0.0000000000001P-1022} and also equal to
+      * {@code Double.longBitsToDouble(0x1L)}.
+      */
+-    public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
++    public static final double MIN_VALUE = 4.9e-324;
+ 
+     /**
+      * Maximum exponent a finite {@code double} variable may have.
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java	2008-05-27 22:30:18.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java	2008-06-22 19:05:57.000000000 +0100
+@@ -76,7 +76,7 @@
+      * {@code 0x1.fffffeP+127f} and also equal to
+      * {@code Float.intBitsToFloat(0x7f7fffff)}.
+      */
+-    public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
++    public static final float MAX_VALUE = 3.4028235e+38f;
+ 
+     /**
+      * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+      *
+      * @since 1.6
+      */
+-    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
++    public static final float MIN_NORMAL = 1.17549435E-38f;
+ 
+     /**
+      * A constant holding the smallest positive nonzero value of type
+@@ -94,7 +94,7 @@
+      * hexadecimal floating-point literal {@code 0x0.000002P-126f}
+      * and also equal to {@code Float.intBitsToFloat(0x1)}.
+      */
+-    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
++    public static final float MIN_VALUE = 1.4e-45f;
+ 
+     /**
+      * Maximum exponent a finite {@code float} variable may have.  It
+diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
+--- openjdk-ecj.orig/langtools/make/build.properties	2008-05-27 22:30:39.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties	2008-06-22 19:05:57.000000000 +0100
+@@ -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 -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
+--- openjdk-ecj.orig/langtools/make/build.xml	2008-05-27 22:30:39.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml	2008-06-22 19:05:57.000000000 +0100
+@@ -497,7 +497,10 @@
+                        includes="@{includes}"
+                        sourcepath=""
+                        includeAntRuntime="no"
+-                       target="@{javac.target}">
++                       target="@{javac.target}"
++		       executable="${javac.executable}"
++                       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 +514,10 @@
+                        includeAntRuntime="no"
+                        target="@{javac.target}"
+                        debug="${javac.debug}" 
+-                       debuglevel="${javac.debuglevel}">
++		       executable="${javac.executable}"
++                       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}"/>
+@@ -562,8 +568,11 @@
+     <target name="-def-pcompile">
+         <mkdir dir="${build.toolclasses.dir}"/>
+         <javac srcdir="${make.tools.dir}/CompileProperties"
++	       fork="true"
+                destdir="${build.toolclasses.dir}/"
+-               classpath="${ant.home}/lib/ant.jar"/>
++               classpath="${ant.home}/lib/ant.jar"
++	       executable="${javac.executable}"
++               source="1.5"/>
+         <taskdef name="pcompile"
+                  classname="CompilePropertiesTask" 
+                  classpath="${build.toolclasses.dir}/"/>
+diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
+--- openjdk-ecj.orig/langtools/make/Makefile	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile	2008-06-22 19:05:57.000000000 +0100
+@@ -113,7 +113,7 @@
+ 
+ ifdef ALT_BOOTDIR
+   ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
+-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++  ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+ 
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
+--- openjdk-ecj.orig/make/jdk-rules.gmk	2008-05-27 22:27:57.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk	2008-06-22 19:05:57.000000000 +0100
+@@ -63,7 +63,7 @@
+ endif
+ 
+ ifndef DEV_ONLY
+-  JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
++  JDK_BUILD_TARGETS = sanity all images
+ else
+   JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
+ endif
diff -r 6a9207d80a39 patches/icedtea-sparc64-linux.patch
--- a/patches/icedtea-sparc64-linux.patch	Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-sparc64-linux.patch	Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,35 @@ diff -up openjdk/hotspot/build/linux/mak
-diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
---- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD	2008-05-29 15:48:44.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-05-29 15:48:39.000000000 -0400
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2008-06-22 03:12:48.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-06-22 03:27:20.000000000 +0100
+@@ -58,8 +58,8 @@
+   HS_ARCH         = ia64
+ endif
+ 
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+@@ -73,6 +73,14 @@
+   HS_ARCH            = sparc
+ endif
+ 
++# sparc
++ifeq ($(ARCH), sparc)
++  ARCH_DATA_MODEL  = 32
++  PLATFORM         = linux-sparc
++  VM_PLATFORM      = linux_sparc
++  HS_ARCH          = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64) 
+   ifeq ($(ARCH_DATA_MODEL), 64)
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/sparcv9.make openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk.orig/hotspot/build/linux/makefiles/sparcv9.make	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make	2008-06-22 03:27:20.000000000 +0100
 @@ -0,0 +1,27 @@
 +#
 +# Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -29,24 +58,15 @@ diff -up openjdk/hotspot/build/linux/mak
 +# TLS helper, assembled from .s file
 +# Not included in includeDB because it has no dependencies
 +Obj_Files += linux_sparc.o
-diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
---- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD	2008-05-29 16:25:10.000000000 -0400
-+++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-29 16:32:11.000000000 -0400
-@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
- 
- void LIRGenerator::increment_counter(address counter, int step) {
-   LIR_Opr pointer = new_register(T_INT);
--  __ move(LIR_OprFact::intConst((int)counter), pointer);
-+  __ move(LIR_OprFact::intConst((int)*counter), pointer);
-   LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
-   increment_counter(addr, step);
- }
-@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	2008-06-22 03:31:17.000000000 +0100
+@@ -1112,20 +1112,12 @@
  
  void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
                                          CodeEmitInfo* info) {
 -#ifdef _LP64
--  __ store_mem_reg(value, address, info);
+-  __ store(value, address, info);
 -#else
    __ volatile_store_mem_reg(value, address, info);
 -#endif
@@ -55,39 +75,10 @@ diff -up openjdk/hotspot/src/cpu/sparc/v
  void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
                                         CodeEmitInfo* info) {
 -#ifdef _LP64
--  __ load_mem_reg(address, result, info);
+-  __ load(address, result, info);
 -#else
    __ volatile_load_mem_reg(address, result, info);
 -#endif
  }
  
  
-diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk/hotspot/build/linux/makefiles/defs.make.BAD	2008-05-30 07:03:37.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-05-30 07:03:45.000000000 -0400
-@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
-   HS_ARCH         = ia64
- endif
- 
--# sparc
--ifneq (,$(filter $(ARCH), sparc sparc64))
-+# sparc64
-+ifeq ($(ARCH), sparc64)
-   ifeq ($(ARCH_DATA_MODEL), 64)
-     ARCH_DATA_MODEL  = 64
-     MAKE_ARGS        += LP64=1
-@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
-   HS_ARCH            = sparc
- endif
- 
-+# sparc
-+ifeq ($(ARCH), sparc)
-+  ARCH_DATA_MODEL  = 32
-+  PLATFORM         = linux-sparc
-+  VM_PLATFORM      = linux_sparc
-+  HS_ARCH          = sparc
-+endif
-+
- # x86_64
- ifeq ($(ARCH), x86_64) 
-   ifeq ($(ARCH_DATA_MODEL), 64)

From gnu_andrew at member.fsf.org  Sun Jun 22 15:34:44 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 22 Jun 2008 23:34:44 +0100
Subject: JDK 7 build 29 is available at the openjdk.java.net website
In-Reply-To: <485C2DAF.5010801@sun.com>
References: <485C2DAF.5010801@sun.com>
Message-ID: <17c6771e0806221534i10b2f455nae7d6cd8eaf52c25@mail.gmail.com>

On 20/06/2008, Xiomara Jayasena <Xiomara.Jayasena at sun.com> wrote:
>
>
>  The OpenJDK source is available at:
>  http://hg.openjdk.java.net/jdk7/jdk7
>  http://hg.openjdk.java.net/jdk7/jdk7/rev/31e08f70e88d
>
>  The OpenJDK source binary plugs for the promoted JDK 7 build 29 are
> available under the openjdk http://openjdk.java.net website under Source
> Code (direct link to bundles:
> http://download.java.net/openjdk/jdk7)
>
>  Summary of changes:
>  http://download.java.net/jdk7/changes/jdk7-b29.html
>
>  -Xiomara
>
>
>

While moving IcedTea to b29, I noticed a couple of bugs that don't
seem to be listed as applied against either b27, b28 or b29 (IcedTea
was previously on b26), but have been applied:

6614100 EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
6695553: Cleanup GPLv2+SPL legal notices in hat sources

The second of the two doesn't even appear to be visible.  I obtained
the bug number from Joe Darcy's announcement of OpenJDK6 b10.

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Sun Jun 22 16:22:11 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Sun, 22 Jun 2008 23:22:11 +0000
Subject: changeset in /hg/icedtea: Upgrade to OpenJDK b29.
Message-ID: <hg.2346ce8ee96a.1214176931.-6899778133799504387@icedtea.classpath.org>

changeset 2346ce8ee96a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2346ce8ee96a
description:
	Upgrade to OpenJDK b29.

diffstat:

30 files changed, 129 insertions(+), 16266 deletions(-)
ChangeLog                                                                |   40 
Makefile.am                                                              |   21 
Makefile.in                                                              |   29 
generated/com/sun/corba/se/impl/logging/ActivationSystemException.java   |    3 
generated/com/sun/corba/se/impl/logging/IORSystemException.java          |    3 
generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java |    3 
generated/com/sun/corba/se/impl/logging/NamingSystemException.java       |    3 
generated/com/sun/corba/se/impl/logging/OMGSystemException.java          |    3 
generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java      |    3 
generated/com/sun/corba/se/impl/logging/POASystemException.java          |    3 
generated/com/sun/corba/se/impl/logging/UtilSystemException.java         |    3 
patches/icedtea-color-profiles.patch                                     |   29 
patches/icedtea-core-build.patch                                         |    6 
patches/icedtea-debuginfo.patch                                          |    6 
patches/icedtea-dnd-updatecursor.patch                                   |   10 
patches/icedtea-ecj.patch                                                |   12 
patches/icedtea-eclipse-hotspot-6614100-6b06.patch                       |   56 
patches/icedtea-eclipse-hotspot-6614100-7b24.patch                       |   77 
patches/icedtea-gcc-4.3.patch                                            |    8 
patches/icedtea-gcc-suffix.patch                                         |    4 
patches/icedtea-gtkplaf.patch                                            |   23 
patches/icedtea-headers.patch                                            |    6 
patches/icedtea-sparc.patch                                              |   14 
patches/icedtea-sparc64-linux.patch                                      |   52 
patches/icedtea-static-libstdc++.patch                                   |    6 
patches/icedtea-text-relocations.patch                                   |    4 
patches/icedtea-xinerama.patch                                           |   84 
patches/icedtea-xslfix.patch                                             |   19 
patches/icedtea-zero-build.patch                                         |   36 
patches/openjdk-color.patch                                              |15829 ----------

diffs (truncated from 16806 to 500 lines):

diff -r 837aa402fd1c -r 2346ce8ee96a ChangeLog
--- a/ChangeLog	Sun Jun 22 20:31:08 2008 +0100
+++ b/ChangeLog	Mon Jun 23 00:21:54 2008 +0100
@@ -1,3 +1,43 @@ 2008-06-22  Andrew John Hughes  <gnu_and
+2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* patches/icedtea-color-profiles.patch,
+	* patches/icedtea-dnd-updatecursor.patch,
+	* patches/icedtea-eclipse-hotspot-6614100-6b06.patch,
+	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch,
+	* patches/icedtea-gtkplaf.patch,
+	* patches/icedtea-xinerama.patch,
+	* patches/icedtea-xslfix.patch,
+	* patches/openjdk-color.patch:
+	Removed as present in OpenJDK b29.
+	* Makefile.am:
+	Move to b29 and change hotspot/build to hotspot/make.
+	* Makefile.in:
+	Regenerated.
+	* generated/com/sun/corbse/impl/logging/ActivationSystemException.java,
+	* generated/com/sun/corbse/impl/logging/IORSystemException.java,
+	* generated/com/sun/corbse/impl/logging/InterceptorsSystemException.java,
+	* generated/com/sun/corbse/impl/logging/NamingSystemException.java,
+	* generated/com/sun/corbse/impl/logging/OMGSystemException.java,
+	* generated/com/sun/corbse/impl/logging/ORBUtilSystemException.java,
+	* generated/com/sun/corbse/impl/logging/POASystemException.java,
+	* generated/com/sun/corbse/impl/logging/UtilSystemException.java:
+	New versions generated by the JScheme replacement (different headers).
+	* patches/icedtea-core-build.patch,
+	* patches/icedtea-debuginfo.patch,
+	* patches/icedtea-ecj.patch,
+	* patches/icedtea-gcc-4.3.patch,
+	* patches/icedtea-gcc-suffix.patch,
+	* patches/icedtea-headers.patch:
+	Change hotspot/build to hotspot/make.
+	* patches/icedtea-sparc.patch:
+	Removed as present in b29.
+	* patches/icedtea-sparc64-linux.patch:
+	Reapplied against b29.
+	* patches/icedtea-static-libstdc++.patch,
+	* patches/icedtea-text-relocations.patch,
+	* patches/icedtea-zero-build.patch:
+	Change hotspot/build to hotspot/make.
+
 2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/icedtea-component.patch:
diff -r 837aa402fd1c -r 2346ce8ee96a Makefile.am
--- a/Makefile.am	Sun Jun 22 20:31:08 2008 +0100
+++ b/Makefile.am	Mon Jun 23 00:21:54 2008 +0100
@@ -1,4 +1,4 @@ OPENJDK_VERSION = b26
-OPENJDK_VERSION = b26
+OPENJDK_VERSION = b29
 
 JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 
@@ -253,12 +253,12 @@ clean-clone:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/clone.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sf $$target $$link; \
 	done
-	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/make/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
@@ -278,8 +278,7 @@ endif
 
 # Patches from the other OpenJDK trees (should be removed
 # when in an official bxx release)
-OPENJDK_PATCHES = \
-	patches/openjdk-color.patch
+OPENJDK_PATCHES = 
 
 # If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -317,7 +316,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/icedtea-float-double-trailing-zeros.patch \
-	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
@@ -333,29 +331,22 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch \
-	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(ZERO_PATCHES_COND) \
-	patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) \
-	patches/icedtea-xslfix.patch \
 	patches/icedtea-override.patch
 
 if WITH_CACAO
@@ -450,12 +441,12 @@ clean-clone-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
 	  ln -sf $$target $$link; \
 	done
-	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/make/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
diff -r 837aa402fd1c -r 2346ce8ee96a Makefile.in
--- a/Makefile.in	Sun Jun 22 20:31:08 2008 +0100
+++ b/Makefile.in	Mon Jun 23 00:21:54 2008 +0100
@@ -251,7 +251,7 @@ target_alias = @target_alias@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b26
+OPENJDK_VERSION = b29
 JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
 @NETX_PLUGIN_FALSE at NETX_PATCH = 
 @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -373,9 +373,7 @@ OPENJDK_URL = http://hg.openjdk.java.net
 
 # Patches from the other OpenJDK trees (should be removed
 # when in an official bxx release)
-OPENJDK_PATCHES = \
-	patches/openjdk-color.patch
-
+OPENJDK_PATCHES = 
 
 # If ZERO_BUILD is set then we are building zero and need
 # to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
@@ -404,7 +402,6 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/icedtea-float-double-trailing-zeros.patch \
-	patches/icedtea-gtkplaf.patch \
 	patches/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch patches/icedtea-libraries.patch \
 	patches/icedtea-javafiles.patch patches/icedtea-corba.patch \
@@ -417,24 +414,20 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
+	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
-	$(ZERO_PATCHES_COND) \
-	patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
-	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
-	patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
-	patches/icedtea-override.patch $(am__append_7)
+	$(ZERO_PATCHES_COND) patches/icedtea-no-bcopy.patch \
+	patches/icedtea-jscheme.patch $(GCC_PATCH) \
+	$(DISTRIBUTION_PATCHES) patches/icedtea-override.patch \
+	$(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -854,12 +847,12 @@ clean-clone:
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/clone.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  ln -sf $$target $$link; \
 	done
-	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/make/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
@@ -957,12 +950,12 @@ clean-clone-ecj:
 
 # Link ports sources into tree
 stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
+	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
 	  ln -sf $$target $$link; \
 	done
-	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
+	ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/make/linux
 	if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
 	  mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
 	  ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/ActivationSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/ActivationSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group ACTIVATION
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc on Sun Jun 22 23:48:17 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/IORSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/IORSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/IORSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group IOR
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc on Sun Jun 22 23:48:17 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group INTERCEPTORS
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc on Sun Jun 22 23:48:17 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/NamingSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/NamingSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/NamingSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group NAMING
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc on Sun Jun 22 23:48:18 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/OMGSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/OMGSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/OMGSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for standard exceptions
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc on Sun Jun 22 23:48:18 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group ORBUTIL
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc on Sun Jun 22 23:48:18 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/POASystemException.java
--- a/generated/com/sun/corba/se/impl/logging/POASystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/POASystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group POA
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc on Sun Jun 22 23:48:19 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a generated/com/sun/corba/se/impl/logging/UtilSystemException.java
--- a/generated/com/sun/corba/se/impl/logging/UtilSystemException.java	Sun Jun 22 20:31:08 2008 +0100
+++ b/generated/com/sun/corba/se/impl/logging/UtilSystemException.java	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,7 @@
 // Log wrapper class for Sun private system exceptions in group UTIL
 //
-// Generated by mc.scm version 1.3, DO NOT EDIT BY HAND!
+// Generated by MC.java version 1.0, DO NOT EDIT BY HAND!
+// Generated from input file ../../../../src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc on Sun Jun 22 23:48:19 BST 2008
 
 package com.sun.corba.se.impl.logging ;
 
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf
Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-color-profiles.patch
--- a/patches/icedtea-color-profiles.patch	Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Changeset: 804b0757d801
-# Author:    prr
-# Date:      2008-04-24 11:58 -0700
-# URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801
-# 
-# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles
-# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix.
-# Reviewed-by: jgodinez, avu, prr
-# Contributed-by: aph at redhat.com
-#
-# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/
-
---- openjdk/jdk/make/sun/cmm/Makefile.orig	2008-04-27 23:59:37.000000000 +0200
-+++ openjdk/jdk/make/sun/cmm/Makefile	2008-04-27 23:59:45.000000000 +0200
-@@ -41,12 +41,8 @@
- ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
- 
- iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
--	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
--
--ifndef OPENJDK
--iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
--	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
--endif
-+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
- 
- $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-core-build.patch	Mon Jun 23 00:21:54 2008 +0100
@@ -15,9 +15,9 @@ diff -Nru openjdk.orig/corba/make/common
  JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
  JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
  
-diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk.orig/hotspot/build/linux/makefiles/defs.make	2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-06-22 03:10:05.000000000 +0100
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make	2008-06-22 03:10:05.000000000 +0100
 @@ -97,6 +97,7 @@
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-debuginfo.patch
--- a/patches/icedtea-debuginfo.patch	Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-debuginfo.patch	Mon Jun 23 00:21:54 2008 +0100
@@ -1,6 +1,6 @@ diff -urN openjdk.orig/hotspot/build/lin
-diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 18:11:59.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 18:12:22.000000000 -0400
+diff -urN openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2007-10-12 18:11:59.000000000 -0400
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2007-10-12 18:12:22.000000000 -0400
 @@ -63,6 +63,10 @@
  CFLAGS += -D_REENTRANT
  CFLAGS += -fcheck-new
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-dnd-updatecursor.patch
--- a/patches/icedtea-dnd-updatecursor.patch	Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java.orig	2008-06-16 12:11:39.000000000 -0700
-+++ openjdk/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java	2008-06-16 12:18:39.000000000 -0700
-@@ -466,7 +466,6 @@
- 
-         Cursor c = null;
- 
--        targetAct = DnDConstants.ACTION_NONE;
-         switch (status) {
-             case ENTER:
-             case OVER:
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Sun Jun 22 20:31:08 2008 +0100
+++ b/patches/icedtea-ecj.patch	Mon Jun 23 00:21:54 2008 +0100
@@ -489,9 +489,9 @@ diff -Nru openjdk-ecj.orig/corba/src/sha
  	(.println pw)))
  
  (define (write-factory-method class-name exception-group-name pw)
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
---- openjdk-ecj.orig/hotspot/build/linux/Makefile	2008-05-27 22:28:29.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/Makefile	2008-06-22 19:05:57.000000000 +0100
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile	2008-05-27 22:28:29.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile	2008-06-22 19:05:57.000000000 +0100
 @@ -249,28 +249,24 @@
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
@@ -521,9 +521,9 @@ diff -Nru openjdk-ecj.orig/hotspot/build
  ifdef INSTALL
  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
  endif
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make	2008-06-22 18:36:24.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make	2008-06-22 19:05:57.000000000 +0100
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make	2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make	2008-06-22 19:05:57.000000000 +0100
 @@ -72,7 +72,7 @@
  	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
  	  mkdir -p $(SA_CLASSDIR);        \
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-eclipse-hotspot-6614100-6b06.patch
--- a/patches/icedtea-eclipse-hotspot-6614100-6b06.patch	Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1212727493 25200
-# Node ID 65fe2bd8883932456557957163bf5c4e4af79469
-# Parent d4dbd9f91680840f6c719b0d23942b4d4eb00837
-6614100: EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
-Reviewed-by: kvn, jrose, rasbold
-
---- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig	2008-06-08 15:15:19.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-06-08 15:16:06.000000000 +0200
-@@ -1551,45 +1551,6 @@
-     if (opt != NULL)  return opt;
-   }
- 
--  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
--    // Try to undo Phi of AddP:
--    //   (Phi (AddP base base y) (AddP base2 base2 y))
--    // becomes:
--    //   newbase := (Phi base base2)
--    //   (AddP newbase newbase y)
--    //
--    // This occurs as a result of unsuccessful split_thru_phi and
--    // interferes with taking advantage of addressing modes.  See the
--    // clone_shift_expressions code in matcher.cpp
--    Node* addp = in(1);
--    const Type* type = addp->in(AddPNode::Base)->bottom_type();
--    Node* y = addp->in(AddPNode::Offset);
--    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
--      // make sure that all the inputs are similar to the first one,
--      // i.e. AddP with base == address and same offset as first AddP
--      bool doit = true;
--      for (uint i = 2; i < req(); i++) {
--        if (in(i) == NULL ||
--            in(i)->Opcode() != Op_AddP ||
--            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
--            in(i)->in(AddPNode::Offset) != y) {
--          doit = false;
--          break;
--        }
--        // Accumulate type for resulting Phi
--        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
--      }
--      if (doit) {
--        Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
--        for (uint i = 1; i < req(); i++) {
--          base->init_req(i, in(i)->in(AddPNode::Base));
--        }
--        phase->is_IterGVN()->register_new_node_with_optimizer(base);
--        return new (phase->C, 4) AddPNode(base, base, y);
--      }
--    }
--  }
--
-   // Split phis through memory merges, so that the memory merges will go away.
-   // Piggy-back this transformation on the search for a unique input....
-   // It will be as if the merged memory is the unique value of the phi.
diff -r 837aa402fd1c -r 2346ce8ee96a patches/icedtea-eclipse-hotspot-6614100-7b24.patch
--- a/patches/icedtea-eclipse-hotspot-6614100-7b24.patch	Sun Jun 22 20:31:08 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1212727493 25200


From gnu_andrew at member.fsf.org  Sun Jun 22 16:28:24 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Jun 2008 00:28:24 +0100
Subject: FYI: Update IcedTea to use OpenJDK b29
Message-ID: <20080622232824.GA20521@rivendell.middle-earth.co.uk>

Resending with attachment compressed...

----- Forwarded message from Andrew John Hughes <gnu_andrew at member.fsf.org> -----

Date: Mon, 23 Jun 2008 00:23:45 +0100
From: Andrew John Hughes <gnu_andrew at member.fsf.org>
To: distro-pkg-dev at openjdk.java.net
Subject: FYI: Update IcedTea to use OpenJDK b29
User-Agent: Mutt/1.5.16 (2007-06-09)

This patch moves IcedTea to the latest OpenJDK release, b29.
The main changes are the removal of a number of patches which
have now been applied upstream, and the change from hotspot/build
to hotspot/make.

ChangeLog:

2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* patches/icedtea-color-profiles.patch,
	* patches/icedtea-dnd-updatecursor.patch,
	* patches/icedtea-eclipse-hotspot-6614100-6b06.patch,
	* patches/icedtea-eclipse-hotspot-6614100-7b24.patch,
	* patches/icedtea-gtkplaf.patch,
	* patches/icedtea-xinerama.patch,
	* patches/icedtea-xslfix.patch,
	* patches/openjdk-color.patch:
	Removed as present in OpenJDK b29.
	* Makefile.am:
	Move to b29 and change hotspot/build to hotspot/make.
	* Makefile.in:
	Regenerated.
	* generated/com/sun/corbse/impl/logging/ActivationSystemException.java,
	* generated/com/sun/corbse/impl/logging/IORSystemException.java,
	* generated/com/sun/corbse/impl/logging/InterceptorsSystemException.java,
	* generated/com/sun/corbse/impl/logging/NamingSystemException.java,
	* generated/com/sun/corbse/impl/logging/OMGSystemException.java,
	* generated/com/sun/corbse/impl/logging/ORBUtilSystemException.java,
	* generated/com/sun/corbse/impl/logging/POASystemException.java,
	* generated/com/sun/corbse/impl/logging/UtilSystemException.java:
	New versions generated by the JScheme replacement (different headers).
	* patches/icedtea-core-build.patch,
	* patches/icedtea-debuginfo.patch,
	* patches/icedtea-ecj.patch,
	* patches/icedtea-gcc-4.3.patch,
	* patches/icedtea-gcc-suffix.patch,
	* patches/icedtea-headers.patch:
	Change hotspot/build to hotspot/make.
	* patches/icedtea-sparc.patch:
	Removed as present in b29.
	* patches/icedtea-sparc64-linux.patch:
	Reapplied against b29.
	* patches/icedtea-static-libstdc++.patch,
	* patches/icedtea-text-relocations.patch,
	* patches/icedtea-zero-build.patch:
	Change hotspot/build to hotspot/make.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
A non-text attachment was scrubbed...
Name: b29-update.diff.bz2
Type: application/octet-stream
Size: 74885 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080623/96ba1777/b29-update.diff.bz2 

From bugzilla-daemon at icedtea.classpath.org  Sun Jun 22 17:48:58 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Jun 2008 00:48:58 +0000
Subject: [Bug 137] icedtea6 build fails on Debian unstable (sid) with "missing
	return value"
Message-ID: <E1KAaEs-0004K1-H8@icedtea.classpath.org>

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





------- Comment #4 from gnu_andrew at member.fsf.org  2008-06-23 00:48 -------
You don't include enough relevant information here, notably you don't include
the ant command that is invoked just before these errors.

Your build is successfully bootstrapping OpenJDK using your system gcj.  Where
it fails is in trying to then build using the just built JDK in
bootstrap/icedtea.  Does bootstrap/icedtea/bin/java run? How about
bootstrap/icedtea/bin/javac?


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


From mark at klomp.org  Mon Jun 23 02:29:09 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 23 Jun 2008 09:29:09 +0000
Subject: changeset in /hg/icedtea6: Add javax.script rhino (javascript) s...
Message-ID: <hg.997b7df73930.1214213349.2873452341184383832@icedtea.classpath.org>

changeset 997b7df73930 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=997b7df73930
description:
	Add javax.script rhino (javascript) support.

	2008-06-22  Mark Wielaard  <mark at klomp.org>

	       * patches/icedtea-rhino.patch: New patch.
	       * Makefile.am: Add RHINO_JAR to environment variable lists.
	       (ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
	       * Makefile.in: Regenerated.
	       * acinclude.m4 (FIND_RHINO_JAR): New.
	       * configure.ac: Use FIND_RHINO_JAR.
	       * configure: Regenerated.

diffstat:

7 files changed, 252 insertions(+), 9 deletions(-)
ChangeLog                   |   10 ++
Makefile.am                 |    7 +-
Makefile.in                 |   15 ++--
acinclude.m4                |   32 +++++++++
configure                   |   47 +++++++++++++
configure.ac                |    1 
patches/icedtea-rhino.patch |  149 +++++++++++++++++++++++++++++++++++++++++++

diffs (385 lines):

diff -r 4999cbdbc405 -r 997b7df73930 ChangeLog
--- a/ChangeLog	Fri Jun 20 11:08:28 2008 -0400
+++ b/ChangeLog	Mon Jun 23 11:28:37 2008 +0200
@@ -1,3 +1,13 @@ 2008-06-20  Gary Benson  <gbenson at redhat
+2008-06-22  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-rhino.patch: New patch.
+	* Makefile.am: Add RHINO_JAR to environment variable lists.
+	(ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
+	* Makefile.in: Regenerated.
+	* acinclude.m4 (FIND_RHINO_JAR): New.
+	* configure.ac: Use FIND_RHINO_JAR.
+	* configure: Regenerated.
+
 2008-06-20  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-zero-build.patch: Correctly set CPU.
diff -r 4999cbdbc405 -r 997b7df73930 Makefile.am
--- a/Makefile.am	Fri Jun 20 11:08:28 2008 -0400
+++ b/Makefile.am	Mon Jun 23 11:28:37 2008 +0200
@@ -107,7 +107,8 @@ ICEDTEA_ENV = \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
-	"JAVAC="
+	"JAVAC=" \
+	"RHINO_JAR=$(RHINO_JAR)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -172,7 +173,8 @@ ICEDTEA_ENV_ECJ = \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
-	"JAVAC="
+	"JAVAC=" \
+	"RHINO_JAR=$(RHINO_JAR)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -331,6 +333,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
 	patches/icedtea-component.patch \
+	patches/icedtea-rhino.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 4999cbdbc405 -r 997b7df73930 Makefile.in
--- a/Makefile.in	Fri Jun 20 11:08:28 2008 -0400
+++ b/Makefile.in	Mon Jun 23 11:28:37 2008 +0200
@@ -166,6 +166,7 @@ PATCH = @PATCH@
 PATCH = @PATCH@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+RHINO_JAR = @RHINO_JAR@
 RMIC = @RMIC@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -316,8 +317,9 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
-	$(am__append_2) $(am__append_3)
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" \
+	"RHINO_JAR=$(RHINO_JAR)" $(am__append_1) $(am__append_2) \
+	$(am__append_3)
 
 # OpenJDK ecj build environment.
 ICEDTEA_BUILD_DIR_ECJ = \
@@ -357,8 +359,9 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
 	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
 	"FT2_LIB=$(FREETYPE2_LIBS)" \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
-	$(am__append_5) $(am__append_6)
+	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" \
+	"RHINO_JAR=$(RHINO_JAR)" $(am__append_4) $(am__append_5) \
+	$(am__append_6)
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -433,8 +436,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-override-redirect-metacity.patch \
 	patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
 	patches/icedtea-dnd-updatecursor.patch \
-	patches/icedtea-component.patch $(GCC_PATCH) \
-	$(DISTRIBUTION_PATCHES) $(am__append_7)
+	patches/icedtea-component.patch patches/icedtea-rhino.patch \
+	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
diff -r 4999cbdbc405 -r 997b7df73930 acinclude.m4
--- a/acinclude.m4	Fri Jun 20 11:08:28 2008 -0400
+++ b/acinclude.m4	Mon Jun 23 11:28:37 2008 +0200
@@ -501,6 +501,38 @@ AC_DEFUN([FIND_XERCES2_JAR],
   AC_SUBST(XERCES2_JAR)
 ])
 
+AC_DEFUN([FIND_RHINO_JAR],
+[
+  AC_ARG_WITH([rhino-jar],
+              [AS_HELP_STRING(--with-rhino-jar,specify location of the rhino jar)],
+  [
+    if test -f "${withval}"; then
+      AC_MSG_CHECKING(rhino jar)
+      RHINO_JAR="${withval}"
+      AC_MSG_RESULT(${withval})
+    fi
+  ],
+  [
+    RHINO_JAR=
+  ])
+  if test -z "${RHINO_JAR}"; then
+    AC_MSG_CHECKING(for rhino jar)
+    if test -e "/usr/share/java/rhino.jar"; then
+      RHINO_JAR=/usr/share/java/rhino.jar
+      AC_MSG_RESULT(${RHINO_JAR})
+    elif test -e "/usr/share/java/js.jar"; then
+      RHINO_JAR=/usr/share/java/js.jar
+      AC_MSG_RESULT(${RHINO_JAR})
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test -z "${RHINO_JAR}"; then
+    AC_MSG_ERROR("A rhino jar was not found.")
+  fi
+  AC_SUBST(RHINO_JAR)
+])
+
 AC_DEFUN([ENABLE_OPTIMIZATIONS],
 [
   AC_MSG_CHECKING(whether to disable optimizations)
diff -r 4999cbdbc405 -r 997b7df73930 configure
--- a/configure	Fri Jun 20 11:08:28 2008 -0400
+++ b/configure	Mon Jun 23 11:28:37 2008 +0200
@@ -748,6 +748,7 @@ XALAN2_JAR
 XALAN2_JAR
 XALAN2_SERIALIZER_JAR
 XERCES2_JAR
+RHINO_JAR
 USE_ALT_OPENJDK_SRC_ZIP_TRUE
 USE_ALT_OPENJDK_SRC_ZIP_FALSE
 ALT_OPENJDK_SRC_ZIP
@@ -1456,6 +1457,7 @@ Optional Packages:
   --with-xalan2-serializer-jar
                           specify location of the xalan2-serializer jar
   --with-xerces2-jar      specify location of the xerces2 jar
+  --with-rhino-jar        specify location of the rhino jar
   --with-openjdk-src-zip  specify the location of the openjdk source zip
   --with-openjdk-src-dir  specify the location of the openjdk sources
   --with-cacao            use CACAO as VM
@@ -7865,6 +7867,48 @@ echo "${ECHO_T}no" >&6; }
   if test -z "${XERCES2_JAR}"; then
     { { echo "$as_me:$LINENO: error: \"A xerces2 jar was not found.\"" >&5
 echo "$as_me: error: \"A xerces2 jar was not found.\"" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+
+# Check whether --with-rhino-jar was given.
+if test "${with_rhino_jar+set}" = set; then
+  withval=$with_rhino_jar;
+    if test -f "${withval}"; then
+      { echo "$as_me:$LINENO: checking rhino jar" >&5
+echo $ECHO_N "checking rhino jar... $ECHO_C" >&6; }
+      RHINO_JAR="${withval}"
+      { echo "$as_me:$LINENO: result: ${withval}" >&5
+echo "${ECHO_T}${withval}" >&6; }
+    fi
+
+else
+
+    RHINO_JAR=
+
+fi
+
+  if test -z "${RHINO_JAR}"; then
+    { echo "$as_me:$LINENO: checking for rhino jar" >&5
+echo $ECHO_N "checking for rhino jar... $ECHO_C" >&6; }
+    if test -e "/usr/share/java/rhino.jar"; then
+      RHINO_JAR=/usr/share/java/rhino.jar
+      { echo "$as_me:$LINENO: result: ${RHINO_JAR}" >&5
+echo "${ECHO_T}${RHINO_JAR}" >&6; }
+    elif test -e "/usr/share/java/js.jar"; then
+      RHINO_JAR=/usr/share/java/js.jar
+      { echo "$as_me:$LINENO: result: ${RHINO_JAR}" >&5
+echo "${ECHO_T}${RHINO_JAR}" >&6; }
+    else
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    fi
+  fi
+  if test -z "${RHINO_JAR}"; then
+    { { echo "$as_me:$LINENO: error: \"A rhino jar was not found.\"" >&5
+echo "$as_me: error: \"A rhino jar was not found.\"" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -13001,6 +13045,7 @@ XALAN2_JAR!$XALAN2_JAR$ac_delim
 XALAN2_JAR!$XALAN2_JAR$ac_delim
 XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim
 XERCES2_JAR!$XERCES2_JAR$ac_delim
+RHINO_JAR!$RHINO_JAR$ac_delim
 USE_ALT_OPENJDK_SRC_ZIP_TRUE!$USE_ALT_OPENJDK_SRC_ZIP_TRUE$ac_delim
 USE_ALT_OPENJDK_SRC_ZIP_FALSE!$USE_ALT_OPENJDK_SRC_ZIP_FALSE$ac_delim
 ALT_OPENJDK_SRC_ZIP!$ALT_OPENJDK_SRC_ZIP$ac_delim
@@ -13057,7 +13102,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 4999cbdbc405 -r 997b7df73930 configure.ac
--- a/configure.ac	Fri Jun 20 11:08:28 2008 -0400
+++ b/configure.ac	Mon Jun 23 11:28:37 2008 +0200
@@ -197,6 +197,7 @@ else
   FIND_XALAN2_JAR
   FIND_XALAN2_SERIALIZER_JAR
   FIND_XERCES2_JAR
+  FIND_RHINO_JAR
   AC_CONFIG_FILES([javac], [chmod +x javac])
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
diff -r 4999cbdbc405 -r 997b7df73930 patches/icedtea-rhino.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-rhino.patch	Mon Jun 23 11:28:37 2008 +0200
@@ -0,0 +1,149 @@
+--- openjdk.orig/jdk/make/com/sun/Makefile	2008-06-22 18:53:03.000000000 +0200
++++ openjdk/jdk/make/com/sun/Makefile	2008-06-22 18:56:41.000000000 +0200
+@@ -31,15 +31,8 @@
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+-ifndef OPENJDK
+-  ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
+-  ifneq ("$(ORG_EXISTS)", "") 
+-    SCRIPT_SUBDIR = script
+-  endif
+-endif
+-
+ # Omit mirror since it's built with the apt tool.
+-SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
++SUBDIRS = script image security crypto/provider jndi jmx \
+     java inputmethods org xml rowset net/httpserver net/ssl demo \
+     tools jarsigner
+ 
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java	2008-06-22 19:02:39.000000000 +0200
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import com.sun.script.util.*;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.lang.reflect.Method;
+ import java.io.*;
+ import java.util.*;
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java	2008-06-22 19:02:49.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ 
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.util.*;
+ 
+ /**
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java	2008-06-22 19:03:00.000000000 +0200
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ 
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This class prevents script access to certain sensitive classes.
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java	2008-06-22 19:03:10.000000000 +0200
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import javax.script.*;
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import com.sun.script.util.*;
+ 
+ /**
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java	2008-06-22 19:03:25.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * Represents compiled JavaScript code.
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	2008-06-22 19:03:35.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ 
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import javax.script.*;
+ 
+ /**
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java	2008-06-22 19:03:48.000000000 +0200
+@@ -27,7 +27,7 @@
+ 
+ import java.lang.reflect.*;
+ import static sun.security.util.SecurityConstants.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This wrap factory is used for security reasons. JSR 223 script
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java	2008-06-22 19:05:17.000000000 +0200
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ 
+ import javax.script.Invocable;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This class implements Rhino-like JavaAdapter to help implement a Java
+--- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2008-06-22 18:52:46.000000000 +0200
++++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java	2008-06-22 19:05:31.000000000 +0200
+@@ -24,7 +24,7 @@
+  */
+ 
+ package com.sun.script.javascript;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import javax.script.*;
+ import java.util.*;
+ 
+--- openjdk.orig/jdk/make/com/sun/script/Makefile	2008-06-22 18:53:02.000000000 +0200
++++ openjdk/jdk/make/com/sun/script/Makefile	2008-06-22 21:12:35.000000000 +0200
+@@ -31,6 +31,8 @@
+ 
+ AUTO_FILES_JAVA_DIRS = com/sun/script
+ 
++OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
++
+ #
+ # Files that need to be copied
+ #
+--- openjdk.orig/jdk/make/common/Release.gmk	2008-06-22 18:53:02.000000000 +0200
++++ openjdk/jdk/make/common/Release.gmk	2008-06-23 00:14:02.000000000 +0200
+@@ -772,6 +772,7 @@
+ 	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
+ 	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
+ 	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
++	$(LN) -sf $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
+ 	@# Generate meta-index to make boot and extension class loaders lazier
+ 	$(CD) $(JRE_IMAGE_DIR)/lib && \
+ 	    $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
+--- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig	2008-06-23 00:17:03.000000000 +0200
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp	2008-06-22 22:34:33.000000000 +0200
+@@ -949,6 +949,7 @@
+ 	"%/lib/jsse.jar:"
+ 	"%/lib/jce.jar:"
+         "%/lib/charsets.jar:"
++        "%/lib/rhino.jar:"
+ 	"%/classes";
+     char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep);
+     if (sysclasspath == NULL) return false;


From mark at klomp.org  Mon Jun 23 02:29:39 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 23 Jun 2008 11:29:39 +0200
Subject: javax.script rhino (javascript) support added
Message-ID: <1214213379.32610.44.camel@dijkstra.wildebeest.org>

Hi,

This patch adds javax.script javascript support through rhino. CCed
build-dev since it is mainly build stuff and there doesn't seem to be
another list for scripting stuff (not that I am advocating yet another
list!)

The idea is pretty simple, if configure can detect rhino being installed
on the system already (either the rhino.jar from fedora or the js.jar
from debian) it uses that instead of the closed and unreleased sun
internal classes. The only wrinkle is that the javascript support is
written to expect the implementation on the bootclasspath, I would have
liked it to be possible to just add it to the extension dir. This is
solved by patching the hardcoded hotspot boostrap path and creating the
correct symlink in the jre lib dir.

Maybe the modules project and/or the extension/plugin ideas from icedtea
can help a bit in the future to rewrite these kind of things a little
cleaner: http://icedtea.classpath.org/wiki/PackagingExtensions

2008-06-22  Mark Wielaard  <mark at klomp.org>

        * patches/icedtea-rhino.patch: New patch.
        * Makefile.am: Add RHINO_JAR to environment variable lists.
        (ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
        * Makefile.in: Regenerated.
        * acinclude.m4 (FIND_RHINO_JAR): New.
        * configure.ac: Use FIND_RHINO_JAR.
        * configure: Regenerated.

Committed to icedtea6.

With this patch the jrunscript works perfectly, and the javax.script and
sun.tools.jscript jtreg tests all pass except for one. The
sun/tools/jrunscript/jrunscriptTest.sh test insists that 2 + 5 = 7.0,
while our current implementation says it is 7 (without the .0). The
tests references two bugs (6265810,6705893) which might help analyze
this, unfortunately they are closed to the public (is there anybody who
could see what these bugs were about?).

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rhino.patch
Type: text/x-patch
Size: 8747 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080623/86108978/rhino.patch 

From bugzilla-daemon at icedtea.classpath.org  Mon Jun 23 04:22:08 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Jun 2008 11:22:08 +0000
Subject: [Bug 85] no javascript plugin support.
Message-ID: <E1KAk7c-0005P1-L0@icedtea.classpath.org>

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





------- Comment #11 from mark at klomp.org  2008-06-23 11:22 -------
We still need liveconnect support, but rhino has been integrated for
javax.script javascript support now:
http://article.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/2478


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


From langel at redhat.com  Mon Jun 23 07:00:43 2008
From: langel at redhat.com (Lillian Angel)
Date: Mon, 23 Jun 2008 14:00:43 +0000
Subject: changeset in /hg/icedtea6: 2008-06-23  Lillian Angel  <langel@re...
Message-ID: <hg.dfa695befde7.1214229643.2873452341184383832@icedtea.classpath.org>

changeset dfa695befde7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dfa695befde7
description:
	2008-06-23  Lillian Angel  <langel at redhat.com>

	        * aclocal.m4: Regenerated.
	        * configure: Regenerated.

diffstat:

3 files changed, 300 insertions(+), 373 deletions(-)
ChangeLog  |    5 
aclocal.m4 |   22 --
configure  |  646 ++++++++++++++++++++++++++----------------------------------

diffs (truncated from 1252 to 500 lines):

diff -r 997b7df73930 -r dfa695befde7 ChangeLog
--- a/ChangeLog	Mon Jun 23 11:28:37 2008 +0200
+++ b/ChangeLog	Mon Jun 23 10:00:18 2008 -0400
@@ -1,3 +1,8 @@ 2008-06-22  Mark Wielaard  <mark at klomp.o
+2008-06-23  Lillian Angel  <langel at redhat.com>
+
+	* aclocal.m4: Regenerated.
+	* configure: Regenerated.
+
 2008-06-22  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-rhino.patch: New patch.
diff -r 997b7df73930 -r dfa695befde7 aclocal.m4
--- a/aclocal.m4	Mon Jun 23 11:28:37 2008 +0200
+++ b/aclocal.m4	Mon Jun 23 10:00:18 2008 -0400
@@ -87,16 +87,14 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -140,9 +138,9 @@ if test $pkg_failed = yes; then
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -r 997b7df73930 -r dfa695befde7 configure
--- a/configure	Mon Jun 23 11:28:37 2008 +0200
+++ b/configure	Mon Jun 23 10:00:18 2008 -0400
@@ -10277,11 +10277,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XPROTO" >&5
 echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_CFLAGS"; then
-        pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XPROTO_CFLAGS"; then
+    pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10291,15 +10290,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XPROTO_LIBS"; then
-        pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XPROTO_LIBS"; then
+    pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
   ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
   ac_status=$?
@@ -10309,9 +10306,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10324,9 +10320,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
         else
-	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+	        XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XPROTO_PKG_ERRORS" >&5
@@ -10359,11 +10355,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XT" >&5
 echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_CFLAGS"; then
-        pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XT_CFLAGS"; then
+    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10373,15 +10368,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XT_LIBS"; then
-        pkg_cv_XT_LIBS="$XT_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XT_LIBS"; then
+    pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
   ($PKG_CONFIG --exists --print-errors "xt") 2>&5
   ac_status=$?
@@ -10391,9 +10384,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10406,9 +10398,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
         else
-	        XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XT_PKG_ERRORS" >&5
@@ -10441,11 +10433,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XP" >&5
 echo $ECHO_N "checking for XP... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_CFLAGS"; then
-        pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XP_CFLAGS"; then
+    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10455,15 +10446,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XP_LIBS"; then
-        pkg_cv_XP_LIBS="$XP_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XP_LIBS"; then
+    pkg_cv_XP_LIBS="$XP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
   ($PKG_CONFIG --exists --print-errors "xp") 2>&5
   ac_status=$?
@@ -10473,9 +10462,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10488,9 +10476,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
         else
-	        XP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"`
+	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XP_PKG_ERRORS" >&5
@@ -10523,11 +10511,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for X11" >&5
 echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_CFLAGS"; then
-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$X11_CFLAGS"; then
+    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10537,15 +10524,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_LIBS"; then
-        pkg_cv_X11_LIBS="$X11_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$X11_LIBS"; then
+    pkg_cv_X11_LIBS="$X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -10555,9 +10540,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10570,9 +10554,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
@@ -10605,11 +10589,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XINERAMA" >&5
 echo $ECHO_N "checking for XINERAMA... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_CFLAGS"; then
-        pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XINERAMA_CFLAGS"; then
+    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10619,15 +10602,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XINERAMA_LIBS"; then
-        pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XINERAMA_LIBS"; then
+    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
   ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
   ac_status=$?
@@ -10637,9 +10618,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10652,9 +10632,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
         else
-	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xinerama"`
+	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XINERAMA_PKG_ERRORS" >&5
@@ -10688,11 +10668,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for LIBPNG" >&5
 echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_CFLAGS"; then
-        pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_CFLAGS"; then
+    pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10702,15 +10681,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$LIBPNG_LIBS"; then
-        pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBPNG_LIBS"; then
+    pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
@@ -10720,9 +10697,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10735,9 +10711,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng" 2>&1`
         else
-	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
+	        LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBPNG_PKG_ERRORS" >&5
@@ -10771,11 +10747,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for XTST" >&5
 echo $ECHO_N "checking for XTST... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_CFLAGS"; then
-        pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$XTST_CFLAGS"; then
+    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5
   ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
   ac_status=$?
@@ -10785,15 +10760,13 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XTST_LIBS"; then
-        pkg_cv_XTST_LIBS="$XTST_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+ else
+    pkg_failed=untried
+fi
+if test -n "$XTST_LIBS"; then
+    pkg_cv_XTST_LIBS="$XTST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5
   ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
   ac_status=$?
@@ -10803,9 +10776,8 @@ else
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -10818,9 +10790,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst"`
+	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
         else
-	        XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst"`
+	        XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XTST_PKG_ERRORS" >&5
@@ -10853,11 +10825,10 @@ pkg_failed=no
 { echo "$as_me:$LINENO: checking for FREETYPE2" >&5
 echo $ECHO_N "checking for FREETYPE2... $ECHO_C" >&6; }
 


From bugzilla-daemon at icedtea.classpath.org  Mon Jun 23 07:14:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Jun 2008 14:14:03 +0000
Subject: [Bug 160] files fontconfig.Fedora.* in 1.6.0-b09 are wrong
Message-ID: <E1KAmnz-0006WV-6v@icedtea.classpath.org>

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





------- Comment #2 from langel at redhat.com  2008-06-23 14:14 -------
Thanks for pointing this out. I will fix 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 gnu_andrew at member.fsf.org  Mon Jun 23 07:24:31 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 23 Jun 2008 14:24:31 +0000
Subject: changeset in /hg/icedtea: Add HACKING file listing patches, and ...
Message-ID: <hg.5fbe762d9c35.1214231071.-6899778133799504387@icedtea.classpath.org>

changeset 5fbe762d9c35 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5fbe762d9c35
description:
	Add HACKING file listing patches, and remove unneeded ones.

	2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* patches/icedtea-bytecodeInterpreterWithChecks.patch,
		* patches/icedtea-certbundle.patch,
		* patches/icedtea-freetype.patch,
		* patches/icedtea-hat-spl-gpl.patch,
		* patches/icedtea-hotspot-6b06-7b24.patch,
		* patches/icedtea-liveconnect.patch,
		* patches/icedtea-netx-applet-visbility.patch,
		* patches/icedtea-sparc.patch:
		Removed.
		* ChangeLog: Fix typo.
		* HACKING: New file to list patches.
		* patches/icedtea-core-build.patch: Removed
		erroneously included diff output file.

diffstat:

11 files changed, 130 insertions(+), 208655 deletions(-)
ChangeLog                                           |   17 
HACKING                                             |  113 
patches/icedtea-bytecodeInterpreterWithChecks.patch |   18 
patches/icedtea-certbundle.patch                    |  240 
patches/icedtea-core-build.patch                    |  258 
patches/icedtea-freetype.patch                      |   39 
patches/icedtea-hat-spl-gpl.patch                   | 2133 
patches/icedtea-hotspot-6b06-7b24.patch             |201186 -------------------
patches/icedtea-liveconnect.patch                   | 2894 
patches/icedtea-netx-applet-visbility.patch         |   79 
patches/icedtea-sparc.patch                         | 1808 

diffs (truncated from 208845 to 500 lines):

diff -r 2346ce8ee96a -r 5fbe762d9c35 ChangeLog
--- a/ChangeLog	Mon Jun 23 00:21:54 2008 +0100
+++ b/ChangeLog	Mon Jun 23 15:23:34 2008 +0100
@@ -1,3 +1,19 @@ 2008-06-22  Andrew John Hughes  <gnu_and
+2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* patches/icedtea-bytecodeInterpreterWithChecks.patch,
+	* patches/icedtea-certbundle.patch,
+	* patches/icedtea-freetype.patch,
+	* patches/icedtea-hat-spl-gpl.patch,
+	* patches/icedtea-hotspot-6b06-7b24.patch,
+	* patches/icedtea-liveconnect.patch,
+	* patches/icedtea-netx-applet-visbility.patch,
+	* patches/icedtea-sparc.patch:
+	Removed.
+	* ChangeLog: Fix typo.
+	* HACKING: New file to list patches.
+	* patches/icedtea-core-build.patch: Removed
+	erroneously included diff output file.
+
 2008-06-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/icedtea-color-profiles.patch,
@@ -451,6 +467,7 @@ 2008-05-25  Mark Wielaard  <mark at klomp.o
 	* Makefile.am: Use -source 1.5 whenever possible.
 	* Makefile.in: Regenerated.
 	* javac.in: Use -1.5.
+	
 2008-05-24  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am: Revert OpenJDK patches
diff -r 2346ce8ee96a -r 5fbe762d9c35 HACKING
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HACKING	Mon Jun 23 15:23:34 2008 +0100
@@ -0,0 +1,113 @@
+Patches
+=======
+
+PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:
+
+* icedtea-ant.patch: Remove use of $(ANT_HOME).
+* icedtea-arm-uname.patch: Handle output of uname on arm.
+* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
+* icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color.
+* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
+  cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
+* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
+* icedtea-core-build.patch: Add support for building IcedTea core VM.
+* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
+* icedtea-demo.patch: Fix building of JVMTI demo.
+* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
+* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
+* icedtea-fonts.patch: Add Fedora fontconfig.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH.
+* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
+* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
+* icedtea-generated.patch: Force use of /bin/bash.
+* icedtea-gervill.patch: Add support for Gervill from the overlay.
+* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
+* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
+* icedtea-javafiles.patch: Add missing Java files to list.
+* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
+* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
+* icedtea-lcms-leak.patch: Fix LCMS memory leak.
+* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
+* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
+* icedtea-libraries.patch: Use system JPEG and zlib libraries.
+* icedtea-license-headers.patch: Generate GPL header from automulti tool.
+* icedtea-linker-options.patch: Add -Xlinker option when linking.
+* icedtea-memory-limits.patch: Increase default memory limits.
+* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
+* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
+* icedtea-lsb-release.patch: Generate Debian LSB file.
+* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
+* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
+* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
+* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
+* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
+* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
+* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
+* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
+* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
+* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
+* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
+* icedtea-webservices.patch: Add applet support.
+* icedtea-zero-build.patch: Add support for the zero assembler build.
+
+The following patches are only applied to OpenJDK6 in IcedTea6:
+
+* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
+* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
+* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+
+The following patches are only applied to OpenJDK in IcedTea:
+
+* icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+
+The following patches are only applied to the icedtea-ecj bootstrap tree:
+
+* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
+  instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
+  javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
+  don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
+  calls, replace hexadecimal floating point literals with decimal variants in
+  java.lang.Double and java.lang.Float.   
+
+The following patches are only applied for IcedTea builds using the zero-assembler:
+
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
+* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
+* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
+* icedtea-signature-iterator.patch: Add zero-specific signature handling.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
+* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
+* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
+
+The following patches are only applied when building with experimental NetX plugin support:
+
+* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.
+
+The following patches are only applied when building with the CACAO virtual machine:
+
+* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.
+
+Obsolete Patches
+================
+
+The following patches were previously applied, but have been made obsolete by
+changes to the OpenJDK code base and/or changes within IcedTea:
+
+* icedtea-certbundle.patch: Add support for certificates packaged by Fedora in /etc/pki: Methodology for certificates changed.
+* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. 
+* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
+* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
+* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
+* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
+* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
+* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
diff -r 2346ce8ee96a -r 5fbe762d9c35 patches/icedtea-bytecodeInterpreterWithChecks.patch
--- a/patches/icedtea-bytecodeInterpreterWithChecks.patch	Mon Jun 23 00:21:54 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- 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
-@@ -6,6 +6,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
-@@ -15,7 +16,6 @@
-
- </xsl:text>
-
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- </xsl:template>
-
- </xsl:stylesheet>
diff -r 2346ce8ee96a -r 5fbe762d9c35 patches/icedtea-certbundle.patch
--- a/patches/icedtea-certbundle.patch	Mon Jun 23 00:21:54 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,240 +0,0 @@
-diff -urN openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java	2007-10-12 18:24:05.000000000 -0400
-@@ -0,0 +1,199 @@
-+/* CertBundleKeyStoreImpl.java
-+   Copyright (C) 2007  Casey Marshall <csm at gnu.org>
-+
-+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 sun.security.provider;
-+
-+import java.io.BufferedReader;
-+import java.io.ByteArrayInputStream;
-+import java.io.ByteArrayOutputStream;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.io.OutputStream;
-+import java.io.OutputStreamWriter;
-+import java.io.PrintWriter;
-+import java.security.Key;
-+import java.security.KeyStoreException;
-+import java.security.KeyStoreSpi;
-+import java.security.NoSuchAlgorithmException;
-+import java.security.UnrecoverableKeyException;
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateException;
-+import java.security.cert.CertificateFactory;
-+import java.util.Date;
-+import java.util.Enumeration;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.Vector;
-+
-+/**
-+ * A key store implementation for "certificate bundle" files, commonly used
-+ * on many free operating systems. Certificate bundles are plain text files
-+ * containing one or more "PEM" encoded X.509 certificates, which comprise
-+ * a list of trusted root certificates.
-+ * 
-+ * This class implements a read-only key store that reads in one or more
-+ * certificate bundles, storing all certificates successfully read. Calling
-+ * load multiple times will add certificates to the store.
-+ * 
-+ * @author Casey Marshall (csm at gnu.org)
-+ */
-+public class CertBundleKeyStoreImpl extends KeyStoreSpi
-+{
-+  private int x = 0;
-+  private Map<String, Certificate> certs = new HashMap<String, Certificate>();
-+
-+  @Override public Enumeration<String> engineAliases()
-+  {
-+    return new Vector<String>(certs.keySet()).elements();
-+  }
-+
-+  @Override public boolean engineContainsAlias(String alias)
-+  {
-+    return certs.containsKey(alias);
-+  }
-+
-+  @Override public void engineDeleteEntry(String alias) throws KeyStoreException
-+  {
-+    certs.remove(alias);
-+  }
-+
-+  @Override public Certificate engineGetCertificate(String alias)
-+  {
-+    return certs.get(alias);
-+  }
-+
-+  @Override public String engineGetCertificateAlias(Certificate cert)
-+  {
-+    for (Map.Entry<String, Certificate> e : certs.entrySet())
-+      {
-+        if (e.getValue().equals(cert))
-+          return e.getKey();
-+      }
-+    return null;
-+  }
-+
-+  @Override public Certificate[] engineGetCertificateChain(String arg0)
-+  {
-+    return null;
-+  }
-+
-+  @Override public Date engineGetCreationDate(String alias)
-+  {
-+    return new Date(0);
-+  }
-+
-+  @Override public Key engineGetKey(String arg0, char[] arg1)
-+    throws NoSuchAlgorithmException, UnrecoverableKeyException
-+  {
-+    return null;
-+  }
-+
-+  @Override public boolean engineIsCertificateEntry(String alias)
-+  {
-+    return certs.containsKey(alias);
-+  }
-+
-+  @Override public boolean engineIsKeyEntry(String arg0)
-+  {
-+    return false;
-+  }
-+
-+  @Override public void engineLoad(InputStream in, char[] arg1)
-+    throws IOException, NoSuchAlgorithmException, CertificateException
-+  {
-+    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-+    ByteArrayOutputStream bout = new ByteArrayOutputStream();
-+    PrintWriter out = new PrintWriter(new OutputStreamWriter(bout));
-+    BufferedReader rin = new BufferedReader(new InputStreamReader(in));
-+    String line;
-+    boolean push = false;
-+    while ((line = rin.readLine()) != null)
-+      {
-+        if (line.equals("-----BEGIN CERTIFICATE-----"))
-+          {
-+            push = true;
-+            out.println(line);
-+          }
-+        else if (push)
-+          {
-+            out.println(line);
-+            if (line.equals("-----END CERTIFICATE-----"))
-+              {
-+                push = false;
-+		out.flush();
-+		byte[] bytes = bout.toByteArray();
-+                Certificate cert = cf.generateCertificate(new ByteArrayInputStream(bytes));
-+                bout.reset();
-+                String alias = "cert-" + (x++);
-+                certs.put(alias, cert);
-+              }
-+          }
-+      }
-+  }
-+
-+  @Override public void engineSetCertificateEntry(String alias, Certificate cert)
-+    throws KeyStoreException
-+  {
-+    certs.put(alias, cert);
-+  }
-+
-+  @Override public void engineSetKeyEntry(String arg0, byte[] arg1,
-+                                          Certificate[] arg2)
-+    throws KeyStoreException
-+  {
-+    throw new KeyStoreException("not supported");
-+  }
-+
-+  @Override public void engineSetKeyEntry(String arg0, Key arg1, char[] arg2,
-+                                          Certificate[] arg3)
-+    throws KeyStoreException
-+  {
-+    throw new KeyStoreException("not supported");
-+  }
-+
-+  @Override public int engineSize()
-+  {
-+    return certs.size();
-+  }
-+
-+  @Override public void engineStore(OutputStream arg0, char[] arg1)
-+    throws IOException, NoSuchAlgorithmException, CertificateException
-+  {
-+    throw new UnsupportedOperationException("read-only key stores");
-+  }
-+}
---- ../opeinjdkb23/openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java	2007-10-30 04:38:07.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/provider/SunEntries.java	2007-11-13 13:13:21.000000000 -0500
-@@ -178,6 +178,7 @@
-         map.put("KeyStore.JKS", "sun.security.provider.JavaKeyStore$JKS");
-         map.put("KeyStore.CaseExactJKS",
-                         "sun.security.provider.JavaKeyStore$CaseExactJKS");
-+	map.put("KeyStore.CertBundle", "sun.security.provider.CertBundleKeyStoreImpl");
- 
-         /*
-          * Policy
---- openjdkold/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-03-26 04:59:04.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-05-08 10:49:22.000000000 -0400
-@@ -142,16 +142,21 @@
-             public Void run() throws Exception {
-                 props.put("trustStore", System.getProperty(
-                                 "javax.net.ssl.trustStore"));
--                props.put("javaHome", System.getProperty(
--                                        "java.home"));
-                 props.put("trustStoreType", System.getProperty(
-                                 "javax.net.ssl.trustStoreType",
-                                 KeyStore.getDefaultType()));
-+		props.put("javaHome", System.getProperty(
-+                                        "java.home"));
-                 props.put("trustStoreProvider", System.getProperty(
-                                 "javax.net.ssl.trustStoreProvider", ""));
-                 props.put("trustStorePasswd", System.getProperty(
-                                 "javax.net.ssl.trustStorePassword", ""));
--                return null;
-+                props.put("/etc/pki/tls/certs/ca-bundle.crt", System.getProperty(
-+                                "javax.net.ssl.trustStore"));
-+		props.put("CertBundle", System.getProperty(
-+                                "javax.net.ssl.trustStoreType",
-+                                KeyStore.getDefaultType()));
-+	        return null;
-             }
-         });
- 
diff -r 2346ce8ee96a -r 5fbe762d9c35 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch	Mon Jun 23 00:21:54 2008 +0100
+++ b/patches/icedtea-core-build.patch	Mon Jun 23 15:23:34 2008 +0100
@@ -122,264 +122,6 @@ diff -Nru openjdk.orig/hotspot/src/share
  #endif // TIERED
  #endif // KERNEL
  
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-05-27 22:28:30.000000000 +0100
-@@ -0,0 +1,254 @@
-+/*
-+ * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * 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/_vm_version.cpp.incl"
-+
-+const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
-+const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
-+bool Abstract_VM_Version::_supports_cx8 = false;
-+unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
-+
-+#ifndef HOTSPOT_RELEASE_VERSION
-+  #error HOTSPOT_RELEASE_VERSION must be defined
-+#endif
-+#ifndef JRE_RELEASE_VERSION
-+  #error JRE_RELEASE_VERSION must be defined
-+#endif
-+#ifndef HOTSPOT_BUILD_TARGET
-+  #error HOTSPOT_BUILD_TARGET must be defined
-+#endif
-+
-+#ifdef PRODUCT
-+  #define VM_RELEASE HOTSPOT_RELEASE_VERSION
-+#else
-+  #define VM_RELEASE HOTSPOT_RELEASE_VERSION "-" HOTSPOT_BUILD_TARGET
-+#endif
-+
-+// HOTSPOT_RELEASE_VERSION must follow the release version naming convention
-+// <major_ver>.<minor_ver>-b<nn>[-<identifier>][-<debug_target>]
-+int Abstract_VM_Version::_vm_major_version = 0;
-+int Abstract_VM_Version::_vm_minor_version = 0;
-+int Abstract_VM_Version::_vm_build_number = 0;
-+bool Abstract_VM_Version::_initialized = false;
-+int Abstract_VM_Version::_parallel_worker_threads = 0;
-+bool Abstract_VM_Version::_parallel_worker_threads_initialized = false;
-+
-+void Abstract_VM_Version::initialize() {
-+  if (_initialized) {
-+    return;
-+  }
-+  char* vm_version = os::strdup(HOTSPOT_RELEASE_VERSION);
-+
-+  // Expecting the next vm_version format:
-+  // <major_ver>.<minor_ver>-b<nn>[-<identifier>]
-+  char* vm_major_ver = vm_version;
-+  assert(isdigit(vm_major_ver[0]),"wrong vm major version number");
-+  char* vm_minor_ver = strchr(vm_major_ver, '.');
-+  assert(vm_minor_ver != NULL && isdigit(vm_minor_ver[1]),"wrong vm minor version number");
-+  vm_minor_ver[0] = '\0'; // terminate vm_major_ver
-+  vm_minor_ver += 1;
-+  char* vm_build_num = strchr(vm_minor_ver, '-');
-+  assert(vm_build_num != NULL && vm_build_num[1] == 'b' && isdigit(vm_build_num[2]),"wrong vm build number");
-+  vm_build_num[0] = '\0'; // terminate vm_minor_ver
-+  vm_build_num += 2;


From gnu_andrew at member.fsf.org  Mon Jun 23 07:26:30 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Jun 2008 15:26:30 +0100
Subject: FYI: [icedtea] List patches and remove unnecessary ones.
Message-ID: <20080623142630.GA13421@rivendell.middle-earth.co.uk>

I've just committed the patch described below which removes several
unused patches from the icedtea repository and documents them all in
a new file, HACKING.

A copy of the latter is attached.  I suggest this is also added to icedtea6
and updated as we go along, so the numerous patches can be tracked.

ChangeLog:

2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* patches/icedtea-bytecodeInterpreterWithChecks.patch,
	* patches/icedtea-certbundle.patch,
	* patches/icedtea-freetype.patch,
	* patches/icedtea-hat-spl-gpl.patch,
	* patches/icedtea-hotspot-6b06-7b24.patch,
	* patches/icedtea-liveconnect.patch,
	* patches/icedtea-netx-applet-visbility.patch,
	* patches/icedtea-sparc.patch:
	Removed.
	* ChangeLog: Fix typo.
	* HACKING: New file to list patches.
	* patches/icedtea-core-build.patch: Removed
	erroneously included diff output file.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
Patches
=======

PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)

The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:

* icedtea-ant.patch: Remove use of $(ANT_HOME).
* icedtea-arm-uname.patch: Handle output of uname on arm.
* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
* icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color.
* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
  cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
* icedtea-core-build.patch: Add support for building IcedTea core VM.
* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
* icedtea-demo.patch: Fix building of JVMTI demo.
* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
* icedtea-fonts.patch: Add Fedora fontconfig.
* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH.
* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
* icedtea-generated.patch: Force use of /bin/bash.
* icedtea-gervill.patch: Add support for Gervill from the overlay.
* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
* icedtea-javafiles.patch: Add missing Java files to list.
* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
* icedtea-lcms-leak.patch: Fix LCMS memory leak.
* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
* icedtea-libraries.patch: Use system JPEG and zlib libraries.
* icedtea-license-headers.patch: Generate GPL header from automulti tool.
* icedtea-linker-options.patch: Add -Xlinker option when linking.
* icedtea-memory-limits.patch: Increase default memory limits.
* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
* icedtea-lsb-release.patch: Generate Debian LSB file.
* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
* icedtea-webservices.patch: Add applet support.
* icedtea-zero-build.patch: Add support for the zero assembler build.

The following patches are only applied to OpenJDK6 in IcedTea6:

* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.

The following patches are only applied to OpenJDK in IcedTea:

* icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4).

The following patches are only applied to the icedtea-ecj bootstrap tree:

* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
  instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
  javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
  don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
  calls, replace hexadecimal floating point literals with decimal variants in
  java.lang.Double and java.lang.Float.   

The following patches are only applied for IcedTea builds using the zero-assembler:

* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
* icedtea-signature-iterator.patch: Add zero-specific signature handling.
* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.

The following patches are only applied when building with experimental NetX plugin support:

* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.

The following patches are only applied when building with the CACAO virtual machine:

* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.

Obsolete Patches
================

The following patches were previously applied, but have been made obsolete by
changes to the OpenJDK code base and/or changes within IcedTea:

* icedtea-certbundle.patch: Add support for certificates packaged by Fedora in /etc/pki: Methodology for certificates changed.
* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. 
* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.

From langel at redhat.com  Mon Jun 23 07:29:43 2008
From: langel at redhat.com (Lillian Angel)
Date: Mon, 23 Jun 2008 14:29:43 +0000
Subject: changeset in /hg/icedtea6: 2008-06-23  Lillian Angel  <langel@re...
Message-ID: <hg.b42140b0e607.1214231383.2873452341184383832@icedtea.classpath.org>

changeset b42140b0e607 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b42140b0e607
description:
	2008-06-23  Lillian Angel  <langel at redhat.com>
	        Pablo del Campo <pablogdc at gmail.com>

	        Fixes Bug #160
	        * patches/icedtea-fonts.patch: Updated for F9.

diffstat:

2 files changed, 47 insertions(+), 63 deletions(-)
ChangeLog                   |    6 ++
patches/icedtea-fonts.patch |  104 ++++++++++++++++---------------------------

diffs (287 lines):

diff -r dfa695befde7 -r b42140b0e607 ChangeLog
--- a/ChangeLog	Mon Jun 23 10:00:18 2008 -0400
+++ b/ChangeLog	Mon Jun 23 10:29:19 2008 -0400
@@ -1,3 +1,9 @@ 2008-06-23  Lillian Angel  <langel at redha
+2008-06-23  Lillian Angel  <langel at redhat.com>
+	Pablo del Campo <pablogdc at gmail.com>
+
+	Fixes Bug #160
+	* patches/icedtea-fonts.patch: Updated for F9.
+
 2008-06-23  Lillian Angel  <langel at redhat.com>
 
 	* aclocal.m4: Regenerated.
diff -r dfa695befde7 -r b42140b0e607 patches/icedtea-fonts.patch
--- a/patches/icedtea-fonts.patch	Mon Jun 23 10:00:18 2008 -0400
+++ b/patches/icedtea-fonts.patch	Mon Jun 23 10:29:19 2008 -0400
@@ -1,6 +1,6 @@
---- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-03-26 14:30:01.000000000 +0530
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-04-21 11:21:49.000000000 +0530
-@@ -25,134 +25,310 @@
+--- openjdk.old/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-03-26 05:00:01.000000000 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-06-23 10:26:51.000000000 -0400
+@@ -25,7 +25,7 @@
  
  # Version
  
@@ -9,10 +9,7 @@
  version=1
  
  # Component Font Mappings
- 
--dialog.plain.latin-1=DejaVu LGC Sans
-+dialog.plain.latin-1=DejaVu Sans
- dialog.plain.japanese-x0208=Sazanami Gothic
+@@ -35,124 +35,300 @@
  dialog.plain.korean=Baekmuk Gulim
  dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
  dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
@@ -26,8 +23,7 @@
 +dialog.plain.telugu=Lohit Telugu
 +dialog.plain.sinhala=LKLUG
  
--dialog.bold.latin-1=DejaVu LGC Sans Bold
-+dialog.bold.latin-1=DejaVu Sans Bold
+ dialog.bold.latin-1=DejaVu LGC Sans Bold
  dialog.bold.japanese-x0208=Sazanami Gothic
  dialog.bold.korean=Baekmuk Gulim
  dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -42,8 +38,7 @@
 +dialog.bold.telugu=Lohit Telugu
 +dialog.bold.sinhala=LKLUG
  
--dialog.italic.latin-1=DejaVu LGC Sans Oblique
-+dialog.italic.latin-1=DejaVu Sans Oblique
+ dialog.italic.latin-1=DejaVu LGC Sans Oblique
  dialog.italic.japanese-x0208=Sazanami Gothic
  dialog.italic.korean=Baekmuk Gulim
  dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -58,12 +53,12 @@
 +dialog.italic.telugu=Lohit Telugu
 +dialog.italic.sinhala=LKLUG
  
--dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
  dialog.bolditalic.japanese-x0208=Sazanami Gothic
  dialog.bolditalic.korean=Baekmuk Gulim
  dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +dialog.bolditalic.bengali=Lohit Bengali
 +dialog.bolditalic.gujarati=Lohit Gujarati
 +dialog.bolditalic.hindi=Lohit Hindi
@@ -74,9 +69,7 @@
 +dialog.bolditalic.telugu=Lohit Telugu
 +dialog.bolditalic.sinhala=LKLUG
  
--
--sansserif.plain.latin-1=DejaVu LGC Sans
-+sansserif.plain.latin-1=DejaVu Sans
+ sansserif.plain.latin-1=DejaVu LGC Sans
  sansserif.plain.japanese-x0208=Sazanami Gothic
  sansserif.plain.korean=Baekmuk Gulim
  sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -91,8 +84,7 @@
 +sansserif.plain.telugu=Lohit Telugu
 +sansserif.plain.sinhala=LKLUG
  
--sansserif.bold.latin-1=DejaVu LGC Sans Bold
-+sansserif.bold.latin-1=DejaVu Sans Bold
+ sansserif.bold.latin-1=DejaVu LGC Sans Bold
  sansserif.bold.japanese-x0208=Sazanami Gothic
  sansserif.bold.korean=Baekmuk Gulim
  sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -107,8 +99,7 @@
 +sansserif.bold.telugu=Lohit Telugu
 +sansserif.bold.sinhala=LKLUG
  
--sansserif.italic.latin-1=DejaVu LGC Sans Oblique
-+sansserif.italic.latin-1=DejaVu Sans Oblique
+ sansserif.italic.latin-1=DejaVu LGC Sans Oblique
  sansserif.italic.japanese-x0208=Sazanami Gothic
  sansserif.italic.korean=Baekmuk Gulim
  sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -123,12 +114,12 @@
 +sansserif.italic.telugu=Lohit Telugu
 +sansserif.italic.sinhala=LKLUG
  
--sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
  sansserif.bolditalic.japanese-x0208=Sazanami Gothic
  sansserif.bolditalic.korean=Baekmuk Gulim
  sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +sansserif.bolditalic.bengali=Lohit Bengali
 +sansserif.bolditalic.gujarati=Lohit Gujarati
 +sansserif.bolditalic.hindi=Lohit Hindi
@@ -139,9 +130,7 @@
 +sansserif.bolditalic.telugu=Lohit Telugu
 +sansserif.bolditalic.sinhala=LKLUG
  
--
--serif.plain.latin-1=DejaVu LGC Serif
-+serif.plain.latin-1=DejaVu Serif
+ serif.plain.latin-1=DejaVu LGC Serif
  serif.plain.japanese-x0208=Sazanami Mincho
  serif.plain.korean=Baekmuk Batang
  serif.plain.chinese-big5=AR PL ZenKai Uni
@@ -156,8 +145,7 @@
 +serif.plain.telugu=Lohit Telugu
 +serif.plain.sinhala=LKLUG
  
--serif.bold.latin-1=DejaVu LGC Serif Bold
-+serif.bold.latin-1=DejaVu Serif Bold
+ serif.bold.latin-1=DejaVu LGC Serif Bold
  serif.bold.japanese-x0208=Sazanami Mincho
  serif.bold.korean=Baekmuk Batang
  serif.bold.chinese-big5=AR PL ZenKai Uni
@@ -172,8 +160,7 @@
 +serif.bold.telugu=Lohit Telugu
 +serif.bold.sinhala=LKLUG
  
--serif.italic.latin-1=DejaVu LGC Serif Oblique
-+serif.italic.latin-1=DejaVu Serif Oblique
+ serif.italic.latin-1=DejaVu LGC Serif Oblique
  serif.italic.japanese-x0208=Sazanami Mincho
  serif.italic.korean=Baekmuk Batang
  serif.italic.chinese-big5=AR PL ZenKai Uni
@@ -188,12 +175,12 @@
 +serif.italic.telugu=Lohit Telugu
 +serif.italic.sinhala=LKLUG
  
--serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
-+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+ serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
  serif.bolditalic.japanese-x0208=Sazanami Mincho
  serif.bolditalic.korean=Baekmuk Batang
  serif.bolditalic.chinese-big5=AR PL ZenKai Uni
  serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+-
 +serif.bolditalic.bengali=Lohit Bengali
 +serif.bolditalic.gujarati=Lohit Gujarati
 +serif.bolditalic.hindi=Lohit Hindi
@@ -204,9 +191,7 @@
 +serif.bolditalic.telugu=Lohit Telugu
 +serif.bolditalic.sinhala=LKLUG
  
--
--monospaced.plain.latin-1=DejaVu LGC Sans Mono
-+monospaced.plain.latin-1=DejaVu Sans Mono
+ monospaced.plain.latin-1=DejaVu LGC Sans Mono
  monospaced.plain.japanese-x0208=Sazanami Gothic
  monospaced.plain.korean=Baekmuk Gulim
  monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -221,8 +206,7 @@
 +monospaced.plain.telugu=Lohit Telugu
 +monospaced.plain.sinhala=LKLUG
  
--monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
-+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+ monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
  monospaced.bold.japanese-x0208=Sazanami Gothic
  monospaced.bold.korean=Baekmuk Gulim
  monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -237,8 +221,7 @@
 +monospaced.bold.telugu=Lohit Telugu
 +monospaced.bold.sinhala=LKLUG
  
--monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+ monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
  monospaced.italic.japanese-x0208=Sazanami Gothic
  monospaced.italic.korean=Baekmuk Gulim
  monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -253,12 +236,12 @@
 +monospaced.italic.telugu=Lohit Telugu
 +monospaced.italic.sinhala=LKLUG
  
--monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
  monospaced.bolditalic.japanese-x0208=Sazanami Gothic
  monospaced.bolditalic.korean=Baekmuk Gulim
  monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +monospaced.bolditalic.bengali=Lohit Bengali
 +monospaced.bolditalic.gujarati=Lohit Gujarati
 +monospaced.bolditalic.hindi=Lohit Hindi
@@ -269,9 +252,7 @@
 +monospaced.bolditalic.telugu=Lohit Telugu
 +monospaced.bolditalic.sinhala=LKLUG
  
--
--dialoginput.plain.latin-1=DejaVu LGC Sans Mono
-+dialoginput.plain.latin-1=DejaVu Sans Mono
+ dialoginput.plain.latin-1=DejaVu LGC Sans Mono
  dialoginput.plain.japanese-x0208=Sazanami Gothic
  dialoginput.plain.korean=Baekmuk Gulim
  dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -286,8 +267,7 @@
 +dialoginput.plain.telugu=Lohit Telugu
 +dialoginput.plain.sinhala=LKLUG
  
--dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
-+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+ dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
  dialoginput.bold.japanese-x0208=Sazanami Gothic
  dialoginput.bold.korean=Baekmuk Gulim
  dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -302,8 +282,7 @@
 +dialoginput.bold.telugu=Lohit Telugu
 +dialoginput.bold.sinhala=LKLUG
  
--dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+ dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
  dialoginput.italic.japanese-x0208=Sazanami Gothic
  dialoginput.italic.korean=Baekmuk Gulim
  dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -318,8 +297,7 @@
 +dialoginput.italic.telugu=Lohit Telugu
 +dialoginput.italic.sinhala=LKLUG
  
--dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
  dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
  dialoginput.bolditalic.korean=Baekmuk Gulim
  dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
@@ -366,20 +344,20 @@
 -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
 -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
 -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
-+filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
++filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf
++filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf
++filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf
++filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf
++
++filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf
++filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf
++filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf
++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf
++
++filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf
++filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf
++filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf
++filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-BoldOblique.ttf
 +
 +filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
 +filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf


From bugzilla-daemon at icedtea.classpath.org  Mon Jun 23 07:29:47 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Jun 2008 14:29:47 +0000
Subject: [Bug 160] files fontconfig.Fedora.* in 1.6.0-b09 are wrong
Message-ID: <E1KAn3D-0006Yb-Jm@icedtea.classpath.org>

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


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |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 gnu_andrew at member.fsf.org  Mon Jun 23 07:33:18 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 23 Jun 2008 14:33:18 +0000
Subject: changeset in /hg/icedtea6: Merge.
Message-ID: <hg.f8d0f74a34a2.1214231598.2873452341184383832@icedtea.classpath.org>

changeset f8d0f74a34a2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8d0f74a34a2
description:
	Merge.

diffstat:

2 files changed, 47 insertions(+), 63 deletions(-)
ChangeLog                   |    6 ++
patches/icedtea-fonts.patch |  104 ++++++++++++++++---------------------------

diffs (290 lines):

diff -r eb77784e8b0a -r f8d0f74a34a2 ChangeLog
--- a/ChangeLog	Mon Jun 23 15:31:39 2008 +0100
+++ b/ChangeLog	Mon Jun 23 15:33:06 2008 +0100
@@ -4,6 +4,12 @@ 2008-06-23  Andrew John Hughes  <gnu_and
 	* HACKING: New file to list patches.
 	* patches/icedtea-gtkplaf.patch: Changed to use
 	fix from S6624717 as found in OpenJDK7 b27.
+
+2008-06-23  Lillian Angel  <langel at redhat.com>
+	Pablo del Campo <pablogdc at gmail.com>
+
+	Fixes Bug #160
+	* patches/icedtea-fonts.patch: Updated for F9.
 
 2008-06-23  Lillian Angel  <langel at redhat.com>
 
diff -r eb77784e8b0a -r f8d0f74a34a2 patches/icedtea-fonts.patch
--- a/patches/icedtea-fonts.patch	Mon Jun 23 15:31:39 2008 +0100
+++ b/patches/icedtea-fonts.patch	Mon Jun 23 15:33:06 2008 +0100
@@ -1,6 +1,6 @@
---- openjdkold/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-03-26 14:30:01.000000000 +0530
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-04-21 11:21:49.000000000 +0530
-@@ -25,134 +25,310 @@
+--- openjdk.old/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-03-26 05:00:01.000000000 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties	2008-06-23 10:26:51.000000000 -0400
+@@ -25,7 +25,7 @@
  
  # Version
  
@@ -9,10 +9,7 @@
  version=1
  
  # Component Font Mappings
- 
--dialog.plain.latin-1=DejaVu LGC Sans
-+dialog.plain.latin-1=DejaVu Sans
- dialog.plain.japanese-x0208=Sazanami Gothic
+@@ -35,124 +35,300 @@
  dialog.plain.korean=Baekmuk Gulim
  dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
  dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
@@ -26,8 +23,7 @@
 +dialog.plain.telugu=Lohit Telugu
 +dialog.plain.sinhala=LKLUG
  
--dialog.bold.latin-1=DejaVu LGC Sans Bold
-+dialog.bold.latin-1=DejaVu Sans Bold
+ dialog.bold.latin-1=DejaVu LGC Sans Bold
  dialog.bold.japanese-x0208=Sazanami Gothic
  dialog.bold.korean=Baekmuk Gulim
  dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -42,8 +38,7 @@
 +dialog.bold.telugu=Lohit Telugu
 +dialog.bold.sinhala=LKLUG
  
--dialog.italic.latin-1=DejaVu LGC Sans Oblique
-+dialog.italic.latin-1=DejaVu Sans Oblique
+ dialog.italic.latin-1=DejaVu LGC Sans Oblique
  dialog.italic.japanese-x0208=Sazanami Gothic
  dialog.italic.korean=Baekmuk Gulim
  dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -58,12 +53,12 @@
 +dialog.italic.telugu=Lohit Telugu
 +dialog.italic.sinhala=LKLUG
  
--dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
  dialog.bolditalic.japanese-x0208=Sazanami Gothic
  dialog.bolditalic.korean=Baekmuk Gulim
  dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +dialog.bolditalic.bengali=Lohit Bengali
 +dialog.bolditalic.gujarati=Lohit Gujarati
 +dialog.bolditalic.hindi=Lohit Hindi
@@ -74,9 +69,7 @@
 +dialog.bolditalic.telugu=Lohit Telugu
 +dialog.bolditalic.sinhala=LKLUG
  
--
--sansserif.plain.latin-1=DejaVu LGC Sans
-+sansserif.plain.latin-1=DejaVu Sans
+ sansserif.plain.latin-1=DejaVu LGC Sans
  sansserif.plain.japanese-x0208=Sazanami Gothic
  sansserif.plain.korean=Baekmuk Gulim
  sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -91,8 +84,7 @@
 +sansserif.plain.telugu=Lohit Telugu
 +sansserif.plain.sinhala=LKLUG
  
--sansserif.bold.latin-1=DejaVu LGC Sans Bold
-+sansserif.bold.latin-1=DejaVu Sans Bold
+ sansserif.bold.latin-1=DejaVu LGC Sans Bold
  sansserif.bold.japanese-x0208=Sazanami Gothic
  sansserif.bold.korean=Baekmuk Gulim
  sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -107,8 +99,7 @@
 +sansserif.bold.telugu=Lohit Telugu
 +sansserif.bold.sinhala=LKLUG
  
--sansserif.italic.latin-1=DejaVu LGC Sans Oblique
-+sansserif.italic.latin-1=DejaVu Sans Oblique
+ sansserif.italic.latin-1=DejaVu LGC Sans Oblique
  sansserif.italic.japanese-x0208=Sazanami Gothic
  sansserif.italic.korean=Baekmuk Gulim
  sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -123,12 +114,12 @@
 +sansserif.italic.telugu=Lohit Telugu
 +sansserif.italic.sinhala=LKLUG
  
--sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
-+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+ sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique
  sansserif.bolditalic.japanese-x0208=Sazanami Gothic
  sansserif.bolditalic.korean=Baekmuk Gulim
  sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +sansserif.bolditalic.bengali=Lohit Bengali
 +sansserif.bolditalic.gujarati=Lohit Gujarati
 +sansserif.bolditalic.hindi=Lohit Hindi
@@ -139,9 +130,7 @@
 +sansserif.bolditalic.telugu=Lohit Telugu
 +sansserif.bolditalic.sinhala=LKLUG
  
--
--serif.plain.latin-1=DejaVu LGC Serif
-+serif.plain.latin-1=DejaVu Serif
+ serif.plain.latin-1=DejaVu LGC Serif
  serif.plain.japanese-x0208=Sazanami Mincho
  serif.plain.korean=Baekmuk Batang
  serif.plain.chinese-big5=AR PL ZenKai Uni
@@ -156,8 +145,7 @@
 +serif.plain.telugu=Lohit Telugu
 +serif.plain.sinhala=LKLUG
  
--serif.bold.latin-1=DejaVu LGC Serif Bold
-+serif.bold.latin-1=DejaVu Serif Bold
+ serif.bold.latin-1=DejaVu LGC Serif Bold
  serif.bold.japanese-x0208=Sazanami Mincho
  serif.bold.korean=Baekmuk Batang
  serif.bold.chinese-big5=AR PL ZenKai Uni
@@ -172,8 +160,7 @@
 +serif.bold.telugu=Lohit Telugu
 +serif.bold.sinhala=LKLUG
  
--serif.italic.latin-1=DejaVu LGC Serif Oblique
-+serif.italic.latin-1=DejaVu Serif Oblique
+ serif.italic.latin-1=DejaVu LGC Serif Oblique
  serif.italic.japanese-x0208=Sazanami Mincho
  serif.italic.korean=Baekmuk Batang
  serif.italic.chinese-big5=AR PL ZenKai Uni
@@ -188,12 +175,12 @@
 +serif.italic.telugu=Lohit Telugu
 +serif.italic.sinhala=LKLUG
  
--serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
-+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+ serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique
  serif.bolditalic.japanese-x0208=Sazanami Mincho
  serif.bolditalic.korean=Baekmuk Batang
  serif.bolditalic.chinese-big5=AR PL ZenKai Uni
  serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+-
 +serif.bolditalic.bengali=Lohit Bengali
 +serif.bolditalic.gujarati=Lohit Gujarati
 +serif.bolditalic.hindi=Lohit Hindi
@@ -204,9 +191,7 @@
 +serif.bolditalic.telugu=Lohit Telugu
 +serif.bolditalic.sinhala=LKLUG
  
--
--monospaced.plain.latin-1=DejaVu LGC Sans Mono
-+monospaced.plain.latin-1=DejaVu Sans Mono
+ monospaced.plain.latin-1=DejaVu LGC Sans Mono
  monospaced.plain.japanese-x0208=Sazanami Gothic
  monospaced.plain.korean=Baekmuk Gulim
  monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -221,8 +206,7 @@
 +monospaced.plain.telugu=Lohit Telugu
 +monospaced.plain.sinhala=LKLUG
  
--monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
-+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+ monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold
  monospaced.bold.japanese-x0208=Sazanami Gothic
  monospaced.bold.korean=Baekmuk Gulim
  monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -237,8 +221,7 @@
 +monospaced.bold.telugu=Lohit Telugu
 +monospaced.bold.sinhala=LKLUG
  
--monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+ monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique
  monospaced.italic.japanese-x0208=Sazanami Gothic
  monospaced.italic.korean=Baekmuk Gulim
  monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -253,12 +236,12 @@
 +monospaced.italic.telugu=Lohit Telugu
 +monospaced.italic.sinhala=LKLUG
  
--monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
  monospaced.bolditalic.japanese-x0208=Sazanami Gothic
  monospaced.bolditalic.korean=Baekmuk Gulim
  monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
  monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+-
 +monospaced.bolditalic.bengali=Lohit Bengali
 +monospaced.bolditalic.gujarati=Lohit Gujarati
 +monospaced.bolditalic.hindi=Lohit Hindi
@@ -269,9 +252,7 @@
 +monospaced.bolditalic.telugu=Lohit Telugu
 +monospaced.bolditalic.sinhala=LKLUG
  
--
--dialoginput.plain.latin-1=DejaVu LGC Sans Mono
-+dialoginput.plain.latin-1=DejaVu Sans Mono
+ dialoginput.plain.latin-1=DejaVu LGC Sans Mono
  dialoginput.plain.japanese-x0208=Sazanami Gothic
  dialoginput.plain.korean=Baekmuk Gulim
  dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
@@ -286,8 +267,7 @@
 +dialoginput.plain.telugu=Lohit Telugu
 +dialoginput.plain.sinhala=LKLUG
  
--dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
-+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+ dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold
  dialoginput.bold.japanese-x0208=Sazanami Gothic
  dialoginput.bold.korean=Baekmuk Gulim
  dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
@@ -302,8 +282,7 @@
 +dialoginput.bold.telugu=Lohit Telugu
 +dialoginput.bold.sinhala=LKLUG
  
--dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
-+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+ dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique
  dialoginput.italic.japanese-x0208=Sazanami Gothic
  dialoginput.italic.korean=Baekmuk Gulim
  dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
@@ -318,8 +297,7 @@
 +dialoginput.italic.telugu=Lohit Telugu
 +dialoginput.italic.sinhala=LKLUG
  
--dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
-+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+ dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique
  dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
  dialoginput.bolditalic.korean=Baekmuk Gulim
  dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
@@ -366,20 +344,20 @@
 -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
 -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
 -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
-+filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
++filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu/DejaVuLGCSans.ttf
++filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf
++filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-Oblique.ttf
++filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf
++
++filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu/DejaVuLGCSansMono.ttf
++filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Bold.ttf
++filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-Oblique.ttf
++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSansMono-BoldOblique.ttf
++
++filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu/DejaVuLGCSerif.ttf
++filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu/DejaVuLGCSerif-Bold.ttf
++filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-Oblique.ttf
++filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuLGCSerif-BoldOblique.ttf
 +
 +filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf
 +filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf


From gnu_andrew at member.fsf.org  Mon Jun 23 07:33:17 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 23 Jun 2008 14:33:17 +0000
Subject: changeset in /hg/icedtea6: Document patches and use newer versio...
Message-ID: <hg.eb77784e8b0a.1214231597.2873452341184383832@icedtea.classpath.org>

changeset eb77784e8b0a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eb77784e8b0a
description:
	Document patches and use newer version of gtkplaf patch.

	2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* ChangeLog: Correct PATCHES typo.
		* HACKING: New file to list patches.
		* patches/icedtea-gtkplaf.patch: Changed to use
		fix from S6624717 as found in OpenJDK7 b27.

diffstat:

3 files changed, 173 insertions(+), 21 deletions(-)
ChangeLog                     |   13 +++-
HACKING                       |  114 +++++++++++++++++++++++++++++++++++++++++
patches/icedtea-gtkplaf.patch |   67 +++++++++++++++++-------

diffs (233 lines):

diff -r dfa695befde7 -r eb77784e8b0a ChangeLog
--- a/ChangeLog	Mon Jun 23 10:00:18 2008 -0400
+++ b/ChangeLog	Mon Jun 23 15:31:39 2008 +0100
@@ -1,3 +1,10 @@ 2008-06-23  Lillian Angel  <langel at redha
+2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* ChangeLog: Correct PATCHES typo.
+	* HACKING: New file to list patches.
+	* patches/icedtea-gtkplaf.patch: Changed to use
+	fix from S6624717 as found in OpenJDK7 b27.
+
 2008-06-23  Lillian Angel  <langel at redhat.com>
 
 	* aclocal.m4: Regenerated.
@@ -7,7 +14,7 @@ 2008-06-22  Mark Wielaard  <mark at klomp.o
 
 	* patches/icedtea-rhino.patch: New patch.
 	* Makefile.am: Add RHINO_JAR to environment variable lists.
-	(ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
+	(ICEDTEA_PATCHES): Add patches/icedtea-rhino.patch.
 	* Makefile.in: Regenerated.
 	* acinclude.m4 (FIND_RHINO_JAR): New.
 	* configure.ac: Use FIND_RHINO_JAR.
@@ -25,13 +32,13 @@ 2008-06-19  Lillian Angel  <langel at redha
 
 	Fixes Bug #159
 	* patches/icedtea-component.patch: New file.
-	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
 	* Makefile.in: Regenerated.
 
 2008-06-18  Keith Seitz  <keiths at redhat.com>
 
 	* patches/icedtea-dnd-updatecursor.patch: New file.
-	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
 	* Makefile.in: Regenerated.
 
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
diff -r dfa695befde7 -r eb77784e8b0a HACKING
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HACKING	Mon Jun 23 15:31:39 2008 +0100
@@ -0,0 +1,114 @@
+Patches
+=======
+
+PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:
+
+* icedtea-ant.patch: Remove use of $(ANT_HOME).
+* icedtea-arm-uname.patch: Handle output of uname on arm.
+* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
+* icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color.
+* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
+  cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
+* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
+* icedtea-core-build.patch: Add support for building IcedTea core VM.
+* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
+* icedtea-demo.patch: Fix building of JVMTI demo.
+* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
+* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
+* icedtea-fonts.patch: Add Fedora fontconfig.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH.
+* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
+* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
+* icedtea-generated.patch: Force use of /bin/bash.
+* icedtea-gervill.patch: Add support for Gervill from the overlay.
+* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
+* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
+* icedtea-javafiles.patch: Add missing Java files to list.
+* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
+* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
+* icedtea-lcms-leak.patch: Fix LCMS memory leak.
+* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
+* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
+* icedtea-libraries.patch: Use system JPEG and zlib libraries.
+* icedtea-license-headers.patch: Generate GPL header from automulti tool.
+* icedtea-linker-options.patch: Add -Xlinker option when linking.
+* icedtea-memory-limits.patch: Increase default memory limits.
+* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
+* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
+* icedtea-lsb-release.patch: Generate Debian LSB file.
+* icedtea-rhino.patch: Add support for Javascript.
+* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
+* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
+* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
+* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
+* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
+* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
+* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
+* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
+* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
+* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
+* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
+* icedtea-webservices.patch: Add applet support.
+* icedtea-zero-build.patch: Add support for the zero assembler build.
+
+The following patches are only applied to OpenJDK6 in IcedTea6:
+
+* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
+* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
+* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+
+The following patches are only applied to OpenJDK in IcedTea:
+
+* icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+
+The following patches are only applied to the icedtea-ecj bootstrap tree:
+
+* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
+  instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
+  javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
+  don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
+  calls, replace hexadecimal floating point literals with decimal variants in
+  java.lang.Double and java.lang.Float.   
+
+The following patches are only applied for IcedTea builds using the zero-assembler:
+
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
+* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
+* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
+* icedtea-signature-iterator.patch: Add zero-specific signature handling.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
+* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
+* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
+
+The following patches are only applied when building with experimental NetX plugin support:
+
+* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.
+
+The following patches are only applied when building with the CACAO virtual machine:
+
+* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.
+
+Obsolete Patches
+================
+
+The following patches were previously applied, but have been made obsolete by
+changes to the OpenJDK code base and/or changes within IcedTea:
+
+* icedtea-certbundle.patch: Add support for certificates packaged by Fedora in /etc/pki: Methodology for certificates changed.
+* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. 
+* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
+* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
+* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
+* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
+* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
+* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
diff -r dfa695befde7 -r eb77784e8b0a patches/icedtea-gtkplaf.patch
--- a/patches/icedtea-gtkplaf.patch	Mon Jun 23 10:00:18 2008 -0400
+++ b/patches/icedtea-gtkplaf.patch	Mon Jun 23 15:31:39 2008 +0100
@@ -1,23 +1,54 @@
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c.orig	2007-09-27 04:08:04.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2007-10-04 16:31:04.000000000 -0400
-@@ -1410,20 +1410,6 @@
-             (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result);
-             (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu);
-         }
--        else if (widget_type == COMBO_BOX_ARROW_BUTTON ||
--                 widget_type == COMBO_BOX_TEXT_FIELD)
--        {
--            /*
+--- openjdk6/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2008-05-30 08:55:40.000000000 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2008-06-22 20:47:39.000000000 +0100
+@@ -333,6 +333,7 @@
+ static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
+         const gchar *stock_id, GtkIconSize size, const gchar *detail);
+ static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
++static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
+ static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
+         GtkTextDirection direction);
+ static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
+@@ -570,6 +571,8 @@
+             dl_symbol("gtk_widget_render_icon");
+         fp_gtk_widget_set_name =
+             dl_symbol("gtk_widget_set_name");
++        fp_gtk_widget_set_parent =
++            dl_symbol("gtk_widget_set_parent");
+         fp_gtk_widget_set_direction =
+             dl_symbol("gtk_widget_set_direction");
+         fp_gtk_widget_style_get =
+@@ -1040,7 +1043,7 @@
+                     (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
+             {
+                 gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
+-                     (*fp_gtk_button_new)();
++                     (*fp_gtk_toggle_button_new)();
+             }
+             result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
+             break;
+@@ -1414,12 +1417,20 @@
+                  widget_type == COMBO_BOX_TEXT_FIELD)
+         {
+             /*
 -             * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
 -             * in order to trick engines into thinking it's a real combobox
 -             * arrow button/text field.
 -             */
--            GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
++            * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
++            * in order to trick engines into thinking it's a real combobox
++            * arrow button/text field.
++            */
+             GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
 -            (*fp_gtk_container_add)((GtkContainer *)combo, result);
--            (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
--            (*fp_gtk_widget_realize)(result);
--            return result;
--        }
-         else if (widget_type != TOOL_TIP &&
-                  widget_type != INTERNAL_FRAME &&
-                  widget_type != OPTION_PANE)
++
++            if (widget_type == COMBO_BOX_TEXT_FIELD)
++                (*fp_gtk_container_add)((GtkContainer *)combo, result);
++            else
++            {
++                (*fp_gtk_widget_set_parent)(result, combo);
++                ((GtkBin*)combo)->child = result;
++            }
++
+             (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
+             (*fp_gtk_widget_realize)(result);
+             return result;


From gnu_andrew at member.fsf.org  Mon Jun 23 07:34:53 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Jun 2008 15:34:53 +0100
Subject: FYI: [icedtea6] Add HACKING and updated gtkplaf patch
Message-ID: <20080623143453.GA13491@rivendell.middle-earth.co.uk>

This adds the patch documentation to IcedTea6, updated
with the new rhino patch.

It also updates the gtkplaf patch so it is the same as the version
included with OpenJDK7 b27.

ChangeLog:

2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* ChangeLog: Correct PATCHES typo.
	* HACKING: New file to list patches.
	* patches/icedtea-gtkplaf.patch: Changed to use
	fix from S6624717 as found in OpenJDK7 b27.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r dfa695befde7 ChangeLog
--- a/ChangeLog	Mon Jun 23 10:00:18 2008 -0400
+++ b/ChangeLog	Mon Jun 23 15:30:30 2008 +0100
@@ -7,7 +7,7 @@ 2008-06-22  Mark Wielaard  <mark at klomp.o
 
 	* patches/icedtea-rhino.patch: New patch.
 	* Makefile.am: Add RHINO_JAR to environment variable lists.
-	(ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
+	(ICEDTEA_PATCHES): Add patches/icedtea-rhino.patch.
 	* Makefile.in: Regenerated.
 	* acinclude.m4 (FIND_RHINO_JAR): New.
 	* configure.ac: Use FIND_RHINO_JAR.
@@ -25,13 +25,13 @@ 2008-06-19  Lillian Angel  <langel at redha
 
 	Fixes Bug #159
 	* patches/icedtea-component.patch: New file.
-	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
 	* Makefile.in: Regenerated.
 
 2008-06-18  Keith Seitz  <keiths at redhat.com>
 
 	* patches/icedtea-dnd-updatecursor.patch: New file.
-	* Makefile.am (ICEDTEA_PATHCES): Add above patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add above patch.
 	* Makefile.in: Regenerated.
 
 2008-06-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
diff -r dfa695befde7 HACKING
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/HACKING	Mon Jun 23 15:30:30 2008 +0100
@@ -0,0 +1,114 @@
+Patches
+=======
+
+PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+The following patches are currently applied to OpenJDK or OpenJDK6 by IcedTea:
+
+* icedtea-ant.patch: Remove use of $(ANT_HOME).
+* icedtea-arm-uname.patch: Handle output of uname on arm.
+* icedtea-bytebuffer-compact.patch: Add clearMark() method to java.nio.Buffer (PR60).
+* icedtea-color-createcontext.patch: Add support for a PaintContext to java.awt.Color.
+* icedtea-copy-plugs.patch: Add IcedTea's 'plugs' for Java WebStart support, add
+  cast to getAnnotation and trapAuthenticationFailure variable to com.sun.jmx.snmp.SnmpPduTrap.
+* icedtea-corba.patch: Adds additional files to org.omg.CORBA Makefile.
+* icedtea-core-build.patch: Add support for building IcedTea core VM.
+* icedtea-debuginfo.patch: Add -g option to build to generate debugging information.
+* icedtea-demo.patch: Fix building of JVMTI demo.
+* icedtea-directaudio-close-trick.patch: Allow hardware sound device to be reopened.
+* icedtea-float-double-trailing-zeros.patch: Remove trailing zeros from Double/Float (PR29/30)
+* icedtea-fonts.patch: Add Fedora fontconfig.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH.
+* icedtea-gcc-4.3.patch: Fix code to compile with GCC 4.3 and turn off -Werror.
+* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
+* icedtea-generated.patch: Force use of /bin/bash.
+* icedtea-gervill.patch: Add support for Gervill from the overlay.
+* icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649)
+* icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64.
+* icedtea-javafiles.patch: Add missing Java files to list.
+* icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support.
+* icedtea-jscheme.patch: Replace use of jscheme.jar with Java alternative (PR140).
+* icedtea-lcms-leak.patch: Fix LCMS memory leak.
+* icedtea-LCMS-setTagData.patch: Add support for setTagData to LCMS peer.
+* icedtea-lib64.patch: Add support for building on platforms with /usr/lib64.
+* icedtea-libraries.patch: Use system JPEG and zlib libraries.
+* icedtea-license-headers.patch: Generate GPL header from automulti tool.
+* icedtea-linker-options.patch: Add -Xlinker option when linking.
+* icedtea-memory-limits.patch: Increase default memory limits.
+* icedtea-no-bcopy.patch: Don't define local copies of bcopy, bzero and bcmp from BSD.
+* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
+* icedtea-lsb-release.patch: Generate Debian LSB file.
+* icedtea-rhino.patch: Add support for Javascript.
+* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
+* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
+* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
+* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
+* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
+* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
+* icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms.
+* icedtea-timerqueue.patch: Fix setting of running variable (PR87).
+* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti.
+* icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486).
+* icedtea-version.patch: Replace name and bug URL with IcedTea versions.
+* icedtea-webservices.patch: Add applet support.
+* icedtea-zero-build.patch: Add support for the zero assembler build.
+
+The following patches are only applied to OpenJDK6 in IcedTea6:
+
+* icedtea-component.patch: Fix deadlock in AWT code (PR159/S6608764). Fixed in OpenJDK7 b25.
+* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
+* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+
+The following patches are only applied to OpenJDK in IcedTea:
+
+* icedtea-override.patch: Remove @Override annotation in javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+
+The following patches are only applied to the icedtea-ecj bootstrap tree:
+
+* icedtea-ecj.patch: Don't generate CORBA sources using MC/idlj, link against -lgcj
+  instead of -ljava, force use of boot tools, don't run HotSpot's test_gamma, use
+  javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
+  don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
+  calls, replace hexadecimal floating point literals with decimal variants in
+  java.lang.Double and java.lang.Float.   
+
+The following patches are only applied for IcedTea builds using the zero-assembler:
+
+* icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
+* icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
+* icedtea-hotspot-6b06-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
+* icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
+* icedtea-signature-iterator.patch: Add zero-specific signature handling.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
+* icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
+* icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
+
+The following patches are only applied when building with experimental NetX plugin support:
+
+* icedtea-netx-plugin.patch: Use NetxPanel instead of AppletViewerPanel.
+
+The following patches are only applied when building with the CACAO virtual machine:
+
+* icedtea-cacao.patch: Add support for additional architectures and don't run 'java' in a new thread.
+
+Obsolete Patches
+================
+
+The following patches were previously applied, but have been made obsolete by
+changes to the OpenJDK code base and/or changes within IcedTea:
+
+* icedtea-certbundle.patch: Add support for certificates packaged by Fedora in /etc/pki: Methodology for certificates changed.
+* icedtea-color-profiles.patch: Add missing color profiles (S6523403): Included upstream in OpenJDK6 b10 and OpenJDK7 b28. 
+* icedtea-hat-spl-gpl.patch: JHat has conflicting GPL/SPL licensing terms (PR143/S6695553): Included upstream in OpenJDK6 b10 and OpenJDK7 b29.
+* icedtea-freetype.patch: Use detected freetype in $FT2_LIB and $FREETYPE_HEADERS_PATH: Obsoleted by icedtea-headers.patch.
+* icedtea-liveconnect.patch: Add LiveConnect support to plugin: No longer developed.
+* icedtea-netx-applet-visibility.patch: Make applet classes package-private for the plugin: Obsoleted by icedtea-webservices.patch.
+* icedtea-xinerama.patch: Fix crash talking to second X screen (S6604044): Included upstream in OpenJDK6 b10 and OpenJDK7 b28.
+* icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
+* openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
diff -r dfa695befde7 patches/icedtea-gtkplaf.patch
--- a/patches/icedtea-gtkplaf.patch	Mon Jun 23 10:00:18 2008 -0400
+++ b/patches/icedtea-gtkplaf.patch	Mon Jun 23 15:30:30 2008 +0100
@@ -1,23 +1,54 @@
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c.orig	2007-09-27 04:08:04.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2007-10-04 16:31:04.000000000 -0400
-@@ -1410,20 +1410,6 @@
-             (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result);
-             (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu);
-         }
--        else if (widget_type == COMBO_BOX_ARROW_BUTTON ||
--                 widget_type == COMBO_BOX_TEXT_FIELD)
--        {
--            /*
+--- openjdk6/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2008-05-30 08:55:40.000000000 +0100
++++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c	2008-06-22 20:47:39.000000000 +0100
+@@ -333,6 +333,7 @@
+ static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
+         const gchar *stock_id, GtkIconSize size, const gchar *detail);
+ static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
++static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
+ static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
+         GtkTextDirection direction);
+ static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
+@@ -570,6 +571,8 @@
+             dl_symbol("gtk_widget_render_icon");
+         fp_gtk_widget_set_name =
+             dl_symbol("gtk_widget_set_name");
++        fp_gtk_widget_set_parent =
++            dl_symbol("gtk_widget_set_parent");
+         fp_gtk_widget_set_direction =
+             dl_symbol("gtk_widget_set_direction");
+         fp_gtk_widget_style_get =
+@@ -1040,7 +1043,7 @@
+                     (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
+             {
+                 gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
+-                     (*fp_gtk_button_new)();
++                     (*fp_gtk_toggle_button_new)();
+             }
+             result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
+             break;
+@@ -1414,12 +1417,20 @@
+                  widget_type == COMBO_BOX_TEXT_FIELD)
+         {
+             /*
 -             * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
 -             * in order to trick engines into thinking it's a real combobox
 -             * arrow button/text field.
 -             */
--            GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
++            * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
++            * in order to trick engines into thinking it's a real combobox
++            * arrow button/text field.
++            */
+             GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
 -            (*fp_gtk_container_add)((GtkContainer *)combo, result);
--            (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
--            (*fp_gtk_widget_realize)(result);
--            return result;
--        }
-         else if (widget_type != TOOL_TIP &&
-                  widget_type != INTERNAL_FRAME &&
-                  widget_type != OPTION_PANE)
++
++            if (widget_type == COMBO_BOX_TEXT_FIELD)
++                (*fp_gtk_container_add)((GtkContainer *)combo, result);
++            else
++            {
++                (*fp_gtk_widget_set_parent)(result, combo);
++                ((GtkBin*)combo)->child = result;
++            }
++
+             (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
+             (*fp_gtk_widget_realize)(result);
+             return result;

From Xiomara.Jayasena at Sun.COM  Mon Jun 23 08:14:07 2008
From: Xiomara.Jayasena at Sun.COM (Xiomara Jayasena)
Date: Mon, 23 Jun 2008 08:14:07 -0700
Subject: JDK 7 build 29 is available at the openjdk.java.net website
In-Reply-To: <17c6771e0806221534i10b2f455nae7d6cd8eaf52c25@mail.gmail.com>
References: <485C2DAF.5010801@sun.com>
	<17c6771e0806221534i10b2f455nae7d6cd8eaf52c25@mail.gmail.com>
Message-ID: <485FBDBF.4000505@sun.com>



Andrew John Hughes wrote:
> On 20/06/2008, Xiomara Jayasena <Xiomara.Jayasena at sun.com> wrote:
>   
>>  The OpenJDK source is available at:
>>  http://hg.openjdk.java.net/jdk7/jdk7
>>  http://hg.openjdk.java.net/jdk7/jdk7/rev/31e08f70e88d
>>
>>  The OpenJDK source binary plugs for the promoted JDK 7 build 29 are
>> available under the openjdk http://openjdk.java.net website under Source
>> Code (direct link to bundles:
>> http://download.java.net/openjdk/jdk7)
>>
>>  Summary of changes:
>>  http://download.java.net/jdk7/changes/jdk7-b29.html
>>
>>  -Xiomara
>>
>>
>>
>>     
>
> While moving IcedTea to b29, I noticed a couple of bugs that don't
> seem to be listed as applied against either b27, b28 or b29 (IcedTea
> was previously on b26), but have been applied:
>
> 6614100 EXCEPTION_ACCESS_VIOLATION while running Eclipse with 1.6.0_05-ea
> 6695553: Cleanup GPLv2+SPL legal notices in hat sources
>
> The second of the two doesn't even appear to be visible.  I obtained
> the bug number from Joe Darcy's announcement of OpenJDK6 b10.
>   

The list of bugs for jdk b29 is unfortunately incomplete.  I am working 
with integrators to ensure all bugs are marked appropriately for each 
build.  I will post a new list by the end of today and if you still have 
questions after that, then please let me know :)

Thanks,
-Xiomara

> Thanks,
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080623/f254c627/attachment.html 

From Dalibor.Topic at Sun.COM  Mon Jun 23 08:49:25 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Mon, 23 Jun 2008 17:49:25 +0200
Subject: javax.script rhino (javascript) support added
In-Reply-To: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
References: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
Message-ID: <485FC605.9030002@Sun.COM>

Mark Wielaard wrote:
> With this patch the jrunscript works perfectly, and the javax.script and
> sun.tools.jscript jtreg tests all pass except for one. The
> sun/tools/jrunscript/jrunscriptTest.sh test insists that 2 + 5 = 7.0,
> while our current implementation says it is 7 (without the .0). The
> tests references two bugs (6265810,6705893) which might help analyze
> this, unfortunately they are closed to the public (is there anybody who
> could see what these bugs were about?).
>   
Hi Mark,

They don't seem to be related, one is about the name of the tool, and 
the other
is about enabling the scripting engine tests conditionally in OpenJDK, see
http://article.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/1951

cheers,
dalibor topic

-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring



From David.Herron at Sun.COM  Mon Jun 23 11:43:15 2008
From: David.Herron at Sun.COM (David Herron)
Date: Mon, 23 Jun 2008 11:43:15 -0700
Subject: javax.script rhino (javascript) support added
In-Reply-To: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
References: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
Message-ID: <485FEEC3.8040102@sun.com>

Mark Wielaard wrote:
> Hi,
>
> This patch adds javax.script javascript support through rhino. CCed
> build-dev since it is mainly build stuff and there doesn't seem to be
> another list for scripting stuff (not that I am advocating yet another
> list!)
>
> The idea is pretty simple, if configure can detect rhino being installed
> on the system already (either the rhino.jar from fedora or the js.jar
> from debian) it uses that instead of the closed and unreleased sun
> internal classes. The only wrinkle is that the javascript support is
> written to expect the implementation on the bootclasspath, I would have
> liked it to be possible to just add it to the extension dir. This is
> solved by patching the hardcoded hotspot boostrap path and creating the
> correct symlink in the jre lib dir.
>
> Maybe the modules project and/or the extension/plugin ideas from icedtea
> can help a bit in the future to rewrite these kind of things a little
> cleaner: http://icedtea.classpath.org/wiki/PackagingExtensions
>
> 2008-06-22  Mark Wielaard  <mark at klomp.org>
>
>         * patches/icedtea-rhino.patch: New patch.
>         * Makefile.am: Add RHINO_JAR to environment variable lists.
>         (ICEDTEA_PATHCES): Add patches/icedtea-rhino.patch.
>         * Makefile.in: Regenerated.
>         * acinclude.m4 (FIND_RHINO_JAR): New.
>         * configure.ac: Use FIND_RHINO_JAR.
>         * configure: Regenerated.
>
> Committed to icedtea6.
>
> With this patch the jrunscript works perfectly, and the javax.script and
> sun.tools.jscript jtreg tests all pass except for one. The
> sun/tools/jrunscript/jrunscriptTest.sh test insists that 2 + 5 = 7.0,
> while our current implementation says it is 7 (without the .0). The
> tests references two bugs (6265810,6705893) which might help analyze
> this, unfortunately they are closed to the public (is there anybody who
> could see what these bugs were about?).
>
> Cheers,
>
> Mark
>   

Hi Mark,

In my JavaOne talk Sandeep and I had worked up a hack with the same 
purpose.  He's been busy enough that he hadn't had a chance to turn the 
hack into an official proposal like this.. 

Here's a couple things I see reading through your patch..

This patch puts a hard dependency on having rhino in your environment.  
Maybe this is okay for IcedTea but in OpenJDK's makefiles I'd rather it 
be a loose dependency (if RHINO_JAR is in the environment, that should 
trigger makefile rules to include RHINO support).

A lot of the changes are in com/sun/script/javascript files to change 
imports from sun.org.mozilla.xyzzy to org.mozilla.xyzzy ... we've been 
following a practice for a long time of munging the package names of 
imported packages, and this came from issues which arose when we 
imported Xerces XML code and people started using some of the Xerces 
API's ...

- David




From gnu_andrew at member.fsf.org  Mon Jun 23 11:46:14 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Jun 2008 19:46:14 +0100
Subject: FYI: [icedtea] Reapply icedtea-sparc.patch as new minimal version
Message-ID: <20080623184614.GA18582@rivendell.middle-earth.co.uk>

This adds back part of the icedtea-sparc.patch which isn't in
OpenJDK.  Thanks to doko for pointing this out.

ChangeLog:

2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* HACKING:
	Add icedtea-sparc.patch to general section.
	* Makefile.am:
	Add icedtea-sparc.patch again.
	* Makefile.in:
	Regenerated.
	* patches/icedtea-sparc.patch:
	New IcedTea minimal version.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 5fbe762d9c35 HACKING
--- a/HACKING	Mon Jun 23 15:23:34 2008 +0100
+++ b/HACKING	Mon Jun 23 19:44:03 2008 +0100
@@ -40,6 +40,7 @@ The following patches are currently appl
 * icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
 * icedtea-lsb-release.patch: Generate Debian LSB file.
 * icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
 * icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
 * icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
 * icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
@@ -60,7 +61,6 @@ The following patches are only applied t
 * icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
 * icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
 * icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
-* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
 
 The following patches are only applied to OpenJDK in IcedTea:
 
diff -r 5fbe762d9c35 Makefile.am
--- a/Makefile.am	Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.am	Mon Jun 23 19:44:03 2008 +0100
@@ -338,6 +338,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 Makefile.in
--- a/Makefile.in	Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.in	Mon Jun 23 19:44:03 2008 +0100
@@ -420,6 +420,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 patches/icedtea-sparc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc.patch	Mon Jun 23 19:44:03 2008 +0100
@@ -0,0 +1,79 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make	2008-06-23 18:57:15.000000000 +0100
+@@ -59,7 +59,7 @@
+ endif
+ 
+ # sparc
+-ifeq ($(ARCH), sparc64)
++ifneq (,$(filter $(ARCH), sparc sparc64))
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2008-06-23 18:57:15.000000000 +0100
+@@ -52,6 +52,10 @@
+ PICFLAG = -fpic
+ endif
+ 
++ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
++PICFLAG = -fPIC
++endif
++
+ VM_PICFLAG/LIBJVM = $(PICFLAG)
+ VM_PICFLAG/AOUT   =
+ 
+diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp	2008-06-22 20:44:42.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp	2008-06-23 18:57:15.000000000 +0100
+@@ -44,3 +44,49 @@
+   // Used to register dynamic code cache area with the OS
+   // Note: Currently only used in 64 bit Windows implementations
+   static bool register_code_area(char *low, char *high) { return true; }
++/*
++ * Copyright 1999-2004 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.
++ *
++ * 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.
++ *
++ */
++
++  //
++  // NOTE: we are back in class os here, not Linux
++  //
++  static jint  (*atomic_xchg_func)        (jint,  volatile jint*);
++  static jint  (*atomic_cmpxchg_func)     (jint,  volatile jint*,  jint);
++  static jlong (*atomic_cmpxchg_long_func)(jlong, volatile jlong*, jlong);
++  static jint  (*atomic_add_func)         (jint,  volatile jint*);
++  static void  (*fence_func)              ();
++
++  static jint  atomic_xchg_bootstrap        (jint,  volatile jint*);
++  static jint  atomic_cmpxchg_bootstrap     (jint,  volatile jint*,  jint);
++  static jlong atomic_cmpxchg_long_bootstrap(jlong, volatile jlong*, jlong);
++  static jint  atomic_add_bootstrap         (jint,  volatile jint*);
++  static void  fence_bootstrap              ();
++
++  static void setup_fpu() {}
++
++  static bool is_allocatable(size_t bytes);
++
++  // Used to register dynamic code cache area with the OS
++  // Note: Currently only used in 64 bit Windows implementations
++  static bool register_code_area(char *low, char *high) { return true; }

From gnu_andrew at member.fsf.org  Mon Jun 23 11:46:27 2008
From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org)
Date: Mon, 23 Jun 2008 18:46:27 +0000
Subject: changeset in /hg/icedtea: Add minimal variant of icedtea-sparc.p...
Message-ID: <hg.8d11b47ce7bc.1214246787.-6899778133799504387@icedtea.classpath.org>

changeset 8d11b47ce7bc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d11b47ce7bc
description:
	Add minimal variant of icedtea-sparc.patch.

	2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* HACKING:
		Add icedtea-sparc.patch to general section.
		* Makefile.am:
		Add icedtea-sparc.patch again.
		* Makefile.in:
		Regenerated.
		* patches/icedtea-sparc.patch:
		New IcedTea minimal version.

diffstat:

5 files changed, 93 insertions(+), 1 deletion(-)
ChangeLog                   |   11 +++++
HACKING                     |    2 -
Makefile.am                 |    1 
Makefile.in                 |    1 
patches/icedtea-sparc.patch |   79 +++++++++++++++++++++++++++++++++++++++++++

diffs (142 lines):

diff -r 5fbe762d9c35 -r 8d11b47ce7bc ChangeLog
--- a/ChangeLog	Mon Jun 23 15:23:34 2008 +0100
+++ b/ChangeLog	Mon Jun 23 19:45:08 2008 +0100
@@ -1,3 +1,14 @@ 2008-06-23  Andrew John Hughes  <gnu_and
+2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* HACKING:
+	Add icedtea-sparc.patch to general section.
+	* Makefile.am:
+	Add icedtea-sparc.patch again.
+	* Makefile.in:
+	Regenerated.
+	* patches/icedtea-sparc.patch:
+	New IcedTea minimal version.
+
 2008-06-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* patches/icedtea-bytecodeInterpreterWithChecks.patch,
diff -r 5fbe762d9c35 -r 8d11b47ce7bc HACKING
--- a/HACKING	Mon Jun 23 15:23:34 2008 +0100
+++ b/HACKING	Mon Jun 23 19:45:08 2008 +0100
@@ -40,6 +40,7 @@ The following patches are currently appl
 * icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
 * icedtea-lsb-release.patch: Generate Debian LSB file.
 * icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
 * icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
 * icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
 * icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
@@ -60,7 +61,6 @@ The following patches are only applied t
 * icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
 * icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
 * icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
-* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
 
 The following patches are only applied to OpenJDK in IcedTea:
 
diff -r 5fbe762d9c35 -r 8d11b47ce7bc Makefile.am
--- a/Makefile.am	Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.am	Mon Jun 23 19:45:08 2008 +0100
@@ -338,6 +338,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 -r 8d11b47ce7bc Makefile.in
--- a/Makefile.in	Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.in	Mon Jun 23 19:45:08 2008 +0100
@@ -420,6 +420,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
 	patches/icedtea-color-createcontext.patch \
 	patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
+	patches/icedtea-sparc.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 -r 8d11b47ce7bc patches/icedtea-sparc.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc.patch	Mon Jun 23 19:45:08 2008 +0100
@@ -0,0 +1,79 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make	2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make	2008-06-23 18:57:15.000000000 +0100
+@@ -59,7 +59,7 @@
+ endif
+ 
+ # sparc
+-ifeq ($(ARCH), sparc64)
++ifneq (,$(filter $(ARCH), sparc sparc64))
+   ifeq ($(ARCH_DATA_MODEL), 64)
+     ARCH_DATA_MODEL  = 64
+     MAKE_ARGS        += LP64=1
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make	2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make	2008-06-23 18:57:15.000000000 +0100
+@@ -52,6 +52,10 @@
+ PICFLAG = -fpic
+ endif
+ 
++ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
++PICFLAG = -fPIC
++endif
++
+ VM_PICFLAG/LIBJVM = $(PICFLAG)
+ VM_PICFLAG/AOUT   =
+ 
+diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp	2008-06-22 20:44:42.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp	2008-06-23 18:57:15.000000000 +0100
+@@ -44,3 +44,49 @@
+   // Used to register dynamic code cache area with the OS
+   // Note: Currently only used in 64 bit Windows implementations
+   static bool register_code_area(char *low, char *high) { return true; }
++/*
++ * Copyright 1999-2004 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.
++ *
++ * 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.
++ *
++ */
++
++  //
++  // NOTE: we are back in class os here, not Linux
++  //
++  static jint  (*atomic_xchg_func)        (jint,  volatile jint*);
++  static jint  (*atomic_cmpxchg_func)     (jint,  volatile jint*,  jint);
++  static jlong (*atomic_cmpxchg_long_func)(jlong, volatile jlong*, jlong);
++  static jint  (*atomic_add_func)         (jint,  volatile jint*);
++  static void  (*fence_func)              ();
++
++  static jint  atomic_xchg_bootstrap        (jint,  volatile jint*);
++  static jint  atomic_cmpxchg_bootstrap     (jint,  volatile jint*,  jint);
++  static jlong atomic_cmpxchg_long_bootstrap(jlong, volatile jlong*, jlong);
++  static jint  atomic_add_bootstrap         (jint,  volatile jint*);
++  static void  fence_bootstrap              ();
++
++  static void setup_fpu() {}
++
++  static bool is_allocatable(size_t bytes);
++
++  // Used to register dynamic code cache area with the OS
++  // Note: Currently only used in 64 bit Windows implementations
++  static bool register_code_area(char *low, char *high) { return true; }


From mark at klomp.org  Mon Jun 23 14:06:22 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 23 Jun 2008 23:06:22 +0200
Subject: javax.script rhino (javascript) support added
In-Reply-To: <485FEEC3.8040102@sun.com>
References: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
	<485FEEC3.8040102@sun.com>
Message-ID: <1214255183.3308.9.camel@hermans.wildebeest.org>

Hi David,

On Mon, 2008-06-23 at 11:43 -0700, David Herron wrote:
> Mark Wielaard wrote:
> In my JavaOne talk Sandeep and I had worked up a hack with the same 
> purpose.  He's been busy enough that he hadn't had a chance to turn the 
> hack into an official proposal like this.. 

That is cool, I didn't know that.
Is your presentation online somewhere?

> This patch puts a hard dependency on having rhino in your environment.  
> Maybe this is okay for IcedTea but in OpenJDK's makefiles I'd rather it 
> be a loose dependency (if RHINO_JAR is in the environment, that should 
> trigger makefile rules to include RHINO support).

Yes, we can do that. My thinking was that if it is always included in
closedjdk6 we want to also always provide it in the free version.

> A lot of the changes are in com/sun/script/javascript files to change 
> imports from sun.org.mozilla.xyzzy to org.mozilla.xyzzy ... we've been 
> following a practice for a long time of munging the package names of 
> imported packages, and this came from issues which arose when we 
> imported Xerces XML code and people started using some of the Xerces 
> API's ...

hmmm, that seems not the right thing to do for the free version that
gets integrated with the various GNU/Linux distros. The patch
deliberately makes it so that the code isn't actually imported and
emedded , but that it uses the system provided rhino. The idea is that
these kind of external dependencies are provided by the distribution.
That way a user automatically gets bug fixes or security updates without
having to audit every package which might have integrated an old
(renamed) library.

I would like to find a way to do this cleaner though. But the current
code relies on being on the bootclasspath which makes things a little
tricky.

Cheers,

Mark



From Dalibor.Topic at Sun.COM  Mon Jun 23 15:09:33 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Tue, 24 Jun 2008 00:09:33 +0200
Subject: javax.script rhino (javascript) support added
In-Reply-To: <1214255183.3308.9.camel@hermans.wildebeest.org>
References: <1214213379.32610.44.camel@dijkstra.wildebeest.org>
	<485FEEC3