From andrew at icedtea.classpath.org  Sun Nov  1 11:09:54 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sun, 01 Nov 2009 19:09:54 +0000
Subject: /hg/icedtea: Bump to b75 with upstream Zero and make Shark build.
Message-ID: <hg.d3256a5c9afe.1257102594.-6899778133799504387@icedtea.classpath.org>

changeset d3256a5c9afe in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d3256a5c9afe
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Nov 01 19:13:55 2009 +0000

	Bump to b75 with upstream Zero and make Shark build.

	2009-11-01 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-float-double-trailing-zeros.patch:
	Dropped, in b75.
		* Makefile.am: Bump to b75.
		* patches/boot/icedtea-hotspot-default.patch,
		* patches/boot/icedtea.patch: Regenerated.
		* patches/hotspot/default/icedtea-shark-build.patch: Use
	VARIANTARCH not BUILDARCH. Use platform_zero directly and
	pass VARIANTARCH through to subbuild. Add rule for
	SHARK_DIR.
		* patches/icedtea-shark-build.patch: Put ICEDTEA_SHARK_BUILD
	prior to ZERO_BUILD test.
		* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Rename
	encoding to constant_encoding inline with upstream.
		* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Use
	should_be_constant instead of has_encoding inline with upstream.


diffstat:

9 files changed, 239 insertions(+), 227 deletions(-)
ChangeLog                                            |   19 +
Makefile.am                                          |   35 +--
patches/boot/icedtea-hotspot-default.patch           |   20 -
patches/boot/icedtea.patch                           |  188 +++++++++---------
patches/hotspot/default/icedtea-shark-build.patch    |  152 ++++++++------
patches/icedtea-float-double-trailing-zeros.patch    |   29 --
patches/icedtea-shark-build.patch                    |   19 +
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp |    2 
ports/hotspot/src/share/vm/shark/sharkConstant.cpp   |    2 

diffs (truncated from 888 to 500 lines):

diff -r 7100c9f14ffa -r d3256a5c9afe ChangeLog
--- a/ChangeLog	Thu Oct 29 15:00:12 2009 +0000
+++ b/ChangeLog	Sun Nov 01 19:13:55 2009 +0000
@@ -1,3 +1,22 @@ 2009-10-28  Andrew John Hughes  <ahughes
+2009-11-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-float-double-trailing-zeros.patch:
+	Dropped, in b75.
+	* Makefile.am: Bump to b75.
+	* patches/boot/icedtea-hotspot-default.patch,
+	* patches/boot/icedtea.patch:
+	Regenerated.
+	* patches/hotspot/default/icedtea-shark-build.patch:
+	Use VARIANTARCH not BUILDARCH.  Use platform_zero
+	directly and pass VARIANTARCH through to subbuild.
+	Add rule for SHARK_DIR.
+	* patches/icedtea-shark-build.patch:
+	Put ICEDTEA_SHARK_BUILD prior to ZERO_BUILD test.
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp:
+	Rename encoding to constant_encoding inline with upstream.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp:
+	Use should_be_constant instead of has_encoding inline with upstream.
+
 2009-10-28  Andrew John Hughes  <ahughes at redhat.com>
 
 	Fix build failures with Shark.
diff -r 7100c9f14ffa -r d3256a5c9afe Makefile.am
--- a/Makefile.am	Thu Oct 29 15:00:12 2009 +0000
+++ b/Makefile.am	Sun Nov 01 19:13:55 2009 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
-OPENJDK_VERSION = b74
-
-CORBA_CHANGESET = ddc6504bb4f3
-HOTSPOT_CHANGESET = 4aad6284518e
-JAXP_CHANGESET  = 1da2b57e4825
-JAXWS_CHANGESET = b176d7a1d9e9
-JDK_CHANGESET = 6d6f38ba8a03
-LANGTOOLS_CHANGESET = 27f109855e7f
-OPENJDK_CHANGESET = f8e6c40ffac8
-
-CORBA_MD5SUM = 1e931327890c8951d98e27bdfb54021b
-HOTSPOT_MD5SUM = 99e631c28819d643cbf1dcca0d3f4a99
-JAXP_MD5SUM = f1bef1d655513d450e0a57db6bf2e87c
-JAXWS_MD5SUM = 4524646c2cb4e21f80bd17408485588e
-JDK_MD5SUM = 62599b14fbf2352c5cc1cb23ccbef683
-LANGTOOLS_MD5SUM = c04a42138a860df67a396de51fcf11b6
-OPENJDK_MD5SUM = bad6c4ca26dfc18aa719dc9636a5c353
+OPENJDK_VERSION = b75
+
+CORBA_CHANGESET = d4f1f79e9231
+HOTSPOT_CHANGESET = 0c593310a62c
+JAXP_CHANGESET  = 1ff97e23727b
+JAXWS_CHANGESET = 7a525c434bc9
+JDK_CHANGESET = 70b5a4c7b35d
+LANGTOOLS_CHANGESET = 4b3ebc896806
+OPENJDK_CHANGESET = aeb73b347f3a
+
+CORBA_MD5SUM = cbdf4c993b0617ccddcb01a649e2eb05
+HOTSPOT_MD5SUM = 4508ff8d599b5ae3b094eaa3f8dfd494
+JAXP_MD5SUM = 2055c0ab13fea8c2597d7f3367905faa
+JAXWS_MD5SUM = 50ba89fa406b179e2ac20dd11cf37c5d
+JDK_MD5SUM = e98d4f2f0a74cc96ff7fa7838166d2dd
+LANGTOOLS_MD5SUM = 672ed2024d4d8787eefbbdebd1266c07
+OPENJDK_MD5SUM = fd027dba070b73a164a32a30f8807470
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -268,7 +268,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-gcc-suffix.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
-	patches/icedtea-float-double-trailing-zeros.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
 	patches/icedtea-libraries.patch \
diff -r 7100c9f14ffa -r d3256a5c9afe patches/boot/icedtea-hotspot-default.patch
--- a/patches/boot/icedtea-hotspot-default.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea-hotspot-default.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk-boot.orig/hotspot/make
-diff -Nru openjdk-boot.orig/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
---- openjdk-boot.orig/hotspot/make/linux/Makefile	2009-09-28 13:20:29.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/Makefile	2009-09-28 16:06:27.000000000 +0100
-@@ -280,35 +280,30 @@
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
+@@ -287,35 +287,30 @@
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -32,14 +32,14 @@ diff -Nru openjdk-boot.orig/hotspot/make
  endif
  
  $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
- 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
--	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
  ifdef INSTALL
- 	cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
  endif
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make	2009-09-22 20:05:24.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-09-28 16:06:18.000000000 +0100
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-10-30 15:58:31.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make	2009-10-30 17:44:58.000000000 +0000
 @@ -38,7 +38,9 @@
  GENERATED = $(TOPDIR)/../generated
  
diff -r 7100c9f14ffa -r d3256a5c9afe patches/boot/icedtea.patch
--- a/patches/boot/icedtea.patch	Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea.patch	Sun Nov 01 19:13:55 2009 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/make/c
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -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
@@ -10,9 +10,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
  all build clean clobber::
  	$(SUBDIRS-loop)
  
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -0,0 +1,38 @@
 +#
 +# Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
@@ -52,9 +52,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
 +# Include
 +#
 +include $(BUILDDIR)/common/Classes.gmk
-diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk	2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk	2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Defs.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -53,6 +53,13 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -87,9 +87,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
  VPATH.java = $(VPATH0.java)
  vpath %.java $(VPATH.java)
  vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/corba/make/common/Defs-linux.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -276,7 +276,7 @@
  		    fi; \
  		  done)
@@ -99,9 +99,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
  
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can
-diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk	2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Rules.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk	2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Rules.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -187,7 +187,10 @@
  	@$(MKDIR) -p $(CLASSDESTDIR)
  	if [ -s $(JAVA_SOURCE_LIST) ] ; then \
@@ -114,9 +114,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
  	fi
  	@$(java-vm-cleanup)
  
-diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk	2009-09-04 02:41:12.000000000 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-09-04 02:41:12.000000000 +0100
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -135,31 +135,14 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -155,9 +155,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
  
  # Override of what javac to use (see deploy workspace)
  ifdef JAVAC
-diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
---- openjdk-boot.orig/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile	2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/org/omg/sources/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -93,8 +93,6 @@
  POAHELHOLFILES =    $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
  
@@ -234,9 +234,9 @@ diff -Nru openjdk-boot.orig/corba/make/o
  
  pi.compile: $(PIGENERATEDFILES)
  
-diff -Nru openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-03-30 23:07:09.000000000 +0100
++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -172,7 +172,6 @@
  ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
  
@@ -253,9 +253,9 @@ diff -Nru openjdk-boot.orig/corba/make/s
  
  portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
  
-diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml	2009-10-03 00:22:23.000000000 +0100
-+++ openjdk-boot/jaxp/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/build.xml openjdk-boot/jaxp/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxp/build.xml	2009-10-03 00:22:23.000000000 +0100
++++ openjdk-boot/jaxp/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -112,7 +112,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -266,9 +266,9 @@ diff -Nru openjdk-boot.orig/jaxp/build.x
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
---- openjdk-boot.orig/jaxp/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxp/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxp/make/Makefile	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxp/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -110,6 +110,7 @@
  ifdef ALT_LANGTOOLS_DIST
    ifdef ALT_BOOTDIR
@@ -277,9 +277,9 @@ diff -Nru openjdk-boot.orig/jaxp/make/Ma
    endif
    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
  else
-diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml	2009-10-03 00:57:53.000000000 +0100
-+++ openjdk-boot/jaxws/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/build.xml openjdk-boot/jaxws/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxws/build.xml	2009-10-03 00:57:53.000000000 +0100
++++ openjdk-boot/jaxws/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -112,7 +112,8 @@
               memoryMaximumSize="${javac.memoryMaximumSize}"
               source="${javac.source}"
@@ -290,9 +290,9 @@ diff -Nru openjdk-boot.orig/jaxws/build.
              <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
              <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
              <src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxws/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxws/make/Makefile	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxws/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -111,6 +111,7 @@
    ifdef ALT_BOOTDIR
      ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -301,9 +301,9 @@ diff -Nru openjdk-boot.orig/jaxws/make/M
    endif
    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
  else
-diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -43,7 +43,8 @@
  	@$(prep-target)
  	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -314,9 +314,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
  	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
  	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
  	    $(BOOT_JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk	2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/common/Release.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -650,10 +650,21 @@
  RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
  $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
@@ -377,9 +377,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
  ifneq ($(PLATFORM), windows)
  	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
  endif # !windows
-diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Rules.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/Rules.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -237,8 +237,9 @@
  	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
  	  $(CAT) $<.filtered; \
@@ -405,9 +405,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
  	@$(java-vm-cleanup)
  	@$(TOUCH) $@
  
-diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -136,33 +136,22 @@
  JAVACFLAGS  += $(OTHER_JAVACFLAGS)
  
@@ -442,10 +442,10 @@ diff -Nru openjdk-boot.orig/jdk/make/com
 -  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
  endif
  
- #always use the bootstrap javah until bug-ID 6889255 is fixed.  These
-diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/java/nio/Makefile	2009-10-26 13:38:03.000000000 +0000
+ # Override of what javac to use (see deploy workspace)
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile	2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/java/nio/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -31,7 +31,7 @@
  PACKAGE = java.nio
  LIBRARY = nio
@@ -455,9 +455,9 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
  include $(BUILDDIR)/common/Defs.gmk
  
  NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
---- openjdk-boot.orig/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/java/text/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile	2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/java/text/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -81,8 +81,8 @@
  		-sourcepath $(TEXT_SRCDIR) \
  		$(TEXT_SOURCES)
@@ -469,9 +469,9 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
  		-o $(TEXT_CLASSDIR) \
  		-spec $(UNICODEDATA)/UnicodeData.txt
  	@$(java-vm-cleanup)
-diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/Makefile	2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -239,7 +239,7 @@
  
  all build:: sanity-all post-sanity-all
@@ -481,18 +481,18 @@ diff -Nru openjdk-boot.orig/jdk/make/Mak
  all build::
  	$(SUBDIRS-loop)
  
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk	2009-10-30 16:59:16.000000000 +0000
 @@ -189,3 +189,5 @@
  	java/awt/dnd/DnDConstants.java \
  	sun/awt/CausedFocusEvent.java
  
 +EXPORTED_inner = \
 +    sun.java2d.opengl.OGLContext$$OGLContextCaps
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
---- openjdk-boot.orig/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile	2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -401,10 +401,9 @@
  COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
  
@@ -507,9 +507,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
  	@$(java-vm-cleanup)
  
  fontconfigs.clean :
-diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
---- openjdk-boot.orig/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/javazic/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -62,7 +62,8 @@
  $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
  	$(RM) -r $(@D)
@@ -520,9 +520,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
  	@$(java-vm-cleanup)
  
  $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
---- openjdk-boot.orig/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/text/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile	2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/text/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -85,8 +85,9 @@
  	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
  		-sourcepath $(TEXT_SRCDIR) \
@@ -535,9 +535,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
  		-o $(CLASSDESTDIR)/sun/text/resources \
  		-spec $(UNICODEDATA)/UnicodeData.txt \
  		-language th
-diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- openjdk-boot.orig/jdk/make/sun/xawt/Makefile	2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-30 16:49:39.000000000 +0000
++++ openjdk-boot/jdk/make/sun/xawt/Makefile	2009-10-30 16:59:16.000000000 +0000
 @@ -294,11 +294,7 @@
  
  TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -574,9 +574,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
  	    $(ECHO) "}; }" >> $$classname;  \
  	done
  	$(TOUCH) $@
-diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-23 15:58:41.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+--- ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-30 16:49:08.000000000 +0000
++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java	2009-10-30 16:59:16.000000000 +0000
 @@ -647,9 +647,6 @@
              throws FileNotFoundException, IOException {
          BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -595,9 +595,9 @@ diff -Nru openjdk-boot.orig/jdk/make/too
  
                  if (plane == 0 && bLatin1 == false) {
              genCaseMapTableDeclaration(result);
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java	2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java	2009-10-30 16:59:16.000000000 +0000
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffffffffffP+1023} and also equal to
       * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -625,9 +625,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
  
      /**
       * Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java	2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java	2009-10-30 16:59:16.000000000 +0000
 @@ -76,7 +76,7 @@
       * {@code 0x1.fffffeP+127f} and also equal to
       * {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -655,9 +655,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
  
      /**
       * Maximum exponent a finite {@code float} variable may have.  It
-diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-03-30 17:23:07.000000000 +0100
++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h	2009-10-30 16:59:16.000000000 +0000
 @@ -27,6 +27,7 @@
  #define OGLContext_h_Included
  
@@ -722,9 +722,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
  
  /**
   * Evaluates to true if the given capability bitmask is present for the
-diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml	2009-10-21 16:40:37.000000000 +0100
-+++ openjdk-boot/langtools/make/build.xml	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
+--- ../openjdk.orig/openjdk-boot/langtools/make/build.xml	2009-10-21 16:40:37.000000000 +0100
++++ openjdk-boot/langtools/make/build.xml	2009-10-30 16:59:16.000000000 +0000
 @@ -524,6 +524,7 @@
                         includeAntRuntime="no"
                         source="@{javac.source}"
@@ -741,9 +741,9 @@ diff -Nru openjdk-boot.orig/langtools/ma
                      <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                      <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
                      <compilerarg line="${javac.no.jdk.warnings}"/>
-diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
---- openjdk-boot.orig/langtools/make/Makefile	2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/langtools/make/Makefile	2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
+--- ../openjdk.orig/openjdk-boot/langtools/make/Makefile	2009-10-30 16:49:36.000000000 +0000


From bugzilla-daemon at icedtea.classpath.org  Sun Nov  1 20:01:12 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 04:01:12 +0000
Subject: [Bug 397] New: SIGSEGV while running Vuze with icedtea6-1.6.1
Message-ID: <E1N4o6S-00068j-Vp@icedtea.classpath.org>

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

           Summary: SIGSEGV while running Vuze with icedtea6-1.6.1
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: paul at pmarks.net


Whenever I run Vuze 4.2.0.8 (and lots of previous versions), it crashes within
a day or so.  I decided to run it in a console to see the output, and the Java
Runtime produced an error log.

(I will attach the error log as soon as I figure out how.)


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov  1 20:01:52 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 04:01:52 +0000
Subject: [Bug 397] SIGSEGV while running Vuze with icedtea6-1.6.1
Message-ID: <E1N4o76-00068v-4U@icedtea.classpath.org>

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





------- Comment #1 from paul at pmarks.net  2009-11-02 04:01 -------
Created an attachment (id=270)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=270&action=view)
Error log 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  Sun Nov  1 20:02:43 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 04:02:43 +0000
Subject: [Bug 397] SIGSEGV while running Vuze with icedtea6-1.6.1
Message-ID: <E1N4o7v-000694-3y@icedtea.classpath.org>

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


paul at pmarks.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
    Attachment #270|text/x-log                  |text/plain
          mime type|                            |
    Attachment #270|hs_err_pid914.log           |hs_err_pid914.log.txt
           filename|                            |




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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov  1 20:06:42 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 04:06:42 +0000
Subject: [Bug 397] SIGSEGV while running Vuze with icedtea6-1.6.1
Message-ID: <E1N4oBm-00069C-E6@icedtea.classpath.org>

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





------- Comment #2 from paul at pmarks.net  2009-11-02 04:06 -------
This may also be relevant.  The following IOError appeared on the console
before the SIGSEGV, but I'm unsure how much time had elapsed.

The machine I'm running this on does have a fully-functioning IPv6 connection.


java.io.IOException: Address family not supported by protocol
        at java.net.PlainDatagramSocketImpl.send(Native Method)
        at java.net.DatagramSocket.send(DatagramSocket.java:616)
        at
com.aelitis.net.udp.uc.impl.PRUDPPacketHandlerImpl.send(PRUDPPacketHandlerImpl.java:1292)
        at
com.aelitis.azureus.core.dht.transport.udp.impl.packethandler.DHTUDPPacketHandler.send(DHTUDPPacketHandler.java:250)
        at
com.aelitis.azureus.core.dht.transport.udp.impl.DHTTransportUDPImpl.process(DHTTransportUDPImpl.java:3533)
        at
com.aelitis.azureus.core.dht.transport.udp.impl.packethandler.DHTUDPPacketHandler.receive(DHTUDPPacketHandler.java:290)
        at
com.aelitis.azureus.core.dht.transport.udp.impl.packethandler.DHTUDPPacketHandlerFactory.process(DHTUDPPacketHandlerFactory.java:176)
        at
com.aelitis.azureus.core.dht.transport.udp.impl.packethandler.DHTUDPPacketNetworkHandler.process(DHTUDPPacketNetworkHandler.java:75)
        at
com.aelitis.net.udp.uc.impl.PRUDPPacketHandlerImpl$4.runSupport(PRUDPPacketHandlerImpl.java:767)
        at org.gudy.azureus2.core3.util.AEThread.run(AEThread.java:74)
[net] PRUDPPacketHandler: send to /2002:c349:771b:0:0:0:c349:771b:37636 failed:
Address family not supported by protocol


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


From bugzilla-daemon at icedtea.classpath.org  Mon Nov  2 02:17:57 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 10:17:57 +0000
Subject: [Bug 398] New: hotspot hs16 / 6b17 build failure on sparc
Message-ID: <E1N4tz3-0006g0-M5@icedtea.classpath.org>

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

           Summary: hotspot hs16 / 6b17 build failure on sparc
           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


g++-4.4 -DLINUX -D_GNU_SOURCE -DSPARC -DPRODUCT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/asm
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/c1
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/ci
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/classfile
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/code
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/compiler
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation/g1
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/gc_interface
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/interpreter
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/libadt
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/memory
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/oops
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/opto
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/prims
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/runtime
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/services
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/shark
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/share/vm/utilities
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/os/linux/vm
-I/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/os_cpu/linux_sparc/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"16.0-b10\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"buildd\""
-DHOTSPOT_LIB_ARCH=\"sparc\" -DJRE_RELEASE_VERSION="\"1.6.0_0-b17\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti
-fno-exceptions -D_REENTRANT -fcheck-new -m32 -mcpu=v9 -pipe -g -O3
-fno-strict-aliasing -Werror -Wpointer-arith -Wsign-compare    -c -x c++-header
-c ../generated/incls/_precompiled.incl -o incls/_precompiled.incl.gch 
In file included from ../generated/incls/_precompiled.incl:255:
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:
In member function 'void MacroAssembler::set_oop(_jobject*, RegisterImpl*)':
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:690:
error: no matching function for call to
'MacroAssembler::set_oop(AddressLiteral, RegisterImpl*&)'
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:689:
note: candidates are: void MacroAssembler::set_oop(_jobject*, RegisterImpl*)
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp:2239:
note:                 void MacroAssembler::set_oop(AddressLiteral&,
RegisterImpl*)
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:
In member function 'void MacroAssembler::set_oop_constant(_jobject*,
RegisterImpl*)':
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:695:
error: no matching function for call to
'MacroAssembler::set_oop(AddressLiteral, RegisterImpl*&)'
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp:689:
note: candidates are: void MacroAssembler::set_oop(_jobject*, RegisterImpl*)
/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp:2239:
note:                 void MacroAssembler::set_oop(AddressLiteral&,
RegisterImpl*)
make[7]: *** [incls/_precompiled.incl.gch] Error 1
make[7]: Leaving directory
`/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product'
make[6]: *** [the_vm] Error 2
make[6]: Leaving directory
`/build/buildd/openjdk-6-6b17~pre2/build/openjdk-ecj/build/linux-sparc/hotspot/outputdir/linux_sparc_compiler2/product'
make[5]: *** [product] Error 2


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


From mjw at redhat.com  Mon Nov  2 06:03:21 2009
From: mjw at redhat.com (Mark Wielaard)
Date: Mon, 02 Nov 2009 15:03:21 +0100
Subject: [patch] Allow compiling against newer X11 headers
Message-ID: <1257170602.3265.47.camel@springer.wildebeest.org>

Hi,

Recent X11 headers have reorganized some shm related constants and
structs making it necessary to patch around how awt_GraphicsEnv.h does
some things. Fedora has included this patch for some time now, and
recently several people on this list asked about it.

I added a configure check to see whether or not it is necessary to apply
the patch. This makes icedtea6 build out of the box on older (fedora 11)
and newer (fedora 12/rawhide) systems.

2009-11-02  Mark Wielaard  <mjw at redhat.com>

    * configure.ac: Check whether the new X11/extensions/shmproto.h 
    header is available.
    * Makefile.am: Add patches/icedtea-xshm.patch if new header
    detected.
    * patches/icedtea-xshm.patch: New patch.

Let me know if it looks sane and I will update Hacking and the wiki with
the info.

Thanks,

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

From caster at gentoo.org  Mon Nov  2 08:14:38 2009
From: caster at gentoo.org (Vlastimil Babka)
Date: Mon, 02 Nov 2009 17:14:38 +0100
Subject: [patch] Allow compiling against newer X11 headers
In-Reply-To: <1257170602.3265.47.camel@springer.wildebeest.org>
References: <1257170602.3265.47.camel@springer.wildebeest.org>
Message-ID: <4AEF056E.9080704@gentoo.org>

Mark Wielaard wrote:
> I added a configure check to see whether or not it is necessary to apply
> the patch. This makes icedtea6 build out of the box on older (fedora 11)
> and newer (fedora 12/rawhide) systems.
> 
> Let me know if it looks sane and I will update Hacking and the wiki with
> the info.

Hi,

I was solving this problem in gentoo recently and I found the fedora
patch a bit dangerous as it defines a structure from XShm.h manually.
I've created another patch that is applied not to awt_GraphicsEnv.h but
awt_GraphicsEnv.c (where the missing constant is actually used) and it
just includes Xmd.h and shmproto.h to get the constant (surrounded by a
MITSHM ifdef, as is the place of the actual constant usage). The
awt_GraphicsEnv.h still includes Xshm.h with the struct that Fedora
patch defines manually.
But I have to admit I'm not an expert on this, maybe there were reasons
behind the Fedora patch I don't know, but this one seems to work. I'm
attaching it.

I however didn't create configure check (mostly for lack of skills there
:), we apply the patch conditionally in the gentoo ebuild for now.
But I believe the logic of the check should go like this:
- check if libXext (xext in pkg-config) is of version >= 1.1.1 - if it
is, we know that we need also the shmproto.h
- if yes, check that shmproto.h is present (or that xextproto is of
version >=7.1.1), fail if it isn't

If we check just for the existence of shmproto.h, it will fail in case
libXext is of the new version (and the constant is no longer in XShm.h)
but there is no xextproto and thus shmproto.h (it's only a build dep
AFAIK so might not be present on all systems?).

Hope it helps,
Vlastimil
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 1.6.1-shmproto.patch
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091102/1fb21f87/1.6.1-shmproto.patch 

From gnu_andrew at member.fsf.org  Mon Nov  2 11:40:48 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 2 Nov 2009 19:40:48 +0000
Subject: [patch] Allow compiling against newer X11 headers
In-Reply-To: <4AEF056E.9080704@gentoo.org>
References: <1257170602.3265.47.camel@springer.wildebeest.org>
	<4AEF056E.9080704@gentoo.org>
Message-ID: <17c6771e0911021140u84f8316q61cd213c94a74ef5@mail.gmail.com>

2009/11/2 Vlastimil Babka <caster at gentoo.org>:
> Mark Wielaard wrote:
>> I added a configure check to see whether or not it is necessary to apply
>> the patch. This makes icedtea6 build out of the box on older (fedora 11)
>> and newer (fedora 12/rawhide) systems.
>>
>> Let me know if it looks sane and I will update Hacking and the wiki with
>> the info.
>
> Hi,
>
> I was solving this problem in gentoo recently and I found the fedora
> patch a bit dangerous as it defines a structure from XShm.h manually.
> I've created another patch that is applied not to awt_GraphicsEnv.h but
> awt_GraphicsEnv.c (where the missing constant is actually used) and it
> just includes Xmd.h and shmproto.h to get the constant (surrounded by a
> MITSHM ifdef, as is the place of the actual constant usage). The
> awt_GraphicsEnv.h still includes Xshm.h with the struct that Fedora
> patch defines manually.
> But I have to admit I'm not an expert on this, maybe there were reasons
> behind the Fedora patch I don't know, but this one seems to work. I'm
> attaching it.
>
> I however didn't create configure check (mostly for lack of skills there
> :), we apply the patch conditionally in the gentoo ebuild for now.
> But I believe the logic of the check should go like this:
> - check if libXext (xext in pkg-config) is of version >= 1.1.1 - if it
> is, we know that we need also the shmproto.h
> - if yes, check that shmproto.h is present (or that xextproto is of
> version >=7.1.1), fail if it isn't
>
> If we check just for the existence of shmproto.h, it will fail in case
> libXext is of the new version (and the constant is no longer in XShm.h)
> but there is no xextproto and thus shmproto.h (it's only a build dep
> AFAIK so might not be present on all systems?).
>
> Hope it helps,
> Vlastimil
>
> --- /dev/null ? 2009-10-29 20:00:29.463258316 +0100
> +++ patches/icedtea-shmproto.patch ? ? ?2009-10-29 21:02:36.000000000 +0100
> @@ -0,0 +1,13 @@
> +--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c.orig ? ? ?2009-10-29 21:01:01.000000000 +0100
> ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ? 2009-10-29 21:01:56.000000000 +0100
> +@@ -45,6 +45,10 @@
> + #include <stdlib.h>
> +
> + #include "awt_GraphicsEnv.h"
> ++#ifdef MITSHM
> ++#include <X11/Xmd.h>
> ++#include <X11/extensions/shmproto.h>
> ++#endif
> + #include "awt_Window.h"
> + #include "awt_util.h"
> + #include "gdefs.h"
> --- Makefile.am.orig ? ?2009-10-29 21:35:23.000000000 +0100
> +++ Makefile.am 2009-10-29 21:35:50.000000000 +0100
> @@ -708,6 +708,7 @@
> ? ? ? ?patches/icedtea-explicit-target-arch.patch \
> ? ? ? ?patches/openjdk/6648816.patch \
> ? ? ? ?patches/openjdk/oj100103-debugger-socket-overflow.patch \
> + ? ? ? patches/icedtea-shmproto.patch \
> ? ? ? ?$(DISTRIBUTION_PATCHES)
>
> ?stamps/extract.stamp: stamps/download.stamp
>
>

Hi Mark, Vlastimil,

Having seen both patches before, I'd personally prefer we just added
the necessary headers if that works, rather than the additional cruft
we have in the Fedora patch.  We should do that in awt_GraphicsEnv.h
though, as in the Fedora patch, which would also remove the need for
the #ifdef MITSHM (it's in awt_GraphicsEnv.h already).  So basically
the Fedora patch but without the removal of the XShm.h include and the
additional structs.

Though I've been aware of this for a while, I deliberately haven't
upgraded my own build systems to the new version because it will break
OpenJDK builds for which we don't yet have a solution.  Does anyone
know of some versioning defines in the X headers that would avoid us
having to use a configure check, and thus allow the patch to be
submitted upstream? I believe the change
(http://lists.x.org/archives/xorg-devel/2009-June/001242.html) appears
in libXext 1.1.1 as Vlastimil says, but is there a way of detecting
that other than with autoconf?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From caster at gentoo.org  Mon Nov  2 13:06:23 2009
From: caster at gentoo.org (Vlastimil Babka)
Date: Mon, 02 Nov 2009 22:06:23 +0100
Subject: [patch] Allow compiling against newer X11 headers
In-Reply-To: <17c6771e0911021140u84f8316q61cd213c94a74ef5@mail.gmail.com>
References: <1257170602.3265.47.camel@springer.wildebeest.org>	
	<4AEF056E.9080704@gentoo.org>
	<17c6771e0911021140u84f8316q61cd213c94a74ef5@mail.gmail.com>
Message-ID: <4AEF49CF.3060002@gentoo.org>

Andrew John Hughes wrote:
 > Hi Mark, Vlastimil,

Hi Andrew,

> Having seen both patches before, I'd personally prefer we just added
> the necessary headers if that works, rather than the additional cruft
> we have in the Fedora patch.  We should do that in awt_GraphicsEnv.h
> though, as in the Fedora patch, which would also remove the need for
> the #ifdef MITSHM (it's in awt_GraphicsEnv.h already).  So basically
> the Fedora patch but without the removal of the XShm.h include and the
> additional structs.

Sure, why not. I just included it in the .c file because the .h file
didn't use the constant and I hoped to minimize potential symbol
collisions or something (suspected something like that could be the
reason for the weird Fedora patch).

> Though I've been aware of this for a while, I deliberately haven't
> upgraded my own build systems to the new version because it will break
> OpenJDK builds for which we don't yet have a solution.  Does anyone
> know of some versioning defines in the X headers that would avoid us
> having to use a configure check, and thus allow the patch to be
> submitted upstream? I believe the change
> (http://lists.x.org/archives/xorg-devel/2009-June/001242.html) appears
> in libXext 1.1.1 as Vlastimil says, but is there a way of detecting
> that other than with autoconf?

I don't know about versioning defines, but maybe the simple test Diego
suggested on our IRC channel could work in this case?

#include <XShm.h>
#ifndef X_ShmAttach
#include <X11/Xmd.h>
#include <X11/extensions/shmproto.h>
#endif

Vlastimil


From andrew at icedtea.classpath.org  Mon Nov  2 13:39:23 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 02 Nov 2009 21:39:23 +0000
Subject: /hg/icedtea: 4 new changesets
Message-ID: <hg.864e5903d8e2.1257197962.-6899778133799504387@icedtea.classpath.org>

changeset 864e5903d8e2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=864e5903d8e2
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 02 19:00:19 2009 +0000

	Cleanup the existing clean targets and add missing ones.

	2009-11-02 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-local): New target which
	removes all but the downloaded tarballs. (distclean-
	local): Now depends on clean-local, and removes the
	tarballs. (stamps/download.stamp): Changed to be a top-level
	target for all downloads. (clean-download): Changed to
	remove all downloads. (stamps/download-openjdk.stamp):
	Renamed from stamps/download.stamp. Downloads OpenJDK
	tarballs. (clean-download-openjdk): Now removes all OpenJDK
	tarballs if not using the alternate zip option.
	(stamps/extract.stamp): Changed to be a top-level target for
	all extraction. (clean-extract): Changed to remove all
	extracted directories. (stamps/extract-
	visualvm.stamp): Depend on the tarball having being
	downloaded. (clean-extract-visualvm): Renamed from clean-
	extract-visualvm.stamp (stamps/extract-cacao.stamp): Rename
	dependency to match changes above. (clean-extract-
	cacao): Simply depend on clean-cacao and remove the stamp.
	(stamps/ports.stamp): Depend on general extraction target.
	(clean-ports): New target to invert stamps/ports.stamp
	(clean-generated): Likewise for stamps/generated.stamp
	(clean-patch-fsg): Only revert patches if they've been applied.
	(clean-patch): Likewise. (stamps/versioning.stamp): Backup
	Defs.gmk prior to altering. (clean-versioning): Restore
	original Defs.gmk. (clean-overlay): New target to remove
	stamps/overlay.stamp (clean-native-ecj): New target to
	remove the native-ecj binary and stamp.
	(stamps/icedtea.stamp): Reduce dependencies where implied by
	others. (clean-plugin): New target depending on two
	conditional plugin targets. (clean-liveconnect): New target
	to revert stamps/liveconnect.stamp. (clean-netx): Likewise
	for stamps/netx.stamp and stamps/netx-dist.stamp (clean):
	Removed; provided by automake.


changeset dd437ca5fa4a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dd437ca5fa4a
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 02 19:25:07 2009 +0000

	Create separate targets for downloading CACAO and VisualVM.

	2009-11-02 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Replace explicit touch stamps/<file>
	invocations with touch $@. Reorganise aliases
	alphabetically and add missing ones. (stamps/download-
	openjdk.stamp): Move CACAO and VisualVM downloads to
	separate target. (stamps/download-cacao.stamp): New target
	for downloading CACAO. (clean-download-cacao): Inverse of
	download-cacao. (stamps/download-visualvm.stamp): New target
	for downloading VisualVM. (clean-download-visualvm): Inverse
	of download-visualvm. (stamps/extract-cacao.stamp): Depend
	on download-cacao. (stamps/extract-visualvm.stamp): Depend
	on download-visualvm. (clean-patch-boot): Check that patches
	have been applied. (stamps/pulse-java.stamp): Move native
	code generation to its own target, making this a top-level
	dependency target. (stamps/pulse-java-native-code.stamp):
	New target for native code generation for PulseAudio plugin.
	(clean-pulse-java): Always remove stamps.


changeset 73b1d535e19b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=73b1d535e19b
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 02 19:55:03 2009 +0000

	Ensure all downloading and extracting happens before building
	OpenJDK.

	2009-11-02 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Make sure all downloading and
	extracting occurs before building OpenJDK.


changeset 9c96175dae62 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c96175dae62
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 02 21:43:32 2009 +0000

	Add missing plugin target and turn icedtea-*-stage2 into stamps.

	2009-11-02 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (stamps/plugin.stamp): Added to unify
	two plugin targets. (stamps/icedtea-stage2.stamp): Renamed
	from icedtea-stage2 so we can mark when its done.
	(stamps/icedtea-debug-stage2.stamp): Likewise with icedtea-
	debug-stage2. (clean-icedtea-stage2): Inverse target for
	icedtea-stage2. (clean-icedtea-debug-stage2): Same for
	icedtea-debug-stage2.


diffstat:

2 files changed, 507 insertions(+), 296 deletions(-)
ChangeLog   |   86 +++++++
Makefile.am |  717 ++++++++++++++++++++++++++++++++++-------------------------

diffs (truncated from 1192 to 500 lines):

diff -r d3256a5c9afe -r 9c96175dae62 ChangeLog
--- a/ChangeLog	Sun Nov 01 19:13:55 2009 +0000
+++ b/ChangeLog	Mon Nov 02 21:43:32 2009 +0000
@@ -1,3 +1,89 @@ 2009-11-01  Andrew John Hughes  <ahughes
+2009-11-02  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(stamps/plugin.stamp): Added to unify
+	two plugin targets.
+	(stamps/icedtea-stage2.stamp): Renamed
+	from icedtea-stage2 so we can mark when 
+	its done.
+	(stamps/icedtea-debug-stage2.stamp): Likewise
+	with icedtea-debug-stage2.
+	(clean-icedtea-stage2): Inverse target for
+	icedtea-stage2.
+	(clean-icedtea-debug-stage2): Same for
+	icedtea-debug-stage2.
+	
+2009-11-02  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make sure all downloading and extracting
+	occurs before building OpenJDK.
+	
+2009-11-02  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Replace explicit touch stamps/<file>
+	invocations with touch $@.  Reorganise
+	aliases alphabetically and add missing ones.
+	(stamps/download-openjdk.stamp): Move
+	CACAO and VisualVM downloads to separate target.
+	(stamps/download-cacao.stamp): New target
+	for downloading CACAO.
+	(clean-download-cacao): Inverse of download-cacao.
+	(stamps/download-visualvm.stamp): New target
+	for downloading VisualVM.
+	(clean-download-visualvm): Inverse of download-visualvm.
+	(stamps/extract-cacao.stamp): Depend on download-cacao.
+	(stamps/extract-visualvm.stamp): Depend on download-visualvm.
+	(clean-patch-boot): Check that patches have been applied.
+	(stamps/pulse-java.stamp): Move native code generation to its
+	own target, making this a top-level dependency target.
+	(stamps/pulse-java-native-code.stamp): New target for native
+	code generation for PulseAudio plugin.
+	(clean-pulse-java): Always remove stamps.
+
+2009-11-02  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-local): New target which removes all
+	but the downloaded tarballs.
+	(distclean-local): Now depends on clean-local,
+	and removes the tarballs.
+	(stamps/download.stamp): Changed to be a top-level
+	target for all downloads.
+	(clean-download): Changed to remove all downloads.
+	(stamps/download-openjdk.stamp): Renamed from
+	stamps/download.stamp.  Downloads OpenJDK tarballs.
+	(clean-download-openjdk): Now removes all OpenJDK
+	tarballs if not using the alternate zip option.
+	(stamps/extract.stamp): Changed to be a top-level
+	target for all extraction.
+	(clean-extract): Changed to remove all extracted
+	directories.
+	(stamps/extract-visualvm.stamp): Depend on the tarball
+	having being downloaded.
+	(clean-extract-visualvm): Renamed from clean-extract-visualvm.stamp
+	(stamps/extract-cacao.stamp): Rename dependency to
+	match changes above.
+	(clean-extract-cacao): Simply depend on clean-cacao and
+	remove the stamp.
+	(stamps/ports.stamp): Depend on general extraction target.
+	(clean-ports): New target to invert stamps/ports.stamp
+	(clean-generated): Likewise for stamps/generated.stamp
+	(clean-patch-fsg): Only revert patches if they've been applied.
+	(clean-patch): Likewise.
+	(stamps/versioning.stamp): Backup Defs.gmk prior to altering.
+	(clean-versioning): Restore original Defs.gmk.
+	(clean-overlay): New target to remove stamps/overlay.stamp
+	(clean-native-ecj): New target to remove the native-ecj binary
+	and stamp.
+	(stamps/icedtea.stamp): Reduce dependencies where implied by
+	others.
+	(clean-plugin): New target depending on two conditional plugin targets.
+	(clean-liveconnect): New target to revert stamps/liveconnect.stamp.
+	(clean-netx): Likewise for stamps/netx.stamp and stamps/netx-dist.stamp
+	(clean): Removed; provided by automake.
+	
 2009-11-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-float-double-trailing-zeros.patch:
diff -r d3256a5c9afe -r 9c96175dae62 Makefile.am
--- a/Makefile.am	Sun Nov 01 19:13:55 2009 +0000
+++ b/Makefile.am	Mon Nov 02 21:43:32 2009 +0000
@@ -165,6 +165,12 @@ endif
 endif
 endif
 
+if USE_ALT_CACAO_SRC_ZIP
+  CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
+else
+  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
+endif
+
 if WITH_ALT_HSBUILD
   HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
   HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
@@ -173,12 +179,6 @@ else
   HS_MD5SUM = $(HOTSPOT_MD5SUM)
   HS_CHANGESET = $(HOTSPOT_CHANGESET)
   HS_URL = $(HOTSPOT_URL)
-endif
-
-if USE_ALT_CACAO_SRC_ZIP
-  CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
-else
-  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 endif
 
 if ENABLE_NPPLUGIN
@@ -695,38 +695,28 @@ all-local: icedtea-stage2
 
 check-local: jtregcheck
 
-distclean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
- clean-clone clean-clone-boot clean-download
-	rm -rf stamps
-	rm -rf drops
-	rm -f rt-source-files.txt \
-	  extra-source-files.txt \
-	  netx-source-files.txt
-	rm -rf bootstrap
-	rm -rf lib
-	rm -rf extra-lib
+clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
+ clean-clone clean-clone-boot clean-plugs clean-extra clean-netx \
+ clean-visualvm clean-nbplatform clean-bootstrap-directory-stage1 \
+ clean-bootstrap-directory-stage2 clean-bootstrap-directory-symlink-stage1 \
+ clean-bootstrap-directory-symlink-stage2 clean-extract clean-generated \
+ clean-plugin clean-liveconnect clean-native-ecj clean-hgforest \
+ clean-icedtea-stage2 clean-icedtea-debug-stage2
+	if [ -e bootstrap ]; then \
+	  rmdir bootstrap ; \
+	fi
+	if [ -e lib ]; then \
+	  rmdir lib ; \
+	fi
 	rm -rf rt/netscape
-	rm -rf visualvm
-	rm -rf netbeans
-	rm -rf netx.build
-if ENABLE_PLUGIN
-	rm -f IcedTeaPlugin.o IcedTeaPlugin.so
-endif
-if ENABLE_NPPLUGIN
-	rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
-endif
-if BUILD_CACAO
-	rm -rf cacao
-endif
 	rm -f jni-common.o
 if ADD_ZERO_BUILD
 	rm -rf zerovm
 endif
-if BUILD_NATIVE_ECJ
-	rm -f native-ecj
-endif
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-	  rm -rf $(abs_top_builddir)/generated ; \
+
+distclean-local: clean-local clean-download
+	if [ -e stamps ] ; then \
+	  rmdir stamps ; \
 	fi
 
 install:
@@ -738,9 +728,8 @@ install:
 	clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
 	clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \
 	clean-tools-jar clean-visualvm clean-nbplatform \
-	clean-rt $(ICEDTEAPLUGIN_CLEAN) \
-	$(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \
-	clean-jtreg-reports 
+	clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \
+	clean-jtreg-reports clean-netx clean-drops
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -766,7 +755,39 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp
 # OpenJDK Source Preparation Targets
 # ==================================
 
+# Check for forest support
+
+stamps/hgforest.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_ALT_OPENJDK_SRC_ZIP
+else
+if !USE_HG
+else
+	if ! $(HG) fclone -h; \
+          then \
+          echo "No forest extension found. Please refer to" \
+            "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+          exit 1; \
+          fi;
+endif
+endif
+endif
+	mkdir -p stamps 
+	touch $@
+
+clean-hgforest:
+	rm -f stamps/hgforest.stamp
+
 # Download OpenJDK sources.
+
+stamps/download.stamp: stamps/download-drops.stamp stamps/download-openjdk.stamp \
+ stamps/download-cacao.stamp stamps/download-visualvm.stamp
+	mkdir -p stamps
+	touch $@
+
+clean-download: clean-drops clean-download-openjdk
+	rm -f stamps/download.stamp
 
 stamps/download-jaxp-drop.stamp:
 	mkdir -p drops
@@ -787,7 +808,11 @@ endif
 	  fi; \
 	fi ;
 	mkdir -p stamps
-	touch stamps/download-jaxp-drop.stamp
+	touch $@
+
+clean-download-jaxp-drop:
+	rm -f drops/$(JAXP_DROP_ZIP)
+	rm -f stamps/download-jaxp-drop.stamp
 
 stamps/download-jaf-drop.stamp:
 	mkdir -p drops
@@ -808,7 +833,11 @@ endif
 	  fi; \
 	fi ;
 	mkdir -p stamps
-	touch stamps/download-jaf-drop.stamp
+	touch $@
+
+clean-download-jaf-drop:
+	rm -f drops/$(JAF_DROP_ZIP)
+	rm -f stamps/download-jaf-drop.stamp
 
 stamps/download-jaxws-drop.stamp:
 	mkdir -p drops
@@ -829,14 +858,25 @@ endif
 	  fi; \
 	fi ;
 	mkdir -p stamps
-	touch stamps/download-jaxws-drop.stamp
+	touch $@
+
+clean-download-jaxws-drop:
+	rm -f drops/$(JAXWS_DROP_ZIP)
+	rm -f stamps/download-jaxws-drop.stamp
 
 stamps/download-drops.stamp: stamps/download-jaxp-drop.stamp \
  stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp
 	mkdir -p stamps
-	touch stamps/download-drops.stamp
-
-stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp
+	touch $@
+
+clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
+ clean-download-jaxws-drop
+	if [ -e drops ] ; then \
+	  rmdir drops ; \
+	fi
+	rm -f stamps/download-drops.stamp
+
+stamps/download-openjdk.stamp: stamps/hgforest.stamp
 if !OPENJDK_SRC_DIR_FOUND
 if USE_ALT_OPENJDK_SRC_ZIP
 else
@@ -965,6 +1005,48 @@ endif
 endif
 endif
 endif
+	mkdir -p stamps
+	touch $@
+
+clean-download-openjdk:
+if !USE_ALT_OPENJDK_SRC_ZIP
+	if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+	  rm -f $(OPENJDK_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_CORBA_SRC_ZIP
+	if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
+	  rm -f $(CORBA_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_JAXP_SRC_ZIP
+	if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
+	  rm -f $(JAXP_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_JAXWS_SRC_ZIP
+	if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
+	  rm -f $(JAXWS_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_JDK_SRC_ZIP
+	if [ ! -z $(JDK_SRC_ZIP) ] ; then \
+	  rm -f $(JDK_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_LANGTOOLS_SRC_ZIP
+	if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
+	  rm -f $(LANGTOOLS_SRC_ZIP) ; \
+	fi
+endif
+if !USE_ALT_HOTSPOT_SRC_ZIP
+	if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
+	  rm -f $(HOTSPOT_SRC_ZIP) ; \
+	fi
+endif
+	rm -f stamps/download-openjdk.stamp
+
+stamps/download-cacao.stamp:
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_ZIP
@@ -985,6 +1067,18 @@ endif
 endif
 endif
 endif
+	mkdir -p stamps
+	touch $@
+
+clean-download-cacao:
+if BUILD_CACAO
+if !USE_ALT_CACAO_SRC_ZIP
+	rm -f $(CACAO_SRC_ZIP)
+endif
+endif
+	rm -f stamps/download-cacao.stamp
+
+stamps/download-visualvm.stamp:
 if WITH_VISUALVM
 	if ! echo "$(NETBEANS_PROFILER_MD5SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
 	 | $(MD5SUM) --check ; \
@@ -1017,62 +1111,25 @@ if WITH_VISUALVM
         fi
 endif
 	mkdir -p stamps
-	touch stamps/download.stamp
-
-clean-download-jaxp-drop:
-	rm -f drops/$(JAXP_DROP_ZIP)
-	rm -f stamps/download-jaxp-drop.stamp
-
-clean-download-jaf-drop:
-	rm -f drops/$(JAF_DROP_ZIP)
-	rm -f stamps/download-jaf-drop.stamp
-
-clean-download-jaxws-drop:
-	rm -f drops/$(JAXWS_DROP_ZIP)
-	rm -f stamps/download-jaxws-drop.stamp
-
-clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \
- clean-download-jaxws-drop
-	rm -f stamps/download-drops.stamp
-
-clean-download: clean-drops
-	rm -f $(OPENJDK_SRC_ZIP)
-if BUILD_CACAO
-	rm -f $(CACAO_SRC_ZIP)
-endif
+	touch $@
+
+clean-download-visualvm:
 if WITH_VISUALVM
 	rm -f $(VISUALVM_SRC_ZIP)
 	rm -f $(NETBEANS_PROFILER_SRC_ZIP)
 endif
-if WITH_VISUALVM
-	rm -f $(VISUALVM_SRC_ZIP)
-	rm -f $(NETBEANS_PROFILER_SRC_ZIP)
-endif
-	rm -f stamps/download.stamp
-
-stamps/hgforest.stamp:
-if OPENJDK_SRC_DIR_FOUND
-else
-if USE_ALT_OPENJDK_SRC_ZIP
-else
-if !USE_HG
-else
-	if ! $(HG) fclone -h; \
-          then \
-          echo "No forest extension found. Please refer to" \
-            "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
-          exit 1; \
-          fi;
-endif
-endif
-endif
-	mkdir -p stamps 
-	touch stamps/hgforest.stamp
-
-clean-hgforest:
-	rm -f stamps/hgforest.stamp
-
-stamps/extract.stamp: stamps/download.stamp
+	rm -f stamps/download-visualvm.stamp
+
+stamps/extract.stamp: stamps/extract-openjdk.stamp \
+ stamps/extract-visualvm.stamp stamps/extract-cacao.stamp
+	mkdir -p stamps
+	touch $@
+
+clean-extract: clean-extract-openjdk clean-extract-visualvm \
+ clean-extract-cacao
+	rm -f stamps/extract.stamp
+
+stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk
 else
@@ -1175,13 +1232,14 @@ endif
 	find openjdk -name '*.java' \
 	  -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \
 	mkdir -p stamps 
-	touch stamps/extract.stamp
-
-clean-extract:
-	rm -f stamps/extract.stamp
+	touch $@
+
+clean-extract-openjdk: clean-overlay clean-versioning \
+ clean-ports clean-patch-fsg
 	rm -rf openjdk
-
-stamps/extract-visualvm.stamp:
+	rm -f stamps/extract-openjdk.stamp
+
+stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp
 if WITH_VISUALVM
 	if ! test -d netbeans ; \
 	then \
@@ -1197,16 +1255,16 @@ endif
 	mkdir -p stamps
 	touch $@
 
-clean-extract-visualvm.stamp:
+clean-extract-visualvm:
 if WITH_VISUALVM
 	rm -rf netbeans visualvm
 endif
 	rm -f stamps/extract-visualvm.stamp
 
-stamps/extract-cacao.stamp: stamps/extract.stamp
+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
-	if ! test -d cacao ; \
+	if ! test -d cacao/cacao ; \
 	then \
 	  mkdir cacao ; \
 	  $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \
@@ -1218,18 +1276,13 @@ endif
 endif
 endif
 	mkdir -p stamps
-	touch stamps/extract-cacao.stamp
-
-clean-extract-cacao:
-if BUILD_CACAO
-if !USE_SYSTEM_CACAO
-	rm -rf cacao
-endif
-endif
+	touch $@
+
+clean-extract-cacao: clean-cacao
 	rm -f stamps/extract-cacao.stamp
 
 # Link ports sources into tree
-stamps/ports.stamp: stamps/extract-cacao.stamp
+stamps/ports.stamp: stamps/extract.stamp
 	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
@@ -1247,7 +1300,18 @@ stamps/ports.stamp: stamps/extract-cacao
 	    openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
 	mkdir -p stamps


From gnu_andrew at member.fsf.org  Mon Nov  2 14:47:40 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 2 Nov 2009 22:47:40 +0000
Subject: [patch] Allow compiling against newer X11 headers
In-Reply-To: <4AEF49CF.3060002@gentoo.org>
References: <1257170602.3265.47.camel@springer.wildebeest.org>
	<4AEF056E.9080704@gentoo.org>
	<17c6771e0911021140u84f8316q61cd213c94a74ef5@mail.gmail.com>
	<4AEF49CF.3060002@gentoo.org>
Message-ID: <17c6771e0911021447i7323e409y3fda3b7fcd7d4600@mail.gmail.com>

2009/11/2 Vlastimil Babka <caster at gentoo.org>:
> Andrew John Hughes wrote:
> ?> Hi Mark, Vlastimil,
>
> Hi Andrew,
>
>> Having seen both patches before, I'd personally prefer we just added
>> the necessary headers if that works, rather than the additional cruft
>> we have in the Fedora patch. ?We should do that in awt_GraphicsEnv.h
>> though, as in the Fedora patch, which would also remove the need for
>> the #ifdef MITSHM (it's in awt_GraphicsEnv.h already). ?So basically
>> the Fedora patch but without the removal of the XShm.h include and the
>> additional structs.
>
> Sure, why not. I just included it in the .c file because the .h file
> didn't use the constant and I hoped to minimize potential symbol
> collisions or something (suspected something like that could be the
> reason for the weird Fedora patch).
>
>> Though I've been aware of this for a while, I deliberately haven't
>> upgraded my own build systems to the new version because it will break
>> OpenJDK builds for which we don't yet have a solution. ?Does anyone
>> know of some versioning defines in the X headers that would avoid us
>> having to use a configure check, and thus allow the patch to be
>> submitted upstream? I believe the change
>> (http://lists.x.org/archives/xorg-devel/2009-June/001242.html) appears
>> in libXext 1.1.1 as Vlastimil says, but is there a way of detecting
>> that other than with autoconf?
>
> I don't know about versioning defines, but maybe the simple test Diego
> suggested on our IRC channel could work in this case?
>
> #include <XShm.h>
> #ifndef X_ShmAttach
> #include <X11/Xmd.h>
> #include <X11/extensions/shmproto.h>
> #endif
>
> Vlastimil
>

Applying that to OpenJDk6 works here without shmproto.h:

http://cr.openjdk.java.net/~andrew/xshm/webrev.01/

Does it work for those with the new version? If so, we can send it upstream.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mjw at redhat.com  Tue Nov  3 03:51:15 2009
From: mjw at redhat.com (Mark Wielaard)
Date: Tue, 03 Nov 2009 12:51:15 +0100
Subject: [patch] Allow compiling against newer X11 headers
In-Reply-To: <4AEF49CF.3060002@gentoo.org>
References: <1257170602.3265.47.camel@springer.wildebeest.org>
	<4AEF056E.9080704@gentoo.org>
	<17c6771e0911021140u84f8316q61cd213c94a74ef5@mail.gmail.com>
	<4AEF49CF.3060002@gentoo.org>
Message-ID: <1257249075.14171.140.camel@springer.wildebeest.org>

Hi Vlastimil,

On Mon, 2009-11-02 at 22:06 +0100, Vlastimil Babka wrote:
> Sure, why not. I just included it in the .c file because the .h file
> didn't use the constant and I hoped to minimize potential symbol
> collisions or something (suspected something like that could be the
> reason for the weird Fedora patch).

I also couldn't find a reason to define these directly instead of
through including both headers if necessary.

> I don't know about versioning defines, but maybe the simple test Diego
> suggested on our IRC channel could work in this case?
> 
> #include <XShm.h>
> #ifndef X_ShmAttach
> #include <X11/Xmd.h>
> #include <X11/extensions/shmproto.h>
> #endif

That is much nicer and simpler than my approach. And it works fine for
my setups (Fedora 11 and rawhide) Thanks. I committed it as:

2009-11-02  Mark Wielaard  <mjw at redhat.com>
	    Vlastimil Babka  <caster at gentoo.org>

    * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
    * patches/icedtea-xshm.patch: New patch.
    * HACKING: Document new patch.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: shm.patch
Type: text/x-patch
Size: 992 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091103/08b44162/shm.patch 

From mjw at icedtea.classpath.org  Tue Nov  3 03:46:56 2009
From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 11:46:56 +0000
Subject: /hg/icedtea6: Support newer X11 headers for awt_GraphicsEnv.h.
Message-ID: <hg.c75348f9db6a.1257248816.2873452341184383832@icedtea.classpath.org>

changeset c75348f9db6a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c75348f9db6a
author: Mark Wielaard <mark at klomp.org>
date: Tue Nov 03 12:50:30 2009 +0100

	Support newer X11 headers for awt_GraphicsEnv.h.

	2009-11-02 Mark Wielaard <mjw at redhat.com> Vlastimil
	Babka <caster at gentoo.org>

	 * Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
	    * patches/icedtea-xshm.patch: New patch.
	    * HACKING: Document new patch.


diffstat:

4 files changed, 22 insertions(+)
ChangeLog                  |    7 +++++++
HACKING                    |    1 +
Makefile.am                |    1 +
patches/icedtea-xshm.patch |   13 +++++++++++++

diffs (53 lines):

diff -r 547923046557 -r c75348f9db6a ChangeLog
--- a/ChangeLog	Fri Oct 30 13:35:54 2009 +0000
+++ b/ChangeLog	Tue Nov 03 12:50:30 2009 +0100
@@ -1,3 +1,10 @@ 2009-10-30  Edward Nevill   <ed at camswl.c
+2009-11-02  Mark Wielaard  <mjw at redhat.com>
+	    Vlastimil Babka  <caster at gentoo.org>
+
+	* Makefile.am (ICEDTEA_PATCHES): Add patches/icedtea-xshm.patch
+	* patches/icedtea-xshm.patch: New patch.
+	* HACKING: Document new patch.
+
 2009-10-30  Edward Nevill   <ed at camswl.com>
 
 	* move mkbc.c to hotspot/tools
diff -r 547923046557 -r c75348f9db6a HACKING
--- a/HACKING	Fri Oct 30 13:35:54 2009 +0000
+++ b/HACKING	Tue Nov 03 12:50:30 2009 +0100
@@ -107,6 +107,7 @@ The following patches are currently appl
 * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
 * icedtea-shark.patch: Add support for the Shark JIT.
 * icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390.
+* icedtea-xshm.patch: Support newer X11 headers for awt_GraphicsEnv.h.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 547923046557 -r c75348f9db6a Makefile.am
--- a/Makefile.am	Fri Oct 30 13:35:54 2009 +0000
+++ b/Makefile.am	Tue Nov 03 12:50:30 2009 +0100
@@ -664,6 +664,7 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-s390-serialize.patch \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
 	patches/icedtea-no-precompiled.patch \
+	patches/icedtea-xshm.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 547923046557 -r c75348f9db6a patches/icedtea-xshm.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xshm.patch	Tue Nov 03 12:50:30 2009 +0100
@@ -0,0 +1,13 @@
+--- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-30 13:25:52.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#ifndef X_ShmAttach
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
++#endif
+ 
+ extern int XShmQueryExtension();
+ 


From mmatejov at icedtea.classpath.org  Tue Nov  3 05:05:28 2009
From: mmatejov at icedtea.classpath.org (mmatejov at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 13:05:28 +0000
Subject: /hg/icedtea6: Add latest security patches
Message-ID: <hg.cda20a4144b7.1257253528.2873452341184383832@icedtea.classpath.org>

changeset cda20a4144b7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cda20a4144b7
author: Martin Matejovic <mmatejov at redhat.com>
date: Tue Nov 03 14:08:22 2009 +0100

	Add latest security patches 2009-11-03 Martin Matejovic
	<mmatejov at redhat.com>
		* patches/security/icedtea-6862968.patch
		* patches/security/icedtea-6863503.patch
		* patches/security/icedtea-6864911.patch
		* patches/security/icedtea-6872357.patch
		* patches/security/icedtea-6874643.patch
		* Makefile.am: apply the above


diffstat:

7 files changed, 562 insertions(+), 1 deletion(-)
ChangeLog                              |    8 
Makefile.am                            |    7 
patches/security/icedtea-6862968.patch |   60 ++++
patches/security/icedtea-6863503.patch |   33 ++
patches/security/icedtea-6864911.patch |  422 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6872357.patch |   17 +
patches/security/icedtea-6874643.patch |   16 +

diffs (truncated from 600 to 500 lines):

diff -r c75348f9db6a -r cda20a4144b7 ChangeLog
--- a/ChangeLog	Tue Nov 03 12:50:30 2009 +0100
+++ b/ChangeLog	Tue Nov 03 14:08:22 2009 +0100
@@ -1,3 +1,11 @@ 2009-11-02  Mark Wielaard  <mjw at redhat.c
+2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+	* patches/security/icedtea-6862968.patch
+	* patches/security/icedtea-6863503.patch
+	* patches/security/icedtea-6864911.patch
+	* patches/security/icedtea-6872357.patch
+	* patches/security/icedtea-6874643.patch
+	* Makefile.am: apply the above
+
 2009-11-02  Mark Wielaard  <mjw at redhat.com>
 	    Vlastimil Babka  <caster at gentoo.org>
 
diff -r c75348f9db6a -r cda20a4144b7 Makefile.am
--- a/Makefile.am	Tue Nov 03 12:50:30 2009 +0100
+++ b/Makefile.am	Tue Nov 03 14:08:22 2009 +0100
@@ -589,7 +589,12 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-buildfixes.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
-	patches/icedtea-sparc-trapsfix.patch
+	patches/icedtea-sparc-trapsfix.patch \
+	patches/security/icedtea-6862968.patch \
+	patches/security/icedtea-6863503.patch \
+	patches/security/icedtea-6864911.patch \
+	patches/security/icedtea-6872357.patch \
+	patches/security/icedtea-6874643.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r c75348f9db6a -r cda20a4144b7 patches/security/icedtea-6862968.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6862968.patch	Tue Nov 03 14:08:22 2009 +0100
@@ -0,0 +1,60 @@
+--- old/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:11.272200000 +0400
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:10.710600000 +0400
+@@ -685,6 +685,10 @@
+ #ifdef DEBUG
+     printf("in setQTables, qlen = %d, write is %d\n", qlen, write);
+ #endif
++    if (qlen > NUM_QUANT_TBLS) {
++        /* Ignore extra qunterization tables. */
++        qlen = NUM_QUANT_TBLS;
++    }
+     for (i = 0; i < qlen; i++) {
+         table = (*env)->GetObjectArrayElement(env, qtables, i);
+         qdata = (*env)->GetObjectField(env, table, JPEGQTable_tableID);
+@@ -736,6 +740,11 @@
+     hlensBody = (*env)->GetShortArrayElements(env,
+                                               huffLens,
+                                               NULL);
++    if (hlensLen > 16) {
++        /* Ignore extra elements of bits array. Only 16 elements can be
++           stored. 0-th element is not used. (see jpeglib.h, line 107)  */
++        hlensLen = 16;
++    }
+     for (i = 1; i <= hlensLen; i++) {
+         huff_ptr->bits[i] = (UINT8)hlensBody[i-1];
+     }
+@@ -752,6 +761,11 @@
+                                               huffValues,
+                                               NULL);
+ 
++    if (hvalsLen > 256) {
++        /* Ignore extra elements of hufval array. Only 256 elements
++           can be stored. (see jpeglib.h, line 109)                  */
++        hlensLen = 256;
++    }
+     for (i = 0; i < hvalsLen; i++) {
+         huff_ptr->huffval[i] = (UINT8)hvalsBody[i];
+     }
+@@ -772,6 +786,11 @@
+     j_compress_ptr comp;
+     j_decompress_ptr decomp;
+     jsize hlen = (*env)->GetArrayLength(env, DCHuffmanTables);
++
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra DC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
+@@ -793,6 +812,10 @@
+         huff_ptr->sent_table = !write;
+     }
+     hlen = (*env)->GetArrayLength(env, ACHuffmanTables);
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra AC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
diff -r c75348f9db6a -r cda20a4144b7 patches/security/icedtea-6863503.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6863503.patch	Tue Nov 03 14:08:22 2009 +0100
@@ -0,0 +1,33 @@
+--- old/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
++++ openjdk/jdk/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
++ * Copyright 1996-2009 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
+@@ -414,16 +414,17 @@
+      *
+      * @return true if the digests are equal, false otherwise.
+      */
+-    public static boolean isEqual(byte digesta[], byte digestb[]) {
+-        if (digesta.length != digestb.length)
++    public static boolean isEqual(byte[] digesta, byte[] digestb) {
++        if (digesta.length != digestb.length) {
+             return false;
++        }
+ 
++        int result = 0;
++        // time-constant comparison
+         for (int i = 0; i < digesta.length; i++) {
+-            if (digesta[i] != digestb[i]) {
+-                return false;
+-            }
++            result |= digesta[i] ^ digestb[i];
+         }
+-        return true;
++        return result == 0;
+     }
+ 
+     /**
diff -r c75348f9db6a -r cda20a4144b7 patches/security/icedtea-6864911.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6864911.patch	Tue Nov 03 14:08:22 2009 +0100
@@ -0,0 +1,422 @@
+--- old/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.595709900 +0800
++++ openjdk/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.087195700 +0800
+@@ -32,12 +32,8 @@
+ import java.io.OutputStream;
+ import java.io.InputStream;
+ import java.net.Socket;
+-import java.util.Vector;
+-import java.util.Hashtable;
+ 
+ import javax.naming.CommunicationException;
+-import javax.naming.AuthenticationException;
+-import javax.naming.AuthenticationNotSupportedException;
+ import javax.naming.ServiceUnavailableException;
+ import javax.naming.NamingException;
+ import javax.naming.InterruptedNamingException;
+@@ -47,6 +43,8 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.InvocationTargetException;
++import java.util.Arrays;
++import sun.misc.IOUtils;
+ //import javax.net.SocketFactory;
+ 
+ /**
+@@ -799,7 +797,6 @@
+         byte inbuf[];   // Buffer for reading incoming bytes
+         int inMsgId;    // Message id of incoming response
+         int bytesread;  // Number of bytes in inbuf
+-        int bytesleft;  // Number of bytes that need to read for completing resp
+         int br;         // Temp; number of bytes read from stream
+         int offset;     // Offset of where to store bytes in inbuf
+         int seqlen;     // Length of ASN sequence
+@@ -811,7 +808,7 @@
+         try {
+             while (true) {
+                 try {
+-                    inbuf = new byte[2048];
++                    inbuf = new byte[10];
+ 
+                     offset = 0;
+                     seqlen = 0;
+@@ -871,19 +868,10 @@
+                     }
+ 
+                     // read in seqlen bytes
+-                    bytesleft = seqlen;
+-                    if ((offset + bytesleft) > inbuf.length) {
+-                        byte nbuf[] = new byte[offset + bytesleft];
+-                        System.arraycopy(inbuf, 0, nbuf, 0, offset);
+-                        inbuf = nbuf;
+-                    }
+-                    while (bytesleft > 0) {
+-                        bytesread = in.read(inbuf, offset, bytesleft);
+-                        if (bytesread < 0)
+-                            break; // EOF
+-                        offset += bytesread;
+-                        bytesleft -= bytesread;
+-                    }
++                    byte[] left = IOUtils.readFully(in, seqlen, false);
++                    inbuf = Arrays.copyOf(inbuf, offset + left.length);
++                    System.arraycopy(left, 0, inbuf, offset, left.length);
++                    offset += left.length;
+ /*
+ if (dump > 0) {
+ System.err.println("seqlen: " + seqlen);
+--- old/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:36:00.901075900 +0800
++++ openjdk/jdk/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:35:59.999916100 +0800
+@@ -51,6 +51,7 @@
+ import java.security.PermissionCollection;
+ import sun.awt.AppContext;
+ import sun.awt.SunToolkit;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -314,36 +315,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                // Read until end of stream is reached - use 8K buffer
+-                // to speed up performance [stanleyh]
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.965921700 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.449689900 +0800
+@@ -25,14 +25,15 @@
+ 
+ package sun.misc;
+ 
++import java.io.EOFException;
+ import java.net.URL;
+ import java.io.IOException;
+ import java.io.InterruptedIOException;
+ import java.io.InputStream;
+ import java.security.CodeSigner;
+ import java.util.jar.Manifest;
+-import java.util.jar.Attributes;
+ import java.nio.ByteBuffer;
++import java.util.Arrays;
+ import sun.nio.ByteBuffered;
+ 
+ /**
+@@ -105,49 +106,37 @@
+         }
+ 
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = 0;
+-                    try {
+-                        n = in.read(b, b.length - len, len);
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
++            b = new byte[0];
++            if (len == -1) len = Integer.MAX_VALUE;
++            int pos = 0;
++            while (pos < len) {
++                int bytesToRead;
++                if (pos >= b.length) { // Only expand when there's no room
++                    bytesToRead = Math.min(len - pos, b.length + 1024);
++                    if (b.length < pos + bytesToRead) {
++                        b = Arrays.copyOf(b, pos + bytesToRead);
+                     }
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
++                } else {
++                    bytesToRead = b.length - pos;
+                 }
+-            } else {
+-                // Read until end of stream is reached
+-                b = new byte[1024];
+-                int total = 0;
+-                for (;;) {
+-                    len = 0;
+-                    try {
+-                        len = in.read(b, total, b.length - total);
+-                        if (len == -1)
+-                            break;
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
+-                    }
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
++                int cc = 0;
++                try {
++                    cc = in.read(b, pos, bytesToRead);
++                } catch (InterruptedIOException iioe) {
++                    Thread.interrupted();
++                    isInterrupted = true;
+                 }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
++                if (cc < 0) {
++                    if (len != Integer.MAX_VALUE) {
++                        throw new EOFException("Detect premature EOF");
++                    } else {
++                        if (b.length != pos) {
++                            b = Arrays.copyOf(b, pos);
++                        }
++                        break;
++                    }
+                 }
++                pos += cc;
+             }
+         } finally {
+             try {
+--- old/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:07.067128400 +0800
++++ openjdk/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:06.464179700 +0800
+@@ -44,6 +44,7 @@
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Map;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -375,34 +376,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.684391400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.088986300 +0800
+@@ -36,6 +36,7 @@
+ import java.net.*;
+ import javax.security.auth.x500.X500Principal;
+ 
++import sun.misc.IOUtils;
+ import sun.security.util.*;
+ import sun.security.x509.*;
+ 
+@@ -344,17 +345,7 @@
+             in = con.getInputStream();
+ 
+             int contentLength = con.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+-
+-            byte[] response = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = in.read(response, total, response.length - total);
+-                total += count;
+-            }
++            byte[] response = IOUtils.readFully(in, contentLength, false);
+ 
+             OCSPResponse ocspResponse = new OCSPResponse(response, pkixParams,
+                 responderCert);
+--- old/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.859436200 +0800
++++ openjdk/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.165978900 +0800
+@@ -33,6 +33,7 @@
+ import java.util.Iterator;
+ import java.util.Set;
+ 
++import sun.misc.IOUtils;
+ import sun.security.pkcs.*;
+ 
+ /**
+@@ -138,19 +139,9 @@
+                 System.out.println();
+             }
+             int contentLength = connection.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+             verifyMimeType(connection.getContentType());
++            replyBuffer = IOUtils.readFully(input, contentLength, false);
+ 
+-            replyBuffer = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = input.read(replyBuffer, total,
+-                                        replyBuffer.length - total);
+-                total += count;
+-            }
+             if (DEBUG) {
+                 System.out.println("received timestamp response (length=" +
+                         replyBuffer.length + ")");
+--- old/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:18.392602400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:17.617711400 +0800
+@@ -28,6 +28,7 @@
+ import java.io.*;
+ import java.math.BigInteger;
+ import java.util.Date;
++import sun.misc.IOUtils;
+ 
+ /**
+  * Represents a single DER-encoded value.  DER encoding rules are a subset
+@@ -384,12 +385,8 @@
+         if (fullyBuffered && in.available() != length)
+             throw new IOException("extra data given to DerValue constructor");
+ 
+-        byte[] bytes = new byte[length];
++        byte[] bytes = IOUtils.readFully(in, length, true);
+ 
+-        // n.b. readFully not needed in normal fullyBuffered case
+-        DataInputStream dis = new DataInputStream(in);
+-
+-        dis.readFully(bytes);
+         buffer = new DerInputBuffer(bytes);
+         return new DerInputStream(buffer);
+     }
+--- /dev/null	2009-07-23 00:25:50.000000000 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/IOUtils.java	2009-08-18 09:36:21.385422200 +0800
+@@ -0,0 +1,80 @@
++/*
++ * Copyright 2009 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,


From bugzilla-daemon at icedtea.classpath.org  Tue Nov  3 05:12:57 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 13:12:57 +0000
Subject: [Bug 400] New: SPECjvm98 javac test fails with LLVM 2.6
Message-ID: <E1N5JBx-0005hB-4z@icedtea.classpath.org>

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

           Summary: SPECjvm98 javac test fails with LLVM 2.6
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: gbenson at redhat.com


icedtea6-f2b2f87f120a
Test fails with ***NOT VALID***


-- 
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 Nov  3 05:13:11 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 13:13:11 +0000
Subject: [Bug 400] SPECjvm98 javac test fails with LLVM 2.6
Message-ID: <E1N5JCB-0005iD-0O@icedtea.classpath.org>

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


gbenson at redhat.com changed:

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




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


From mmatejov at icedtea.classpath.org  Tue Nov  3 08:39:45 2009
From: mmatejov at icedtea.classpath.org (mmatejov at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 16:39:45 +0000
Subject: /hg/release/icedtea6-1.5: Add latest security patches
Message-ID: <hg.662422897e63.1257266385.1785565629229908555@icedtea.classpath.org>

changeset 662422897e63 in /hg/release/icedtea6-1.5
details: http://icedtea.classpath.org/hg/release/icedtea6-1.5?cmd=changeset;node=662422897e63
author: Martin Matejovic <mmatejov at redhat.com>
date: Tue Nov 03 17:44:08 2009 +0100

	Add latest security patches 2009-11-03 Martin Matejovic
	<mmatejov at redhat.com>
	        * patches/security/icedtea-6862968.patch
	        * patches/security/icedtea-6863503.patch
	        * patches/security/icedtea-6864911.patch
	        * patches/security/icedtea-6872357.patch
	        * patches/security/icedtea-6874643.patch
	        * Makefile.am: apply the above


diffstat:

7 files changed, 564 insertions(+), 3 deletions(-)
ChangeLog                              |    8 
Makefile.am                            |   11 
patches/security/icedtea-6862968.patch |   60 ++++
patches/security/icedtea-6863503.patch |   33 ++
patches/security/icedtea-6864911.patch |  422 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6872357.patch |   17 +
patches/security/icedtea-6874643.patch |   16 +

diffs (truncated from 604 to 500 lines):

diff -r 7ea6d4f11077 -r 662422897e63 ChangeLog
--- a/ChangeLog	Fri Sep 04 10:05:08 2009 -0400
+++ b/ChangeLog	Tue Nov 03 17:44:08 2009 +0100
@@ -1,3 +1,11 @@ 2009-09-04  Lillian Angel  <langel at redha
+2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+	* patches/security/icedtea-6862968.patch
+	* patches/security/icedtea-6863503.patch
+	* patches/security/icedtea-6864911.patch
+	* patches/security/icedtea-6872357.patch
+	* patches/security/icedtea-6874643.patch
+	* Makefile.am: apply the above
+
 2009-09-04  Lillian Angel  <langel at redhat.com>
 
 	* NEWS: Updated for 1.5.2 release.
diff -r 7ea6d4f11077 -r 662422897e63 Makefile.am
--- a/Makefile.am	Fri Sep 04 10:05:08 2009 -0400
+++ b/Makefile.am	Tue Nov 03 17:44:08 2009 +0100
@@ -608,9 +608,14 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6824440.patch \
 	patches/security/icedtea-6830335.patch \
 	patches/security/icedtea-6845701.patch \
-	patches/security/icedtea-6813167.patch
-
-if WITH_ALT_HSBUILD
+	patches/security/icedtea-6813167.patch \
+	patches/security/icedtea-6862968.patch \
+	patches/security/icedtea-6863503.patch \
+	patches/security/icedtea-6864911.patch \
+	patches/security/icedtea-6872357.patch \
+	patches/security/icedtea-6874643.patch 
+
+f WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/icedtea-format-warnings.patch \
 	patches/icedtea-fortify-source.patch \
diff -r 7ea6d4f11077 -r 662422897e63 patches/security/icedtea-6862968.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6862968.patch	Tue Nov 03 17:44:08 2009 +0100
@@ -0,0 +1,60 @@
+--- old/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:11.272200000 +0400
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:10.710600000 +0400
+@@ -685,6 +685,10 @@
+ #ifdef DEBUG
+     printf("in setQTables, qlen = %d, write is %d\n", qlen, write);
+ #endif
++    if (qlen > NUM_QUANT_TBLS) {
++        /* Ignore extra qunterization tables. */
++        qlen = NUM_QUANT_TBLS;
++    }
+     for (i = 0; i < qlen; i++) {
+         table = (*env)->GetObjectArrayElement(env, qtables, i);
+         qdata = (*env)->GetObjectField(env, table, JPEGQTable_tableID);
+@@ -736,6 +740,11 @@
+     hlensBody = (*env)->GetShortArrayElements(env,
+                                               huffLens,
+                                               NULL);
++    if (hlensLen > 16) {
++        /* Ignore extra elements of bits array. Only 16 elements can be
++           stored. 0-th element is not used. (see jpeglib.h, line 107)  */
++        hlensLen = 16;
++    }
+     for (i = 1; i <= hlensLen; i++) {
+         huff_ptr->bits[i] = (UINT8)hlensBody[i-1];
+     }
+@@ -752,6 +761,11 @@
+                                               huffValues,
+                                               NULL);
+ 
++    if (hvalsLen > 256) {
++        /* Ignore extra elements of hufval array. Only 256 elements
++           can be stored. (see jpeglib.h, line 109)                  */
++        hlensLen = 256;
++    }
+     for (i = 0; i < hvalsLen; i++) {
+         huff_ptr->huffval[i] = (UINT8)hvalsBody[i];
+     }
+@@ -772,6 +786,11 @@
+     j_compress_ptr comp;
+     j_decompress_ptr decomp;
+     jsize hlen = (*env)->GetArrayLength(env, DCHuffmanTables);
++
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra DC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
+@@ -793,6 +812,10 @@
+         huff_ptr->sent_table = !write;
+     }
+     hlen = (*env)->GetArrayLength(env, ACHuffmanTables);
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra AC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
diff -r 7ea6d4f11077 -r 662422897e63 patches/security/icedtea-6863503.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6863503.patch	Tue Nov 03 17:44:08 2009 +0100
@@ -0,0 +1,33 @@
+--- old/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
++++ openjdk/jdk/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
++ * Copyright 1996-2009 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
+@@ -414,16 +414,17 @@
+      *
+      * @return true if the digests are equal, false otherwise.
+      */
+-    public static boolean isEqual(byte digesta[], byte digestb[]) {
+-        if (digesta.length != digestb.length)
++    public static boolean isEqual(byte[] digesta, byte[] digestb) {
++        if (digesta.length != digestb.length) {
+             return false;
++        }
+ 
++        int result = 0;
++        // time-constant comparison
+         for (int i = 0; i < digesta.length; i++) {
+-            if (digesta[i] != digestb[i]) {
+-                return false;
+-            }
++            result |= digesta[i] ^ digestb[i];
+         }
+-        return true;
++        return result == 0;
+     }
+ 
+     /**
diff -r 7ea6d4f11077 -r 662422897e63 patches/security/icedtea-6864911.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6864911.patch	Tue Nov 03 17:44:08 2009 +0100
@@ -0,0 +1,422 @@
+--- old/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.595709900 +0800
++++ openjdk/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.087195700 +0800
+@@ -32,12 +32,8 @@
+ import java.io.OutputStream;
+ import java.io.InputStream;
+ import java.net.Socket;
+-import java.util.Vector;
+-import java.util.Hashtable;
+ 
+ import javax.naming.CommunicationException;
+-import javax.naming.AuthenticationException;
+-import javax.naming.AuthenticationNotSupportedException;
+ import javax.naming.ServiceUnavailableException;
+ import javax.naming.NamingException;
+ import javax.naming.InterruptedNamingException;
+@@ -47,6 +43,8 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.InvocationTargetException;
++import java.util.Arrays;
++import sun.misc.IOUtils;
+ //import javax.net.SocketFactory;
+ 
+ /**
+@@ -799,7 +797,6 @@
+         byte inbuf[];   // Buffer for reading incoming bytes
+         int inMsgId;    // Message id of incoming response
+         int bytesread;  // Number of bytes in inbuf
+-        int bytesleft;  // Number of bytes that need to read for completing resp
+         int br;         // Temp; number of bytes read from stream
+         int offset;     // Offset of where to store bytes in inbuf
+         int seqlen;     // Length of ASN sequence
+@@ -811,7 +808,7 @@
+         try {
+             while (true) {
+                 try {
+-                    inbuf = new byte[2048];
++                    inbuf = new byte[10];
+ 
+                     offset = 0;
+                     seqlen = 0;
+@@ -871,19 +868,10 @@
+                     }
+ 
+                     // read in seqlen bytes
+-                    bytesleft = seqlen;
+-                    if ((offset + bytesleft) > inbuf.length) {
+-                        byte nbuf[] = new byte[offset + bytesleft];
+-                        System.arraycopy(inbuf, 0, nbuf, 0, offset);
+-                        inbuf = nbuf;
+-                    }
+-                    while (bytesleft > 0) {
+-                        bytesread = in.read(inbuf, offset, bytesleft);
+-                        if (bytesread < 0)
+-                            break; // EOF
+-                        offset += bytesread;
+-                        bytesleft -= bytesread;
+-                    }
++                    byte[] left = IOUtils.readFully(in, seqlen, false);
++                    inbuf = Arrays.copyOf(inbuf, offset + left.length);
++                    System.arraycopy(left, 0, inbuf, offset, left.length);
++                    offset += left.length;
+ /*
+ if (dump > 0) {
+ System.err.println("seqlen: " + seqlen);
+--- old/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:36:00.901075900 +0800
++++ openjdk/jdk/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:35:59.999916100 +0800
+@@ -51,6 +51,7 @@
+ import java.security.PermissionCollection;
+ import sun.awt.AppContext;
+ import sun.awt.SunToolkit;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -314,36 +315,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                // Read until end of stream is reached - use 8K buffer
+-                // to speed up performance [stanleyh]
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.965921700 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.449689900 +0800
+@@ -25,14 +25,15 @@
+ 
+ package sun.misc;
+ 
++import java.io.EOFException;
+ import java.net.URL;
+ import java.io.IOException;
+ import java.io.InterruptedIOException;
+ import java.io.InputStream;
+ import java.security.CodeSigner;
+ import java.util.jar.Manifest;
+-import java.util.jar.Attributes;
+ import java.nio.ByteBuffer;
++import java.util.Arrays;
+ import sun.nio.ByteBuffered;
+ 
+ /**
+@@ -105,49 +106,37 @@
+         }
+ 
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = 0;
+-                    try {
+-                        n = in.read(b, b.length - len, len);
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
++            b = new byte[0];
++            if (len == -1) len = Integer.MAX_VALUE;
++            int pos = 0;
++            while (pos < len) {
++                int bytesToRead;
++                if (pos >= b.length) { // Only expand when there's no room
++                    bytesToRead = Math.min(len - pos, b.length + 1024);
++                    if (b.length < pos + bytesToRead) {
++                        b = Arrays.copyOf(b, pos + bytesToRead);
+                     }
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
++                } else {
++                    bytesToRead = b.length - pos;
+                 }
+-            } else {
+-                // Read until end of stream is reached
+-                b = new byte[1024];
+-                int total = 0;
+-                for (;;) {
+-                    len = 0;
+-                    try {
+-                        len = in.read(b, total, b.length - total);
+-                        if (len == -1)
+-                            break;
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
+-                    }
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
++                int cc = 0;
++                try {
++                    cc = in.read(b, pos, bytesToRead);
++                } catch (InterruptedIOException iioe) {
++                    Thread.interrupted();
++                    isInterrupted = true;
+                 }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
++                if (cc < 0) {
++                    if (len != Integer.MAX_VALUE) {
++                        throw new EOFException("Detect premature EOF");
++                    } else {
++                        if (b.length != pos) {
++                            b = Arrays.copyOf(b, pos);
++                        }
++                        break;
++                    }
+                 }
++                pos += cc;
+             }
+         } finally {
+             try {
+--- old/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:07.067128400 +0800
++++ openjdk/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:06.464179700 +0800
+@@ -44,6 +44,7 @@
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Map;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -375,34 +376,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.684391400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.088986300 +0800
+@@ -36,6 +36,7 @@
+ import java.net.*;
+ import javax.security.auth.x500.X500Principal;
+ 
++import sun.misc.IOUtils;
+ import sun.security.util.*;
+ import sun.security.x509.*;
+ 
+@@ -344,17 +345,7 @@
+             in = con.getInputStream();
+ 
+             int contentLength = con.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+-
+-            byte[] response = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = in.read(response, total, response.length - total);
+-                total += count;
+-            }
++            byte[] response = IOUtils.readFully(in, contentLength, false);
+ 
+             OCSPResponse ocspResponse = new OCSPResponse(response, pkixParams,
+                 responderCert);
+--- old/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.859436200 +0800
++++ openjdk/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.165978900 +0800
+@@ -33,6 +33,7 @@
+ import java.util.Iterator;
+ import java.util.Set;
+ 
++import sun.misc.IOUtils;
+ import sun.security.pkcs.*;
+ 
+ /**
+@@ -138,19 +139,9 @@
+                 System.out.println();
+             }
+             int contentLength = connection.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+             verifyMimeType(connection.getContentType());
++            replyBuffer = IOUtils.readFully(input, contentLength, false);
+ 
+-            replyBuffer = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = input.read(replyBuffer, total,
+-                                        replyBuffer.length - total);
+-                total += count;
+-            }
+             if (DEBUG) {
+                 System.out.println("received timestamp response (length=" +
+                         replyBuffer.length + ")");
+--- old/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:18.392602400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:17.617711400 +0800
+@@ -28,6 +28,7 @@
+ import java.io.*;
+ import java.math.BigInteger;
+ import java.util.Date;
++import sun.misc.IOUtils;
+ 
+ /**
+  * Represents a single DER-encoded value.  DER encoding rules are a subset
+@@ -384,12 +385,8 @@
+         if (fullyBuffered && in.available() != length)
+             throw new IOException("extra data given to DerValue constructor");
+ 
+-        byte[] bytes = new byte[length];
++        byte[] bytes = IOUtils.readFully(in, length, true);
+ 
+-        // n.b. readFully not needed in normal fullyBuffered case
+-        DataInputStream dis = new DataInputStream(in);
+-
+-        dis.readFully(bytes);
+         buffer = new DerInputBuffer(bytes);
+         return new DerInputStream(buffer);
+     }
+--- /dev/null	2009-07-23 00:25:50.000000000 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/IOUtils.java	2009-08-18 09:36:21.385422200 +0800
+@@ -0,0 +1,80 @@
++/*
++ * Copyright 2009 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


From mmatejov at icedtea.classpath.org  Tue Nov  3 08:46:03 2009
From: mmatejov at icedtea.classpath.org (mmatejov at icedtea.classpath.org)
Date: Tue, 03 Nov 2009 16:46:03 +0000
Subject: /hg/release/icedtea6-1.6: Add latest security patches
Message-ID: <hg.2c854193cc9d.1257266762.1785565629229908552@icedtea.classpath.org>

changeset 2c854193cc9d in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=2c854193cc9d
author: Martin Matejovic <mmatejov at redhat.com>
date: Tue Nov 03 17:50:20 2009 +0100

	Add latest security patches 2009-11-03 Martin Matejovic
	<mmatejov at redhat.com>
		* patches/security/icedtea-6862968.patch
		* patches/security/icedtea-6863503.patch
		* patches/security/icedtea-6864911.patch
		* patches/security/icedtea-6872357.patch
		* patches/security/icedtea-6874643.patch
		* Makefile.am: apply the above


diffstat:

7 files changed, 561 insertions(+)
ChangeLog                              |    8 
Makefile.am                            |    5 
patches/security/icedtea-6862968.patch |   60 ++++
patches/security/icedtea-6863503.patch |   33 ++
patches/security/icedtea-6864911.patch |  422 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6872357.patch |   17 +
patches/security/icedtea-6874643.patch |   16 +

diffs (truncated from 598 to 500 lines):

diff -r 7c131a5e1ccf -r 2c854193cc9d ChangeLog
--- a/ChangeLog	Mon Sep 14 17:40:46 2009 +0100
+++ b/ChangeLog	Tue Nov 03 17:50:20 2009 +0100
@@ -1,3 +1,11 @@ 2009-09-14  Andrew Haley  <aph at redhat.co
+2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+	* patches/security/icedtea-6862968.patch
+	* patches/security/icedtea-6863503.patch
+	* patches/security/icedtea-6864911.patch
+	* patches/security/icedtea-6872357.patch
+	* patches/security/icedtea-6874643.patch
+	* Makefile.am: apply the above
+
 2009-09-14  Andrew Haley  <aph at redhat.com>
 
 	* NEWS: Update.
diff -r 7c131a5e1ccf -r 2c854193cc9d Makefile.am
--- a/Makefile.am	Mon Sep 14 17:40:46 2009 +0100
+++ b/Makefile.am	Tue Nov 03 17:50:20 2009 +0100
@@ -626,6 +626,11 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6830335.patch \
 	patches/security/icedtea-6845701.patch \
 	patches/security/icedtea-6813167.patch \
+	patches/security/icedtea-6862968.patch \
+	patches/security/icedtea-6863503.patch \
+	patches/security/icedtea-6864911.patch \
+	patches/security/icedtea-6872357.patch \
+	patches/security/icedtea-6874643.patch \
 	patches/icedtea-jar-misc.patch
 
 if WITH_ALT_HSBUILD
diff -r 7c131a5e1ccf -r 2c854193cc9d patches/security/icedtea-6862968.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6862968.patch	Tue Nov 03 17:50:20 2009 +0100
@@ -0,0 +1,60 @@
+--- old/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:11.272200000 +0400
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-29 13:28:10.710600000 +0400
+@@ -685,6 +685,10 @@
+ #ifdef DEBUG
+     printf("in setQTables, qlen = %d, write is %d\n", qlen, write);
+ #endif
++    if (qlen > NUM_QUANT_TBLS) {
++        /* Ignore extra qunterization tables. */
++        qlen = NUM_QUANT_TBLS;
++    }
+     for (i = 0; i < qlen; i++) {
+         table = (*env)->GetObjectArrayElement(env, qtables, i);
+         qdata = (*env)->GetObjectField(env, table, JPEGQTable_tableID);
+@@ -736,6 +740,11 @@
+     hlensBody = (*env)->GetShortArrayElements(env,
+                                               huffLens,
+                                               NULL);
++    if (hlensLen > 16) {
++        /* Ignore extra elements of bits array. Only 16 elements can be
++           stored. 0-th element is not used. (see jpeglib.h, line 107)  */
++        hlensLen = 16;
++    }
+     for (i = 1; i <= hlensLen; i++) {
+         huff_ptr->bits[i] = (UINT8)hlensBody[i-1];
+     }
+@@ -752,6 +761,11 @@
+                                               huffValues,
+                                               NULL);
+ 
++    if (hvalsLen > 256) {
++        /* Ignore extra elements of hufval array. Only 256 elements
++           can be stored. (see jpeglib.h, line 109)                  */
++        hlensLen = 256;
++    }
+     for (i = 0; i < hvalsLen; i++) {
+         huff_ptr->huffval[i] = (UINT8)hvalsBody[i];
+     }
+@@ -772,6 +786,11 @@
+     j_compress_ptr comp;
+     j_decompress_ptr decomp;
+     jsize hlen = (*env)->GetArrayLength(env, DCHuffmanTables);
++
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra DC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
+@@ -793,6 +812,10 @@
+         huff_ptr->sent_table = !write;
+     }
+     hlen = (*env)->GetArrayLength(env, ACHuffmanTables);
++    if (hlen > NUM_HUFF_TBLS) {
++        /* Ignore extra AC huffman tables. */
++        hlen = NUM_HUFF_TBLS;
++    }
+     for (i = 0; i < hlen; i++) {
+         if (cinfo->is_decompressor) {
+             decomp = (j_decompress_ptr) cinfo;
diff -r 7c131a5e1ccf -r 2c854193cc9d patches/security/icedtea-6863503.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6863503.patch	Tue Nov 03 17:50:20 2009 +0100
@@ -0,0 +1,33 @@
+--- old/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
++++ openjdk/jdk/src/share/classes/java/security/MessageDigest.java	Thu Sep 24 22:22:15 2009
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
++ * Copyright 1996-2009 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
+@@ -414,16 +414,17 @@
+      *
+      * @return true if the digests are equal, false otherwise.
+      */
+-    public static boolean isEqual(byte digesta[], byte digestb[]) {
+-        if (digesta.length != digestb.length)
++    public static boolean isEqual(byte[] digesta, byte[] digestb) {
++        if (digesta.length != digestb.length) {
+             return false;
++        }
+ 
++        int result = 0;
++        // time-constant comparison
+         for (int i = 0; i < digesta.length; i++) {
+-            if (digesta[i] != digestb[i]) {
+-                return false;
+-            }
++            result |= digesta[i] ^ digestb[i];
+         }
+-        return true;
++        return result == 0;
+     }
+ 
+     /**
diff -r 7c131a5e1ccf -r 2c854193cc9d patches/security/icedtea-6864911.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6864911.patch	Tue Nov 03 17:50:20 2009 +0100
@@ -0,0 +1,422 @@
+--- old/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.595709900 +0800
++++ openjdk/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java	2009-08-18 09:35:56.087195700 +0800
+@@ -32,12 +32,8 @@
+ import java.io.OutputStream;
+ import java.io.InputStream;
+ import java.net.Socket;
+-import java.util.Vector;
+-import java.util.Hashtable;
+ 
+ import javax.naming.CommunicationException;
+-import javax.naming.AuthenticationException;
+-import javax.naming.AuthenticationNotSupportedException;
+ import javax.naming.ServiceUnavailableException;
+ import javax.naming.NamingException;
+ import javax.naming.InterruptedNamingException;
+@@ -47,6 +43,8 @@
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.InvocationTargetException;
++import java.util.Arrays;
++import sun.misc.IOUtils;
+ //import javax.net.SocketFactory;
+ 
+ /**
+@@ -799,7 +797,6 @@
+         byte inbuf[];   // Buffer for reading incoming bytes
+         int inMsgId;    // Message id of incoming response
+         int bytesread;  // Number of bytes in inbuf
+-        int bytesleft;  // Number of bytes that need to read for completing resp
+         int br;         // Temp; number of bytes read from stream
+         int offset;     // Offset of where to store bytes in inbuf
+         int seqlen;     // Length of ASN sequence
+@@ -811,7 +808,7 @@
+         try {
+             while (true) {
+                 try {
+-                    inbuf = new byte[2048];
++                    inbuf = new byte[10];
+ 
+                     offset = 0;
+                     seqlen = 0;
+@@ -871,19 +868,10 @@
+                     }
+ 
+                     // read in seqlen bytes
+-                    bytesleft = seqlen;
+-                    if ((offset + bytesleft) > inbuf.length) {
+-                        byte nbuf[] = new byte[offset + bytesleft];
+-                        System.arraycopy(inbuf, 0, nbuf, 0, offset);
+-                        inbuf = nbuf;
+-                    }
+-                    while (bytesleft > 0) {
+-                        bytesread = in.read(inbuf, offset, bytesleft);
+-                        if (bytesread < 0)
+-                            break; // EOF
+-                        offset += bytesread;
+-                        bytesleft -= bytesread;
+-                    }
++                    byte[] left = IOUtils.readFully(in, seqlen, false);
++                    inbuf = Arrays.copyOf(inbuf, offset + left.length);
++                    System.arraycopy(left, 0, inbuf, offset, left.length);
++                    offset += left.length;
+ /*
+ if (dump > 0) {
+ System.err.println("seqlen: " + seqlen);
+--- old/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:36:00.901075900 +0800
++++ openjdk/jdk/src/share/classes/sun/applet/AppletClassLoader.java	2009-08-18 09:35:59.999916100 +0800
+@@ -51,6 +51,7 @@
+ import java.security.PermissionCollection;
+ import sun.awt.AppContext;
+ import sun.awt.SunToolkit;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -314,36 +315,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                // Read until end of stream is reached - use 8K buffer
+-                // to speed up performance [stanleyh]
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.965921700 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/Resource.java	2009-08-18 09:36:03.449689900 +0800
+@@ -25,14 +25,15 @@
+ 
+ package sun.misc;
+ 
++import java.io.EOFException;
+ import java.net.URL;
+ import java.io.IOException;
+ import java.io.InterruptedIOException;
+ import java.io.InputStream;
+ import java.security.CodeSigner;
+ import java.util.jar.Manifest;
+-import java.util.jar.Attributes;
+ import java.nio.ByteBuffer;
++import java.util.Arrays;
+ import sun.nio.ByteBuffered;
+ 
+ /**
+@@ -105,49 +106,37 @@
+         }
+ 
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = 0;
+-                    try {
+-                        n = in.read(b, b.length - len, len);
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
++            b = new byte[0];
++            if (len == -1) len = Integer.MAX_VALUE;
++            int pos = 0;
++            while (pos < len) {
++                int bytesToRead;
++                if (pos >= b.length) { // Only expand when there's no room
++                    bytesToRead = Math.min(len - pos, b.length + 1024);
++                    if (b.length < pos + bytesToRead) {
++                        b = Arrays.copyOf(b, pos + bytesToRead);
+                     }
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
++                } else {
++                    bytesToRead = b.length - pos;
+                 }
+-            } else {
+-                // Read until end of stream is reached
+-                b = new byte[1024];
+-                int total = 0;
+-                for (;;) {
+-                    len = 0;
+-                    try {
+-                        len = in.read(b, total, b.length - total);
+-                        if (len == -1)
+-                            break;
+-                    } catch (InterruptedIOException iioe) {
+-                        Thread.interrupted();
+-                        isInterrupted = true;
+-                    }
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
++                int cc = 0;
++                try {
++                    cc = in.read(b, pos, bytesToRead);
++                } catch (InterruptedIOException iioe) {
++                    Thread.interrupted();
++                    isInterrupted = true;
+                 }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
++                if (cc < 0) {
++                    if (len != Integer.MAX_VALUE) {
++                        throw new EOFException("Detect premature EOF");
++                    } else {
++                        if (b.length != pos) {
++                            b = Arrays.copyOf(b, pos);
++                        }
++                        break;
++                    }
+                 }
++                pos += cc;
+             }
+         } finally {
+             try {
+--- old/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:07.067128400 +0800
++++ openjdk/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java	2009-08-18 09:36:06.464179700 +0800
+@@ -44,6 +44,7 @@
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Map;
++import sun.misc.IOUtils;
+ import sun.net.www.ParseUtil;
+ import sun.security.util.SecurityConstants;
+ 
+@@ -375,34 +376,7 @@
+ 
+         byte[] b;
+         try {
+-            if (len != -1) {
+-                // Read exactly len bytes from the input stream
+-                b = new byte[len];
+-                while (len > 0) {
+-                    int n = in.read(b, b.length - len, len);
+-                    if (n == -1) {
+-                        throw new IOException("unexpected EOF");
+-                    }
+-                    len -= n;
+-                }
+-            } else {
+-                b = new byte[8192];
+-                int total = 0;
+-                while ((len = in.read(b, total, b.length - total)) != -1) {
+-                    total += len;
+-                    if (total >= b.length) {
+-                        byte[] tmp = new byte[total * 2];
+-                        System.arraycopy(b, 0, tmp, 0, total);
+-                        b = tmp;
+-                    }
+-                }
+-                // Trim array to correct size, if necessary
+-                if (total != b.length) {
+-                    byte[] tmp = new byte[total];
+-                    System.arraycopy(b, 0, tmp, 0, total);
+-                    b = tmp;
+-                }
+-            }
++            b = IOUtils.readFully(in, len, true);
+         } finally {
+             in.close();
+         }
+--- old/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.684391400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java	2009-08-18 09:36:10.088986300 +0800
+@@ -36,6 +36,7 @@
+ import java.net.*;
+ import javax.security.auth.x500.X500Principal;
+ 
++import sun.misc.IOUtils;
+ import sun.security.util.*;
+ import sun.security.x509.*;
+ 
+@@ -344,17 +345,7 @@
+             in = con.getInputStream();
+ 
+             int contentLength = con.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+-
+-            byte[] response = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = in.read(response, total, response.length - total);
+-                total += count;
+-            }
++            byte[] response = IOUtils.readFully(in, contentLength, false);
+ 
+             OCSPResponse ocspResponse = new OCSPResponse(response, pkixParams,
+                 responderCert);
+--- old/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.859436200 +0800
++++ openjdk/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java	2009-08-18 09:36:13.165978900 +0800
+@@ -33,6 +33,7 @@
+ import java.util.Iterator;
+ import java.util.Set;
+ 
++import sun.misc.IOUtils;
+ import sun.security.pkcs.*;
+ 
+ /**
+@@ -138,19 +139,9 @@
+                 System.out.println();
+             }
+             int contentLength = connection.getContentLength();
+-            if (contentLength == -1) {
+-                contentLength = Integer.MAX_VALUE;
+-            }
+             verifyMimeType(connection.getContentType());
++            replyBuffer = IOUtils.readFully(input, contentLength, false);
+ 
+-            replyBuffer = new byte[contentLength];
+-            int total = 0;
+-            int count = 0;
+-            while (count != -1 && total < contentLength) {
+-                count = input.read(replyBuffer, total,
+-                                        replyBuffer.length - total);
+-                total += count;
+-            }
+             if (DEBUG) {
+                 System.out.println("received timestamp response (length=" +
+                         replyBuffer.length + ")");
+--- old/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:18.392602400 +0800
++++ openjdk/jdk/src/share/classes/sun/security/util/DerValue.java	2009-08-18 09:36:17.617711400 +0800
+@@ -28,6 +28,7 @@
+ import java.io.*;
+ import java.math.BigInteger;
+ import java.util.Date;
++import sun.misc.IOUtils;
+ 
+ /**
+  * Represents a single DER-encoded value.  DER encoding rules are a subset
+@@ -384,12 +385,8 @@
+         if (fullyBuffered && in.available() != length)
+             throw new IOException("extra data given to DerValue constructor");
+ 
+-        byte[] bytes = new byte[length];
++        byte[] bytes = IOUtils.readFully(in, length, true);
+ 
+-        // n.b. readFully not needed in normal fullyBuffered case
+-        DataInputStream dis = new DataInputStream(in);
+-
+-        dis.readFully(bytes);
+         buffer = new DerInputBuffer(bytes);
+         return new DerInputStream(buffer);
+     }
+--- /dev/null	2009-07-23 00:25:50.000000000 +0800
++++ openjdk/jdk/src/share/classes/sun/misc/IOUtils.java	2009-08-18 09:36:21.385422200 +0800
+@@ -0,0 +1,80 @@
++/*
++ * Copyright 2009 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.


From ed at camswl.com  Wed Nov  4 04:47:34 2009
From: ed at camswl.com (Edward Nevill)
Date: Wed, 4 Nov 2009 12:47:34 GMT
Subject: Request to commit: HS16 + OSR changes for ARM
Message-ID: <200911041247.nA4ClYdC017324@parsley.camswl.com>

Hi Folks,

The following changes make hs16 work for ARM and add OSR support for Shark. The files
affected are

- asm_helper.cpp
- bytecodes_arm.def
- cppInterpreter_arm.S
- sharkCacheDecache.cpp

The last change (sharkCacheDecache.cpp) is to fix an 'Unimplemented()' error when a
method with multiple monitors is OSRed. I have discussed this change with Gary.

Gary? Are you happy with the change to sharkCacheDecache.cpp?

It has been suggested by Gary that if the changes are purely to ARM code then I should
just commit. Andrew has said that he would prefer such changes were posted for
discussion. Would it be a reasonable comproise to say that if the changes are posted,
and there are no objections within 24 hours  then I can just go ahead and commit the changes
(this would only apply to files which are ARM only).

In the above case the 1st 3 files would not need approval, since they are ARM only. The
last would need Gary's approval.

Regards,
Ed.

--- CUT HERE -------------------------------------------------------------------------------
diff -ruNE old/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp new/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- old/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	2009-11-04 11:33:19.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	2009-11-04 11:41:06.000000000 +0000
@@ -110,6 +110,7 @@
 	print_def("METHOD_NATIVEHANDLER", sizeof(methodOopDesc));
 	print_def("METHOD_SIGNATUREHANDLER", sizeof(methodOopDesc)+4);
 	nl();
+        print_def("CONSTMETHOD_CODESIZE", offset_of(constMethodOopDesc, _code_size));
 	print_def("CONSTMETHOD_CODEOFFSET", sizeof(constMethodOopDesc));
 	nl();
 	print_def("JNIHANDLEBLOCK_TOP", offset_of(JNIHandleBlock, _top));
@@ -124,6 +125,14 @@
 	nl();
 	print_def("CONSTANTPOOL_TAGS", offset_of(constantPoolOopDesc, _tags));
 	print_def("CONSTANTPOOL_CACHE", offset_of(constantPoolOopDesc, _cache));
+	print_def("CONSTANTPOOL_BASE", sizeof(constantPoolOopDesc));
+	nl();
+	print_def("CP_OFFSET", in_bytes(constantPoolCacheOopDesc::base_offset()));
+	nl();
+	print_def("BASE_OFFSET_BYTE", arrayOopDesc::base_offset_in_bytes(T_BYTE));
+	print_def("BASE_OFFSET_SHORT", arrayOopDesc::base_offset_in_bytes(T_SHORT));
+	print_def("BASE_OFFSET_WORD", arrayOopDesc::base_offset_in_bytes(T_INT));
+	print_def("BASE_OFFSET_LONG", arrayOopDesc::base_offset_in_bytes(T_LONG));
 	nl();
 	print_def("SIZEOF_HANDLEMARK", sizeof(HandleMark));
 }
diff -ruNE old/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- old/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	2009-11-04 11:33:19.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	2009-11-04 11:41:01.000000000 +0000
@@ -521,7 +521,7 @@
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
 	DISPATCH_NEXT
-	ldr	tmp1, [r3, #12]
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -541,7 +541,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #3
-	ldr	tmp2, [r3, #16]
+	ldr	tmp2, [r3, #BASE_OFFSET_LONG]
 	DISPATCH_NEXT
 	ldr	tmp1, [r3, #20]
 	DISPATCH_NEXT
@@ -565,7 +565,7 @@
 	DISPATCH_NEXT
 	add	r3, r3, r2
 	DISPATCH_NEXT
-	ldrsb	tmp1, [r3, #12]
+	ldrsb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -586,7 +586,7 @@
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
 	DISPATCH_NEXT
-	ldrh	tmp1, [r3, #12]
+	ldrh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -607,7 +607,7 @@
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
 	DISPATCH_NEXT
-	ldrsh	tmp1, [r3, #12]
+	ldrsh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -742,7 +742,7 @@
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2, lsl #2
 	DISPATCH_NEXT
-	str	r3, [tmp1, #12]
+	str	r3, [tmp1, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -758,7 +758,7 @@
 	bcs	array_bound_exception_jpc_1_tmp2
 	DISPATCH_NEXT
 	add	tmp2, tmp1, tmp2, lsl #3
-	str	r1, [tmp2, #16]
+	str	r1, [tmp2, #BASE_OFFSET_LONG]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	str	r3, [tmp2, #20]
@@ -778,7 +778,7 @@
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2
 	DISPATCH_NEXT
-	strb	r3, [tmp1, #12]
+	strb	r3, [tmp1, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -795,7 +795,7 @@
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2, lsl #1
 	DISPATCH_NEXT
-	strh	r3, [tmp1, #12]
+	strh	r3, [tmp1, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -1994,7 +1994,7 @@
 	ldr	r3, [istate, #ISTATE_METHOD]			@ method
 	ldrb	lr, [jpc, #1]
 
-	ldr	tmp1, [r3, #12]			@ constants
+	ldr	tmp1, [r3, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2012,14 +2012,14 @@
 	bne	1f
 
 	add	r3, tmp1, lr, lsl #2
-	ldr	r3, [r3, #32]
+	ldr	r3, [r3, #CONSTANTPOOL_BASE]
 	DISPATCH_NEXT
 	PUSH	r3
 	DISPATCH_FINISH
 1:
 	cmp	r3, #JVM_CONSTANT_Class
 	bne	2f
-	add	r0, tmp1, #32
+	add	r0, tmp1, #CONSTANTPOOL_BASE
 	ldr	r0, [r0, lr, lsl #2]
 	ldr	r1, [r0, #60]
 	PUSH	r1
@@ -2051,7 +2051,7 @@
 
 	ldr	r3, [istate, #ISTATE_METHOD]			@ method
 	ldrb	ip, [jpc, #2]
-	ldr	r2, [r3, #12]			@ constants
+	ldr	r2, [r3, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2069,7 +2069,7 @@
 	bne	1f
 
 	add	r3, r2, lr, lsl #2
-	ldr	r3, [r3, #32]
+	ldr	r3, [r3, #CONSTANTPOOL_BASE]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	PUSH	r3
@@ -2077,7 +2077,7 @@
 1:
 	cmp	r3, #JVM_CONSTANT_Class
 	bne	2f
-	add	r0, r2, #32
+	add	r0, r2, #CONSTANTPOOL_BASE
 	ldr	r0, [r0, lr, lsl #2]
 	ldr	r1, [r0, #60]
 	PUSH	r1
@@ -2109,7 +2109,7 @@
 
 	ldr	tmp1, [istate, #ISTATE_METHOD]			@ method
 	ldrb	lr, [jpc, #2]
-	ldr	r2, [tmp1, #12]			@ constants
+	ldr	r2, [tmp1, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2126,8 +2126,8 @@
 	bne	vm_fatal_error
 
 	add	tmp1, r2, r3, lsl #2
-	ldr	r3, [tmp1, #32]
-	ldr	tmp1, [tmp1, #36]
+	ldr	r3, [tmp1, #CONSTANTPOOL_BASE]
+	ldr	tmp1, [tmp1, #CONSTANTPOOL_BASE+4]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	PUSH	r3, tmp1
@@ -3126,7 +3126,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #2
-	ldr	lr, [r3, #12]
+	ldr	lr, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3145,7 +3145,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #2
-	ldr	lr, [r3, #12]
+	ldr	lr, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3166,7 +3166,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2
-	ldrsb	lr, [r3, #12]
+	ldrsb	lr, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3187,7 +3187,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrh	lr, [r3, #12]
+	ldrh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3208,7 +3208,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrsh	lr, [r3, #12]
+	ldrsh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3227,7 +3227,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2
-	ldrsb	lr, [r3, #12]
+	ldrsb	lr, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3246,7 +3246,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrh	lr, [r3, #12]
+	ldrh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3265,7 +3265,7 @@
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrsh	lr, [r3, #12]
+	ldrsh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3289,7 +3289,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -3309,7 +3309,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2
-	strb	tmp1, [r3, #12]
+	strb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -3329,7 +3329,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
-	strh	tmp1, [r3, #12]
+	strh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -3346,7 +3346,7 @@
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3, lsl #2
-	str	r2, [tmp1, #12]
+	str	r2, [tmp1, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -3363,7 +3363,7 @@
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3
-	strb	r2, [tmp1, #12]
+	strb	r2, [tmp1, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -3380,7 +3380,7 @@
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3, lsl #1
-	strh	r2, [tmp1, #12]
+	strh	r2, [tmp1, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -4754,7 +4754,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_3_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4775,7 +4775,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4796,7 +4796,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4814,7 +4814,7 @@
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
 	POP	lr			@ r2 = index, lr = arrayref
-	ldr	r2, [r3, #12]
+	ldr	r2, [r3, #BASE_OFFSET_WORD]
 	SW_NPC	cmp	lr, #0
 	SW_NPC	beq	null_ptr_exception_jpc_1
 .abortentry44:
@@ -4823,7 +4823,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	r2, [lr, #12]
+	ldr	r2, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2
 	DISPATCH_FINISH
@@ -4841,7 +4841,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_3_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	str	r3, [locals, -r2, lsl #2]
 	DISPATCH_FINISH
@@ -4860,7 +4860,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	str	r3, [locals, r2, lsl #2]
 	DISPATCH_FINISH
@@ -4876,7 +4876,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4888,7 +4888,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -4902,7 +4902,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4914,7 +4914,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2
-	strb	tmp1, [r3, #12]
+	strb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -4928,7 +4928,7 @@
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4940,7 +4940,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
-	strh	tmp1, [r3, #12]
+	strh	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -4955,7 +4955,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	and	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -4974,7 +4974,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	orr	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -4993,7 +4993,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	eor	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -5012,7 +5012,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5035,7 +5035,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5058,7 +5058,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5081,7 +5081,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5104,7 +5104,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5127,7 +5127,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5150,7 +5150,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5174,7 +5174,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5198,7 +5198,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5222,7 +5222,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5246,7 +5246,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5270,7 +5270,7 @@
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r2, [r3, #12]		@ r1 = tos
+	ldr	r2, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
 	POP	r3
         ldrsb   r1, [jpc, #2]
@@ -5332,7 +5332,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH
@@ -5365,7 +5365,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -5698,7 +5698,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH
@@ -5731,7 +5731,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -6064,7 +6064,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH
@@ -6097,7 +6097,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -6430,7 +6430,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH
@@ -6463,7 +6463,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -6797,7 +6797,7 @@
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	tmp1
 	DISPATCH_FINISH
@@ -6830,7 +6830,7 @@
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -10032,7 +10032,7 @@
 	DISPATCH_NEXT
 	add	tmp2, tmp1, tmp2, lsl #3
 	fmacd	d2, d1, d0
-	vstr	d2, [tmp2, #16]
+	vstr	d2, [tmp2, #BASE_OFFSET_LONG]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	add	stack, stack, #32
diff -ruNE old/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- old/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-11-04 11:33:19.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2009-11-04 11:40:55.000000000 +0000
@@ -17,12 +17,28 @@
 
 #ifdef HOTSPOT_ASM
 
+#define ARMv4
+
 #ifdef SHARK
 #define USE_COMPILER
 #define DISABLE_NOTICE_SAFEPOINTS
 #endif
 
-#define ARMv4
+#ifdef USE_COMPILER
+
+#define MP_COMPILE_THRESHOLD    0x10000         // 65536 - must be a single MOV constant
+#define UP_COMPILE_THRESHOLD    0x30000         // 196608 - must be a single MOV constant
+
+#define MAX_FG_METHOD_SIZE      500
+
+#ifndef DISABLE_ON_STACK_REPLACEMENT
+#define ON_STACK_REPLACEMENT
+#endif
+#ifndef ENABLE_BG_COMP_ON_NON_MP
+#define DISABLE_BG_COMP_ON_NON_MP
+#endif
+
+#endif // USE_COMPILER
 
 #ifndef DISABLE_NOTICE_SAFEPOINTS
 #define NOTICE_SAFEPOINTS
@@ -51,8 +67,6 @@
 #define constpool	r9
 #define arm_sp		r13
 
-#define CP_OFFSET	16
-
 #define tmp_xxx		r7
 #define tmp_yyy		r5
 #define tmp_vvv		r9
@@ -238,6 +252,25 @@
 #endif
 	.endm
 
+ at ------------------------------------------------
+@ On stack replacement macro
+@ Usage:
+@       OSR     <compiler specific code>
+ at ------------------------------------------------
+        .macro  OSR     p1, p2, p3, p4
+#ifdef ON_STACK_REPLACEMENT
+  .ifnes "\p4", ""
+        \p1 \p2, \p3, \p4
+  .else
+    .ifnes "\p3", ""
+        \p1 \p2, \p3
+    .else
+        \p1 \p2
+    .endif
+  .endif
+#endif
+        .endm
+
 	.macro	Opcode	label
 	ALIGN_OPCODE
 do_\label:
@@ -2582,42 +2615,39 @@
 	PUSH	tmp2
 	DISPATCH_FINISH
 
-@ ip = branch offset
-@ r0 = 1st bytecode
-@ jpc has been updated
 	Opcode	goto
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
+branch_taken:
         orr     tmp1, tmp1, r1, lsl #8
         DISPATCH_START_REG	tmp1
-branch_taken:
-	ldr	r2, [dispatch, #SafePointSynchronize_state_Address-XXX]
 	cmp	tmp1, #0
+	ble	do_backedge
+	DISPATCH_FINISH
+
+do_backedge:
   USEC	ldr	tmp2, [istate, #ISTATE_METHOD]
-	ldr	r1, [r2]
-	bgt	branch_no_check
+  OSR	ldr	lr, [dispatch, #InterpreterInvocationLimit_Address-XXX]
+  USEC	ldr	r1, [tmp2, #METHOD_BACKEDGECOUNTER]
+  USEC	ldr	ip, [tmp2, #METHOD_INVOCATIONCOUNTER]
+  USEC	add	r1, r1, #INVOCATIONCOUNTER_COUNTINCREMENT
+  OSR	ldr	lr, [lr]
+  USEC	add	ip, ip, #INVOCATIONCOUNTER_COUNTINCREMENT
+  USEC	str	r1, [tmp2, #METHOD_BACKEDGECOUNTER]
+  OSR	cmp	r1, lr, lsl #2
+  USEC	str	ip, [tmp2, #METHOD_INVOCATIONCOUNTER]
+  OSR	bcs	do_osr
 
-@ ECN: The C code does...
-@	if (UseCompiler && UseLoopCounter) {
-@		BACKEDGE_COUNT->increment();
-@		...
-@	}
-@ However, I just increment the counter because the check is actually
-@ more expensive than the increment. I don't believe this matters
-@ semantically, since is UseCompiler or UseLoopCounter is false then
-@ we shouldn't even be looking at the backedge counter.
-@
-@ ECN:	Concerns about counter overflowing
-@
-  USEC	ldr	r3, [tmp2, #METHOD_BACKEDGECOUNTER]
+osr_continue:
+	ldr	ip, [dispatch, #SafePointSynchronize_state_Address-XXX]
+	ldr	r1, [ip]
 	cmp	r1, #1
-  USEC	add	r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT
-  USEC	str	r3, [tmp2, #METHOD_BACKEDGECOUNTER]
-
-	bne	branch_no_check
+	beq	do_synchronize
+	DISPATCH_STATE	1
+	DISPATCH_FINISH
 
-	sub	jpc, jpc, tmp1		@ Point jpc back at the branch!!!
 
+do_synchronize:
 	add	r0, istate, #ISTATE_THREAD
 	bl	HandleMarkCleanerD
 	ldr	r0, [istate, #ISTATE_THREAD]
@@ -2632,16 +2662,103 @@
 	CACHE_JPC
 	cmp	r3, #0
 	bne	handle_exception
+	DISPATCH	0
+
+#ifdef ON_STACK_REPLACEMENT
+do_osr:
+	ldr	ip, [dispatch, #UseOnStackReplacement_Address-XXX]
+	ldrb	ip, [ip]
+	cmp	ip, #0
+	beq	osr_continue
+
+	ldr	r3, [tmp2, #METHOD_CONSTMETHOD]
+	DECACHE_JPC
+	ldrh	r3, [r3, #CONSTMETHOD_CODESIZE]
+	DECACHE_STACK
+	ldr	r0, [istate, #ISTATE_THREAD]
+	sub	r1, jpc, tmp1
+	cmp	r3, #MAX_FG_METHOD_SIZE
+	bcc	1f
+	ldr	tmp2, [dispatch, #BackgroundCompilation_Address-XXX]
+	mov	r3, #1
+	ldr	r5, [tmp2]
+	str	r3, [tmp2]
+	bl	_ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+	str	r5, [tmp2]
+	b	2f
+1:
+	bl	_ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+2:
+	ldr	r3, [istate, #ISTATE_THREAD]
+	ASSERT_LOCALS_CACHED
+	ASSERT_STACK_CACHED
+	CACHE_CP
+	ldr	r1, [r3, #THREAD_PENDING_EXC]
+	CACHE_JPC
+	cmp	r1, #0
+	bne	handle_exception
+	cmp	r0, #0
+	beq	1f
+	ldr	r1, [r0, #56]
+	cmn	r1, #2
+	bne	osr_migrate
+1:
+	DISPATCH_START	0
+	b	osr_continue
+#endif
+
+#ifdef ON_STACK_REPLACEMENT
+osr_migrate:
+	ldr	tmp1, [r0, #128]	@ osr_method->osr_entry()
+	ldr	tmp2, [istate, #ISTATE_ADVANCE_PC]
+@	ldr	istate, [istate, #ISTATE_NEXT_FRAME]
+	mov	r0, r3
+	bl	_ZN13SharedRuntime19OSR_migration_beginEP10JavaThread
+	mov	r1, r0
+	ldr	r0, [istate, #ISTATE_METHOD]
+	ldrh	lr, [r0, #METHOD_MAXLOCALS]
+	ldrh	ip, [r0, #METHOD_SIZEOFPARAMETERS]
+	ldr	r3, [istate, #ISTATE_THREAD]
+	sub	lr, lr, ip
+	ldr	r2, [r3, #THREAD_TOP_ZERO_FRAME]
+	add	ip, r2, #4
+	ldr	r2, [r2]
+	add	ip, ip, lr, lsl #2
+	str	r2, [r3, #THREAD_TOP_ZERO_FRAME]
+	str	ip, [r3, #THREAD_JAVA_SP]
+	mov	r2, tmp1
+; r0 = method
+; r1 = osr_buf
+; r2 = osr_entry
+	mov	lr, pc
+	ldr	pc, [tmp1]
+
+	cmp	tmp2, #0
+	ldmeqfd	arm_sp!, {regset, pc}
 
-	DISPATCH_START_REG	tmp1	@ Refetch opcode and update jpc again
-branch_no_check:
-@ ECN: There is no protection against INVOCATIONCOUNTER overflowing!!!
-  USEC	ldr	r3, [tmp2, #METHOD_INVOCATIONCOUNTER]
+	ldr	istate, [istate, #ISTATE_NEXT_FRAME]
+        ldr	lr, [istate, #-ISTATE_NEXT_FRAME+ISTATE_THREAD]!
+        CACHE_JPC
+        ldr     stack, [lr, #THREAD_JAVA_SP]
+        ldr     r2, [istate, #ISTATE_STACK_LIMIT]
+        sub     stack, stack, #4
+
+        ldr     r1, [lr, #THREAD_TOP_ZERO_FRAME]
+        add     r2, r2, #4
+        str     r2, [lr, #THREAD_JAVA_SP]
+        str     r1, [lr, #THREAD_LAST_JAVA_SP]
+        ldr     r3, [lr, #THREAD_PENDING_EXC]
+        DISPATCH_START_REG tmp2
+        CACHE_LOCALS
 	DISPATCH_NEXT
-  USEC	add	r3, r3, #INVOCATIONCOUNTER_COUNTINCREMENT
 	DISPATCH_NEXT
-  USEC	str	r3, [tmp2, #METHOD_INVOCATIONCOUNTER]
+        cmp     r3, #0
+        DISPATCH_NEXT
+        bne     return_exception
+	DISPATCH_NEXT
+        CACHE_CP
 	DISPATCH_FINISH
+#endif
 
 	Opcode	ifeq
 	Opcode	ifnull
@@ -2649,11 +2766,8 @@
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orreq   tmp1, tmp1, r1, lsl #8
-        ldreqb  r0, [jpc, tmp1]!
-        ldrneb  r0, [jpc, #3]!
 	beq	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	ifne
 	Opcode	ifnonnull
@@ -2661,55 +2775,40 @@
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orrne   tmp1, tmp1, r1, lsl #8
-        ldrneb  r0, [jpc, tmp1]!
-        ldreqb  r0, [jpc, #3]!
 	bne	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	iflt
         POP     r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orrlt   tmp1, tmp1, r1, lsl #8
-        ldrltb  r0, [jpc, tmp1]!
-        ldrgeb  r0, [jpc, #3]!
 	blt	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	ifge
         POP     r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orrge   tmp1, tmp1, r1, lsl #8
-        ldrgeb  r0, [jpc, tmp1]!
-        ldrltb  r0, [jpc, #3]!
 	bge	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	ifgt
         POP     r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orrgt   tmp1, tmp1, r1, lsl #8
-        ldrgtb  r0, [jpc, tmp1]!
-        ldrleb  r0, [jpc, #3]!
 	bgt	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	ifle
         POP     r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, #0
-        orrle   tmp1, tmp1, r1, lsl #8
-        ldrleb  r0, [jpc, tmp1]!
-        ldrgtb  r0, [jpc, #3]!
 	ble	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmpeq
 	Opcode	if_acmpeq
@@ -2717,11 +2816,8 @@
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orreq   tmp1, tmp1, r1, lsl #8
-        ldreqb  r0, [jpc, tmp1]!
-        ldrneb  r0, [jpc, #3]!
 	beq	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmpne
 	Opcode	if_acmpne
@@ -2729,55 +2825,40 @@
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orrne   tmp1, tmp1, r1, lsl #8
-        ldrneb  r0, [jpc, tmp1]!
-        ldreqb  r0, [jpc, #3]!
 	bne	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmplt
         POP    r2, r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orrlt   tmp1, tmp1, r1, lsl #8
-        ldrltb  r0, [jpc, tmp1]!
-        ldrgeb  r0, [jpc, #3]!
 	blt	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmpge
         POP    r2, r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orrge   tmp1, tmp1, r1, lsl #8
-        ldrgeb  r0, [jpc, tmp1]!
-        ldrltb  r0, [jpc, #3]!
 	bge	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmpgt
         POP    r2, r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orrgt   tmp1, tmp1, r1, lsl #8
-        ldrgtb  r0, [jpc, tmp1]!
-        ldrleb  r0, [jpc, #3]!
 	bgt	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	if_icmple
         POP    r2, r3
         ldrsb   r1, [jpc, #1]
         ldrb    tmp1, [jpc, #2]
         cmp     r3, r2
-        orrle   tmp1, tmp1, r1, lsl #8
-        ldrleb  r0, [jpc, tmp1]!
-        ldrgtb  r0, [jpc, #3]!
 	ble	branch_taken
-	DISPATCH_BYTECODE
+	DISPATCH	3
 
 	Opcode	ireturn
 	Opcode	freturn
@@ -3122,7 +3203,7 @@
 	cmpne	r3, #JVM_CONSTANT_UnresolvedClass
 	beq	.new_slow_case
 
-	add	r3, lr, #32
+	add	r3, lr, #CONSTANTPOOL_BASE
 	ldr	k_entry, [r3, r2, lsl #2]
 
 	add	r1, k_entry, #KLASS_PART
@@ -3308,7 +3389,7 @@
 4:
 	ldr	r0, [r0, #4]
 	add	r3, r3, tmp2, lsl #2
-	ldr	tmp1, [r3, #32]
+	ldr	tmp1, [r3, #CONSTANTPOOL_BASE]
 	cmp	tmp1, r0
 	beq	.checkcast_exit
 
@@ -3401,7 +3482,7 @@
 	cmp	r0, #0
 	ldr	ip, [r3, #CONSTANTPOOL_TAGS]
 	beq	.instanceof_not_instance
-	add	ip, ip, #12
+	add	ip, ip, #BASE_OFFSET_BYTE
 	orr	tmp2, r1, r2, lsl #8
 	ldrb	r2, [ip, tmp2]
 	cmp	r2, #JVM_CONSTANT_UnresolvedClassInError
@@ -3411,7 +3492,7 @@
 1:
 	ldr	r0, [r0, #4]
 	add	r3, r3, tmp2, lsl #2
-	ldr	tmp1, [r3, #32]
+	ldr	tmp1, [r3, #CONSTANTPOOL_BASE]
 	cmp	tmp1, r0
 	beq	.instanceof_is_instance
 
@@ -3685,7 +3766,7 @@
 	beq	raise_exception
 .aastore_exit:
     ldr r2, [dispatch, #Universe_collectedHeap_Address-XXX]
-	add	r1, tmp1, #12
+	add	r1, tmp1, #BASE_OFFSET_WORD
 	str	sl, [r1, tmp_vvv, asl #2]!
     ldr	r3, [r2]
 	mov	lr, #0
@@ -4010,9 +4091,22 @@
 
 #ifdef USE_COMPILER
 sync_method_entry_freq_count_overflow:
+        ldr     r3, [r0, #METHOD_CONSTMETHOD]
+        ldrh    r3, [r3, #CONSTMETHOD_CODESIZE]
 	mov	r1, #0
 	mov	r0, tmp1
+        cmp     r3, #MAX_FG_METHOD_SIZE
+        bcc     1f
+        ldr     tmp2, [dispatch, #BackgroundCompilation_Address-XXX]
+        mov     r3, #1
+        ldr     r5, [tmp2]
+        str     r3, [tmp2]
+        bl      _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+        str     r5, [tmp2]
+        b       2f
+1:
 	bl	_ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+2:
 	ldr	r0, [istate, #ISTATE_METHOD]
 	CACHE_JPC
 	ldr	r3, [r0, #METHOD_ACCESSFLAGS]
@@ -4401,12 +4495,16 @@
 	add	r0, r0, ip
 	add	dispatch, r1, r0
 
+  USEC  ldr     r2, [r10, #METHOD_INVOCATIONCOUNTER]
+
 	ldr	stack, [tmp1, #THREAD_JAVA_SP]
 
 	ldr	r0, [tmp1, #THREAD_STACK_SIZE]
+  USEC  add     r2, r2, #INVOCATIONCOUNTER_COUNTINCREMENT * 4
 	ldr	r3, [tmp1, #THREAD_STACK_BASE]
 	rsb	r3, r0, r3
 	rsb	r3, r3, arm_sp
+  USEC  str     r2, [tmp2, #METHOD_INVOCATIONCOUNTER]
 	cmp	r3, #32768
 	bge	fast_normal_entry_with_len
 
@@ -4596,11 +4694,24 @@
 	DISPATCH_FINISH
 #ifdef USE_COMPILER
 method_entry_freq_count_overflow:
+        ldr     r3, [r10, #METHOD_CONSTMETHOD]
 	DECACHE_JPC
+        ldrh    r3, [r3, #CONSTMETHOD_CODESIZE]
 	str	r10, [istate, #ISTATE_METHOD]
 	mov	r1, #0
 	mov	r0, tmp1
+        cmp     r3, #MAX_FG_METHOD_SIZE
+        bcc     1f
+        ldr     tmp2, [dispatch, #BackgroundCompilation_Address-XXX]
+        mov     r3, #1
+        ldr     r5, [tmp2]
+        str     r3, [tmp2]
+        bl      _ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+        str     r5, [tmp2]
+        b       2f
+1:
 	bl	_ZN18InterpreterRuntime26frequency_counter_overflowEP10JavaThreadPh
+2:
 	CACHE_JPC
 	CACHE_CP
 	DISPATCH	0
@@ -6230,12 +6341,14 @@
 
 	ALIGN_CODE
 bci_init:
+        stmfd   sp!, {r4, lr}
+
 	adrl	r3, dispatch_init_adcon
 	ldm	r3, {r0, r1}
 	add	r0, r0, r3
-	add	r1, r1, r0
+        add     r4, r1, r0
 	adrl	r2, adcon_init_table
-	mov	r3, r1
+        mov     r1, r4
 1:
 	ldr	ip, [r2], #4
 	cmp	ip, #0
@@ -6244,12 +6357,37 @@
 	bne	1b
 	adrl	r2, main_dispatch_table
 	mov	r1, #256
+        mov     r3, r4
 2:
 	ldr	ip, [r2], #4
 	str	ip, [r3], #4
 	subs	r1, r1, #1
 	bne	2b
 
+#ifdef USE_COMPILER
+
+#define NPROCESSORS_CONF        83
+
+        mov     r0, #NPROCESSORS_CONF
+        bl      sysconf
+        cmp     r0, #2
+
+#ifdef DISABLE_BG_COMP_ON_NON_MP
+        movcc   r0, #0
+        ldrcc   r1, [r4, #BackgroundCompilation_Address-XXX]
+        strccb  r0, [r1]
+#endif
+
+        movcs   r0, #MP_COMPILE_THRESHOLD
+        movcc   r0, #UP_COMPILE_THRESHOLD
+        ldr     r1, [r4, #CompileThreshold_Address-XXX]
+        str     r0, [r1]
+
+
+#endif // USE_COMPILER
+
+        ldmfd   sp!, {r4, lr}
+
 #ifdef HW_FP
 vfp_init:
 	stmfd	sp!, {r4, r5, lr}
@@ -6349,6 +6487,9 @@
 	.word	_ZN11JvmtiExport28_can_post_interpreter_eventsE(GOT)
 	.word	UseCompiler(GOT)
 	.word	_ZN17InvocationCounter26InterpreterInvocationLimitE(GOT)
+        .word   CompileThreshold(GOT)
+        .word   BackgroundCompilation(GOT)
+        .word   UseOnStackReplacement(GOT)
 	.word	0
 
 	ALIGN_DATA
@@ -6628,9 +6769,14 @@
 CodeTrace_Buffer_Base:
 	.space	CODETRACE_BUFFER_SIZE
 #endif
+        .word   0, 0, 0, 0, 0, 0, 0, 0
+        .word   0, 0, 0, 0, 0
 DispatchBreakPoint:					.word	0
 VFP_Flag:						.word	0
 CodeTrace_Idx:						.word	0
+UseOnStackReplacement_Address:                          .word   0
+BackgroundCompilation_Address:                          .word   0
+CompileThreshold_Address:                               .word   0
 InterpreterInvocationLimit_Address:			.word	0
 UseCompiler_Address:					.word	0
 can_post_interpreter_events:				.word	0
diff -ruNE old/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp new/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- old/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	2009-11-04 11:33:19.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	2009-11-04 11:42:26.000000000 +0000
@@ -189,9 +189,6 @@
                                           int box_offset,
                                           int obj_offset)
 {
-  if (max_monitors() > 1)
-    Unimplemented();   // XXX which order will they be in?
-
   // Copy the monitor from the OSR buffer to the frame
   int src_offset = max_locals() + index * 2;
   builder()->CreateStore(


From aph at redhat.com  Wed Nov  4 04:44:45 2009
From: aph at redhat.com (Andrew Haley)
Date: Wed, 04 Nov 2009 12:44:45 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <200911041247.nA4ClYdC017324@parsley.camswl.com>
References: <200911041247.nA4ClYdC017324@parsley.camswl.com>
Message-ID: <4AF1773D.5000600@redhat.com>

Edward Nevill wrote:
> Hi Folks,
> 
> The following changes make hs16 work for ARM and add OSR support for Shark. The files
> affected are
> 
> - asm_helper.cpp
> - bytecodes_arm.def
> - cppInterpreter_arm.S
> - sharkCacheDecache.cpp
> 
> The last change (sharkCacheDecache.cpp) is to fix an 'Unimplemented()' error when a
> method with multiple monitors is OSRed. I have discussed this change with Gary.
> 
> Gary? Are you happy with the change to sharkCacheDecache.cpp?
> 
> It has been suggested by Gary that if the changes are purely to ARM code then I should
> just commit. Andrew has said that he would prefer such changes were posted for
> discussion. Would it be a reasonable comproise to say that if the changes are posted,
> and there are no objections within 24 hours  then I can just go ahead and commit the changes
> (this would only apply to files which are ARM only).

That seems reasonable.

Andrew.


From Ivan.Krylov at Sun.COM  Wed Nov  4 06:34:00 2009
From: Ivan.Krylov at Sun.COM (Ivan Krylov)
Date: Wed, 04 Nov 2009 17:34:00 +0300
Subject: [patch] add missing include in nativeInst_<arch>.cpp
In-Reply-To: <4AEAC862.6050504@ubuntu.com>
References: <4AEAC862.6050504@ubuntu.com>
Message-ID: <4AF190D8.1030200@Sun.COM>

Hello Matthias,

Can you say why do you want to change default option to precompiled=off 
? Precompilation helps to build hotspot *a lot* faster.
If you need not to use pch just call
make USE_PRECOMPILED_HEADER=
For debugging purposes you may also want to use HOTSPOT_BUILD_JOBS=1 to 
disable parallel build.

Thanks,

Ivan

Matthias Klose wrote:
> unsure if this is related to zero/shark, but at least that's in the 
> upstream sources for OpenJDK6.
>
> These include failures are usually seen, when not using precompiled 
> headers (which is a useful thing to track down compiler bugs).
>
> attached are two patches to fix the include problem, and one to 
> disable the use of precompiled headers setting an envvar. This way 
> release builds could be built with and without precompiled headers.
>
>   Matthias



From volker.simonis at gmail.com  Wed Nov  4 07:32:12 2009
From: volker.simonis at gmail.com (Volker Simonis)
Date: Wed, 4 Nov 2009 16:32:12 +0100
Subject: [patch] add missing include in nativeInst_<arch>.cpp
In-Reply-To: <4AF190D8.1030200@Sun.COM>
References: <4AEAC862.6050504@ubuntu.com> <4AF190D8.1030200@Sun.COM>
Message-ID: <d65861880911040732h4672b6b9y8b8db2bc9354ce03@mail.gmail.com>

Using precompiled headers can hide missing include dependecies -
that's a fact and has already been discussed several times on this
list. Just because building with precompiled headers is *so much*
faster, most developers don't build without precompiled headers and
eventually submit changes which introduce dependencies which are not
reflected in the corresponding includeDB files and only compile by
chance (and precompiled headers:)

I would threfore strongly suggest to run a compilation *WITHOUT*
precompiled headers as preintegration test so prevent such problems in
the future.

Regards,
Volker

PS: there still exist compilers which don't support precomiled headers...

On 11/4/09, Ivan Krylov <Ivan.Krylov at sun.com> wrote:
> Hello Matthias,
>
>  Can you say why do you want to change default option to precompiled=off ?
> Precompilation helps to build hotspot *a lot* faster.
>  If you need not to use pch just call
>  make USE_PRECOMPILED_HEADER=
>  For debugging purposes you may also want to use HOTSPOT_BUILD_JOBS=1 to
> disable parallel build.
>
>  Thanks,
>
>  Ivan
>
>
>  Matthias Klose wrote:
>
> > unsure if this is related to zero/shark, but at least that's in the
> upstream sources for OpenJDK6.
> >
> > These include failures are usually seen, when not using precompiled
> headers (which is a useful thing to track down compiler bugs).
> >
> > attached are two patches to fix the include problem, and one to disable
> the use of precompiled headers setting an envvar. This way release builds
> could be built with and without precompiled headers.
> >
> >  Matthias
> >
>
>


From Ivan.Krylov at Sun.COM  Wed Nov  4 07:45:08 2009
From: Ivan.Krylov at Sun.COM (Ivan Krylov)
Date: Wed, 04 Nov 2009 18:45:08 +0300
Subject: [patch] add missing include in nativeInst_<arch>.cpp
In-Reply-To: <d65861880911040732h4672b6b9y8b8db2bc9354ce03@mail.gmail.com>
References: <4AEAC862.6050504@ubuntu.com> <4AF190D8.1030200@Sun.COM>
	<d65861880911040732h4672b6b9y8b8db2bc9354ce03@mail.gmail.com>
Message-ID: <4AF1A184.6000808@Sun.COM>

> I would threfore strongly suggest to run a compilation *WITHOUT*
> precompiled headers as preintegration test 

This sounds like a very good suggestion to me.

Thanks,

Ivan



Volker Simonis wrote:
> Using precompiled headers can hide missing include dependecies -
> that's a fact and has already been discussed several times on this
> list. Just because building with precompiled headers is *so much*
> faster, most developers don't build without precompiled headers and
> eventually submit changes which introduce dependencies which are not
> reflected in the corresponding includeDB files and only compile by
> chance (and precompiled headers:)
>
> I would threfore strongly suggest to run a compilation *WITHOUT*
> precompiled headers as preintegration test so prevent such problems in
> the future.
>
> Regards,
> Volker
>
> PS: there still exist compilers which don't support precomiled headers...
>
> On 11/4/09, Ivan Krylov <Ivan.Krylov at sun.com> wrote:
>   
>> Hello Matthias,
>>
>>  Can you say why do you want to change default option to precompiled=off ?
>> Precompilation helps to build hotspot *a lot* faster.
>>  If you need not to use pch just call
>>  make USE_PRECOMPILED_HEADER=
>>  For debugging purposes you may also want to use HOTSPOT_BUILD_JOBS=1 to
>> disable parallel build.
>>
>>  Thanks,
>>
>>  Ivan
>>
>>
>>  Matthias Klose wrote:
>>
>>     
>>> unsure if this is related to zero/shark, but at least that's in the
>>>       
>> upstream sources for OpenJDK6.
>>     
>>> These include failures are usually seen, when not using precompiled
>>>       
>> headers (which is a useful thing to track down compiler bugs).
>>     
>>> attached are two patches to fix the include problem, and one to disable
>>>       
>> the use of precompiled headers setting an envvar. This way release builds
>> could be built with and without precompiled headers.
>>     
>>>  Matthias
>>>
>>>       
>>     



From gnu_andrew at member.fsf.org  Wed Nov  4 08:13:18 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 4 Nov 2009 16:13:18 +0000
Subject: [patch] add missing include in nativeInst_<arch>.cpp
In-Reply-To: <4AF190D8.1030200@Sun.COM>
References: <4AEAC862.6050504@ubuntu.com> <4AF190D8.1030200@Sun.COM>
Message-ID: <17c6771e0911040813j6231a680h5c4ea42a39bf4fd3@mail.gmail.com>

2009/11/4 Ivan Krylov <Ivan.Krylov at sun.com>:
> Hello Matthias,
>
> Can you say why do you want to change default option to precompiled=off ?
> Precompilation helps to build hotspot *a lot* faster.
> If you need not to use pch just call
> make USE_PRECOMPILED_HEADER=

Won't gcc.make still set it to 1 during the build? i.e. isn't
USE_PRECOMPILED_HEADER= the default anyway?

I presume the other include fix can be pushed without problem?

> For debugging purposes you may also want to use HOTSPOT_BUILD_JOBS=1 to
> disable parallel build.
>
> Thanks,
>
> Ivan
>
> Matthias Klose wrote:
>>
>> unsure if this is related to zero/shark, but at least that's in the
>> upstream sources for OpenJDK6.
>>
>> These include failures are usually seen, when not using precompiled
>> headers (which is a useful thing to track down compiler bugs).
>>
>> attached are two patches to fix the include problem, and one to disable
>> the use of precompiled headers setting an envvar. This way release builds
>> could be built with and without precompiled headers.
>>
>> ?Matthias
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gbenson at redhat.com  Wed Nov  4 08:17:49 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 4 Nov 2009 16:17:49 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <200911041247.nA4ClYdC017324@parsley.camswl.com>
References: <200911041247.nA4ClYdC017324@parsley.camswl.com>
Message-ID: <20091104161748.GA3635@redhat.com>

Edward Nevill wrote:
> The following changes make hs16 work for ARM and add OSR support for
> Shark. The files affected are
> 
> - asm_helper.cpp
> - bytecodes_arm.def
> - cppInterpreter_arm.S
> - sharkCacheDecache.cpp
> 
> The last change (sharkCacheDecache.cpp) is to fix an
> 'Unimplemented()' error when a method with multiple monitors is
> OSRed. I have discussed this change with Gary.
> 
> Gary? Are you happy with the change to sharkCacheDecache.cpp?

I'm happy with the change -- I suggested it after all :) -- but
what's your status with the SCA?  Are your contributions covered?

Cheers,
Gary

-- 
http://gbenson.net/


From andrew at icedtea.classpath.org  Wed Nov  4 13:25:05 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 04 Nov 2009 21:25:05 +0000
Subject: /hg/icedtea: Update to latest changesets, including m5 changes a...
Message-ID: <hg.ce2937846cc0.1257369905.-6899778133799504387@icedtea.classpath.org>

changeset ce2937846cc0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ce2937846cc0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 04 21:27:26 2009 +0000

	Update to latest changesets, including m5 changes and new timezone
	data patch.

	2009-11-04 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-use-system-tzdata.patch: Dropped,
	updated version included in upstream IcedTea forest.
		* Makefile.am: Update to latest changesets (m5), remove
	above patch, copy tz.properties into jre/lib.
		* NEWS: List new features in OpenJDK7 (Project Coin,
	JSR166y, Zero).
		* acinclude.m4: (AC_CHECK_WITH_TZDATA_DIR): New macro
	providing the --with-tzdata-dir option for specifying the
	location of Java timezone data. Defaults to
	/usr/share/javazi as before.
		* configure.ac: Add above macro.
		* patches/icedtea-libraries.patch: Recreated.
		* patches/icedtea-liveconnect.patch: Fix quoting of JAVA_ARGS.
		* patches/icedtea-version.patch: Fix path to version template
	(changed upstream).
		* tz.properties.in: New generated file used to specify the
	timezone data directory.


diffstat:

10 files changed, 156 insertions(+), 134 deletions(-)
ChangeLog                               |   28 ++++++++
Makefile.am                             |   39 ++++++-----
NEWS                                    |   17 ++++
acinclude.m4                            |   31 ++++++++
configure.ac                            |    1 
patches/icedtea-libraries.patch         |  108 +++++++++++++++----------------
patches/icedtea-liveconnect.patch       |    2 
patches/icedtea-use-system-tzdata.patch |   59 ----------------
patches/icedtea-version.patch           |    4 -
tz.properties.in                        |    1 

diffs (truncated from 727 to 500 lines):

diff -r 9c96175dae62 -r ce2937846cc0 ChangeLog
--- a/ChangeLog	Mon Nov 02 21:43:32 2009 +0000
+++ b/ChangeLog	Wed Nov 04 21:27:26 2009 +0000
@@ -1,3 +1,31 @@ 2009-11-02  Andrew John Hughes  <ahughes
+2009-11-04  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-use-system-tzdata.patch:
+	Dropped, updated version included in upstream
+	IcedTea forest.
+	* Makefile.am:
+	Update to latest changesets (m5), remove
+	above patch, copy tz.properties into jre/lib.
+	* NEWS:
+	List new features in OpenJDK7 (Project Coin,
+	JSR166y, Zero).
+	* acinclude.m4:
+	(AC_CHECK_WITH_TZDATA_DIR): New macro providing
+	the --with-tzdata-dir option for specifying the
+	location of Java timezone data.  Defaults to
+	/usr/share/javazi as before.
+	* configure.ac:
+	Add above macro.
+	* patches/icedtea-libraries.patch:
+	Recreated.
+	* patches/icedtea-liveconnect.patch:
+	Fix quoting of JAVA_ARGS.
+	* patches/icedtea-version.patch:
+	Fix path to version template (changed upstream).
+	* tz.properties.in:
+	New generated file used to specify the timezone
+	data directory.
+
 2009-11-02  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 9c96175dae62 -r ce2937846cc0 Makefile.am
--- a/Makefile.am	Mon Nov 02 21:43:32 2009 +0000
+++ b/Makefile.am	Wed Nov 04 21:27:26 2009 +0000
@@ -2,21 +2,21 @@
 
 OPENJDK_VERSION = b75
 
-CORBA_CHANGESET = d4f1f79e9231
-HOTSPOT_CHANGESET = 0c593310a62c
-JAXP_CHANGESET  = 1ff97e23727b
-JAXWS_CHANGESET = 7a525c434bc9
-JDK_CHANGESET = 70b5a4c7b35d
-LANGTOOLS_CHANGESET = 4b3ebc896806
-OPENJDK_CHANGESET = aeb73b347f3a
-
-CORBA_MD5SUM = cbdf4c993b0617ccddcb01a649e2eb05
-HOTSPOT_MD5SUM = 4508ff8d599b5ae3b094eaa3f8dfd494
-JAXP_MD5SUM = 2055c0ab13fea8c2597d7f3367905faa
-JAXWS_MD5SUM = 50ba89fa406b179e2ac20dd11cf37c5d
-JDK_MD5SUM = e98d4f2f0a74cc96ff7fa7838166d2dd
-LANGTOOLS_MD5SUM = 672ed2024d4d8787eefbbdebd1266c07
-OPENJDK_MD5SUM = fd027dba070b73a164a32a30f8807470
+CORBA_CHANGESET = a12dac8f71dc
+HOTSPOT_CHANGESET = e004313753cc
+JAXP_CHANGESET  = 45da06168568
+JAXWS_CHANGESET = 14446af481e9
+JDK_CHANGESET = d03acee39d3b
+LANGTOOLS_CHANGESET = 83367f01297b
+OPENJDK_CHANGESET = a8bc38cb80ef
+
+CORBA_MD5SUM = 455cfaad689717ab542685dd9ed2d876
+HOTSPOT_MD5SUM = 6c711e43b7f6db9d2299f71b8987d446
+JAXP_MD5SUM = bd6ae928afdecf5356c8ecd56a1c39ed
+JAXWS_MD5SUM = 3e2d558e91adcc8630953b1b3a37e269
+JDK_MD5SUM = b811728173a6e554f43a39e84c7f555a
+LANGTOOLS_MD5SUM = 1102b019cd3a734f77bb804228d1727d
+OPENJDK_MD5SUM = 6121a71424fd81df8a34a8b9666fabfd
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -261,7 +261,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-rmi_amd64.patch \
 	patches/icedtea-tools.patch \
 	patches/icedtea-demos.patch \
-	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-headers.patch \
 	patches/icedtea-ant.patch \
@@ -1759,6 +1758,10 @@ if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
 endif
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+endif
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 	mkdir -p stamps
 	touch $@
@@ -1829,6 +1832,10 @@ if ENABLE_NSS
 if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+endif
+if WITH_TZDATA_DIR
+	cp $(abs_top_builddir)/tz.properties \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
 endif
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
diff -r 9c96175dae62 -r ce2937846cc0 NEWS
--- a/NEWS	Mon Nov 02 21:43:32 2009 +0000
+++ b/NEWS	Wed Nov 04 21:27:26 2009 +0000
@@ -1,7 +1,20 @@ New in release 1.12 (2009-XX-XX)
 New in release 1.12 (2009-XX-XX)
 
-- Updated Zero with Gary's latest revisions
-- JIBX is no longer required to build Nimbus.
+- Updated to OpenJDK7 milestone 5; includes:
+  - From Project Coin:
+    - 6860965: Support for binary literals (e.g. 2 can be written 0b10)
+    - 6860965: Support for underscored literals (e.g. 123456 can be
+      written 123_456)
+    - 6827009: Support for strings in switch statements (e.g. case "a")
+    - 6840638: Improved inferencing with generics, e.g.
+      Map<String,Integer> map = new HashMap<>();
+  - jsr166y from http://gee.cs.oswego.edu/dl/concurrency-interest/:
+    - 6865571: Add a lightweight task framework known as ForkJoin
+    - 6445158: Phaser - an improved CyclicBarrier
+    - 6865579: Add TransferQueue/LinkedTransferQueue
+  - The Zero assembler port
+  - JIBX is no longer required to build Nimbus.
+  - Many bug fixes
 - The NSS crypto. provider may be turned on with --enable-nss if
   the NSS libraries and headers are available via pkg-config.
 - Makefile reorganisation:
diff -r 9c96175dae62 -r ce2937846cc0 acinclude.m4
--- a/acinclude.m4	Mon Nov 02 21:43:32 2009 +0000
+++ b/acinclude.m4	Wed Nov 04 21:27:26 2009 +0000
@@ -1528,3 +1528,34 @@ AC_DEFUN([IT_CHECK_ENABLE_WARNINGS],
   AM_CONDITIONAL(ENABLE_WARNINGS, test x"${ENABLE_WARNINGS}" = "xyes")
   AC_SUBST(ENABLE_WARNINGS)
 ])
+
+AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR],
+[
+  DEFAULT="/usr/share/javazi"
+  AC_MSG_CHECKING([which Java timezone data directory to use])
+  AC_ARG_WITH([tzdata-dir],
+	      [AS_HELP_STRING(--with-tzdata-dir,set the Java timezone data directory [[default=${DEFAULT}]])],
+  [
+    if test "x${withval}" = x || test "x${withval}" = xyes; then
+      TZDATA_DIR_SET=yes
+      TZDATA_DIR="${DEFAULT}"
+    else
+      if test "x${withval}" = xno; then
+        TZDATA_DIR_SET=no
+        AC_MSG_RESULT([no])
+      else
+        TZDATA_DIR_SET=yes
+        TZDATA_DIR="${withval}"
+      fi
+    fi
+  ],
+  [ 
+    TZDATA_DIR="${DEFAULT}"
+  ])
+  if test "x${TZDATA_DIR}" != "x"; then
+    AC_MSG_RESULT([${TZDATA_DIR}])
+  fi
+  AC_SUBST([TZDATA_DIR])
+  AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x")
+  AC_CONFIG_FILES([tz.properties])
+])
diff -r 9c96175dae62 -r ce2937846cc0 configure.ac
--- a/configure.ac	Mon Nov 02 21:43:32 2009 +0000
+++ b/configure.ac	Wed Nov 04 21:27:26 2009 +0000
@@ -239,6 +239,7 @@ WITH_PROJECT
 WITH_PROJECT
 ENABLE_HG
 IT_CHECK_ADDITIONAL_VMS
+AC_CHECK_WITH_TZDATA_DIR
 
 AC_PATH_TOOL([HG],[hg])
 if test "x${enable_hg}" = "xyes"; then
diff -r 9c96175dae62 -r ce2937846cc0 patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Mon Nov 02 21:43:32 2009 +0000
+++ b/patches/icedtea-libraries.patch	Wed Nov 04 21:27:26 2009 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/jdk/make/com/sun/
 diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
 --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -74,12 +74,10 @@
  	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
  	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
@@ -32,8 +32,8 @@ diff -Nru openjdk.orig/jdk/make/com/sun/
  endif #LINUX
  endif #PLATFORM
 diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk	2009-08-20 00:00:43.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk	2009-09-21 22:50:31.000000000 +0100
+--- openjdk.orig/jdk/make/common/Program.gmk	2009-11-04 00:40:21.000000000 +0000
++++ openjdk/jdk/make/common/Program.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -85,7 +85,7 @@
  	endif
      endif
@@ -49,11 +49,11 @@ diff -Nru openjdk.orig/jdk/make/common/P
  OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
 -OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
  
- # this may not be necessary...
- ifeq ($(PLATFORM), windows)
+ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
 diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile	2009-09-21 22:51:00.000000000 +0100
+--- openjdk.orig/jdk/make/java/jli/Makefile	2009-11-04 00:40:21.000000000 +0000
++++ openjdk/jdk/make/java/jli/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -44,7 +44,6 @@
  
  include $(BUILDDIR)/common/Defs.gmk
@@ -102,7 +102,7 @@ diff -Nru openjdk.orig/jdk/make/java/jli
 +vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
 diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
 --- openjdk.orig/jdk/make/java/zip/FILES_c.gmk	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/java/zip/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -29,16 +29,4 @@
  	Deflater.c \
  	Inflater.c \
@@ -123,7 +123,7 @@ diff -Nru openjdk.orig/jdk/make/java/zip
 +	zip_util.c
 diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
 --- openjdk.orig/jdk/make/java/zip/Makefile	2009-09-21 17:09:41.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/java/zip/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -71,16 +71,10 @@
  CPPFLAGS += -UDEBUG 
  endif
@@ -144,7 +144,7 @@ diff -Nru openjdk.orig/jdk/make/java/zip
 +OTHER_LDLIBS = $(JVMLIB) -lz
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
 --- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -25,51 +25,7 @@
  
  FILES_c = \
@@ -200,7 +200,7 @@ diff -Nru openjdk.orig/jdk/make/sun/jpeg
  FILES_c += \
 diff -Nru openjdk.orig/jdk/make/sun/jpeg/Makefile openjdk/jdk/make/sun/jpeg/Makefile
 --- openjdk.orig/jdk/make/sun/jpeg/Makefile	2009-03-30 17:23:03.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/jpeg/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -67,6 +67,8 @@
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  include $(BUILDDIR)/common/Library.gmk
@@ -212,7 +212,7 @@ diff -Nru openjdk.orig/jdk/make/sun/jpeg
  #
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
 --- openjdk.orig/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 17:09:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/FILES_c.gmk	2009-11-04 01:18:41.000000000 +0000
 @@ -30,79 +30,5 @@
  	splashscreen_impl.c \
  	splashscreen_jpeg.c \
@@ -296,7 +296,7 @@ diff -Nru openjdk.orig/jdk/make/sun/spla
  
 diff -Nru openjdk.orig/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile
 --- openjdk.orig/jdk/make/sun/splashscreen/Makefile	2009-09-21 17:09:42.000000000 +0100
-+++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/make/sun/splashscreen/Makefile	2009-11-04 01:18:41.000000000 +0000
 @@ -59,12 +59,12 @@
  # C Flags
  #
@@ -329,7 +329,7 @@ diff -Nru openjdk.orig/jdk/make/sun/spla
  # and use alternative implementations in C.
 diff -Nru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
 --- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-08-20 00:00:45.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-11-04 01:18:41.000000000 +0000
 @@ -89,11 +89,7 @@
  // bytes and byte arrays
  
@@ -344,7 +344,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  typedef DWORDLONG       julong;
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c openjdk/jdk/src/share/native/java/util/zip/Adler32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Adler32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Adler32.c	2009-11-04 01:18:41.000000000 +0000
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -356,7 +356,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c openjdk/jdk/src/share/native/java/util/zip/CRC32.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/CRC32.c	2009-03-30 17:23:07.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/CRC32.c	2009-11-04 01:18:41.000000000 +0000
 @@ -29,7 +29,7 @@
  
  #include "jni.h"
@@ -368,7 +368,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c openjdk/jdk/src/share/native/java/util/zip/Deflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Deflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Deflater.c	2009-11-04 01:18:41.000000000 +0000
 @@ -32,7 +32,7 @@
  #include "jlong.h"
  #include "jni.h"
@@ -380,7 +380,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c openjdk/jdk/src/share/native/java/util/zip/Inflater.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/Inflater.c	2009-06-30 14:05:51.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/Inflater.c	2009-11-04 01:18:41.000000000 +0000
 @@ -35,7 +35,7 @@
  #include "jni.h"
  #include "jvm.h"
@@ -392,7 +392,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  #define ThrowDataFormatException(env, msg) \
 diff -Nru openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c openjdk/jdk/src/share/native/java/util/zip/zip_util.c
 --- openjdk.orig/jdk/src/share/native/java/util/zip/zip_util.c	2009-07-14 09:14:42.000000000 +0100
-+++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-09-21 22:50:31.000000000 +0100
++++ openjdk/jdk/src/share/native/java/util/zip/zip_util.c	2009-11-04 01:18:41.000000000 +0000
 @@ -44,7 +44,8 @@
  #include "io_util.h"
  #include "io_util_md.h"
@@ -404,8 +404,8 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
  #ifdef USE_MMAP
 diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
---- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-07-06 14:52:43.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-09-21 22:50:31.000000000 +0100
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-11-03 23:40:31.000000000 +0000
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2009-11-04 01:18:41.000000000 +0000
 @@ -51,7 +51,9 @@
  
  /* headers from the JPEG library */
@@ -507,7 +507,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
          free(info);
      }
  }
-@@ -685,14 +743,14 @@
+@@ -689,14 +747,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->quant_tbl_ptrs[i] == NULL) {
                  decomp->quant_tbl_ptrs[i] =
@@ -524,7 +524,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
              }
              quant_ptr = comp->quant_tbl_ptrs[i];
          }
-@@ -768,14 +826,14 @@
+@@ -787,14 +845,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->dc_huff_tbl_ptrs[i] == NULL) {
                  decomp->dc_huff_tbl_ptrs[i] =
@@ -541,7 +541,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
              }
              huff_ptr = comp->dc_huff_tbl_ptrs[i];
          }
-@@ -789,14 +847,14 @@
+@@ -812,14 +870,14 @@
              decomp = (j_decompress_ptr) cinfo;
              if (decomp->ac_huff_tbl_ptrs[i] == NULL) {
                  decomp->ac_huff_tbl_ptrs[i] =
@@ -558,7 +558,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
              }
              huff_ptr = comp->ac_huff_tbl_ptrs[i];
          }
-@@ -1356,6 +1414,8 @@
+@@ -1379,6 +1437,8 @@
       jclass ImageInputStreamClass,
       jclass qTableClass,
       jclass huffClass) {
@@ -567,7 +567,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
      ImageInputStream_readID = (*env)->GetMethodID(env,
                                                    ImageInputStreamClass,
-@@ -1441,7 +1501,7 @@
+@@ -1464,7 +1524,7 @@
      }
  
      /* We set up the normal JPEG error routines, then override error_exit. */
@@ -576,7 +576,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
      jerr->pub.error_exit = sun_jpeg_error_exit;
      /* We need to setup our own print routines */
      jerr->pub.output_message = sun_jpeg_output_message;
-@@ -1458,11 +1518,11 @@
+@@ -1481,11 +1541,11 @@
      }
  
      /* Perform library initialization */
@@ -590,7 +590,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
      /*
       * Now set up our source.
-@@ -1480,7 +1540,7 @@
+@@ -1503,7 +1563,7 @@
      cinfo->src->init_source = imageio_init_source;
      cinfo->src->fill_input_buffer = imageio_fill_input_buffer;
      cinfo->src->skip_input_data = imageio_skip_input_data;
@@ -599,7 +599,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
      cinfo->src->term_source = imageio_term_source;
  
      /* set up the association to persist for future calls */
-@@ -1599,7 +1659,7 @@
+@@ -1622,7 +1682,7 @@
          src->bytes_in_buffer = 0;
      }
  
@@ -608,7 +608,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
      if (ret == JPEG_HEADER_TABLES_ONLY) {
          retval = JNI_TRUE;
-@@ -1728,7 +1788,7 @@
+@@ -1751,7 +1811,7 @@
                                 cinfo->num_components,
                                 profileData);
          if (reset) {
@@ -617,7 +617,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
          }
      }
  
-@@ -1917,7 +1977,7 @@
+@@ -1947,7 +2007,7 @@
                     TRUE);
      }
  
@@ -626,7 +626,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
      if (progressive) {
          cinfo->buffered_image = TRUE;
          cinfo->input_scan_number = minProgressivePass+1; // Java count from 0
-@@ -1929,7 +1989,7 @@
+@@ -1959,7 +2019,7 @@
  
      data->streamBuf.suspendable = FALSE;
  
@@ -635,7 +635,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
      if (numBands !=  cinfo->output_components) {
          JNU_ThrowByName(env, "javax/imageio/IIOException",
-@@ -1954,7 +2014,7 @@
+@@ -1984,7 +2044,7 @@
          if (progressive) {
              // initialize the next pass.  Note that this skips up to
              // the first interesting pass.
@@ -644,7 +644,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
              if (wantUpdates) {
                  (*env)->CallVoidMethod(env, this,
                                         JPEGImageReader_passStartedID,
-@@ -1970,7 +2030,7 @@
+@@ -2000,7 +2060,7 @@
          // Skip until the first interesting line
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < sourceYStart)) {
@@ -653,7 +653,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
          }
  
          scanlineLimit = sourceYStart+sourceHeight;
-@@ -1983,7 +2043,7 @@
+@@ -2013,7 +2073,7 @@
          while ((data->abortFlag == JNI_FALSE)
                 && ((jint)cinfo->output_scanline < scanlineLimit)) {
  
@@ -662,7 +662,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  
              // Now mangle it into our buffer
              out = data->pixelBuf.buf.bp;
-@@ -2031,13 +2091,13 @@
+@@ -2061,13 +2121,13 @@
                  skipLines = linesLeft;
              }
              for(i = 0; i < skipLines; i++) {
@@ -679,7 +679,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
                  || (cinfo->input_scan_number > maxProgressivePass)) {
                  done = TRUE;
              }
-@@ -2057,9 +2117,9 @@
+@@ -2087,9 +2147,9 @@
      if (cinfo->output_scanline == cinfo->output_height) {
          //    if ((cinfo->output_scanline == cinfo->output_height) &&
          //(jpeg_input_complete(cinfo))) {  // We read the whole file
@@ -691,7 +691,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
      }
  
      free(scanLinePtr);
-@@ -2105,7 +2165,7 @@
+@@ -2135,7 +2195,7 @@
  
      cinfo = (j_decompress_ptr) data->jpegObj;
  
@@ -700,7 +700,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat
  }
  
  
-@@ -2311,6 +2371,142 @@
+@@ -2341,6 +2401,142 @@
  
  /********************** end of destination manager ************/
  
@@ -843,7 +843,7 @@ diff -Nru openjdk.orig/jdk/src/share/nat


From andrew at icedtea.classpath.org  Wed Nov  4 14:03:29 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 04 Nov 2009 22:03:29 +0000
Subject: /hg/icedtea: Delete bootstrap/jdk1.7.0 on clean.
Message-ID: <hg.9eb43c172d5b.1257372208.-6899778133799504387@icedtea.classpath.org>

changeset 9eb43c172d5b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9eb43c172d5b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 04 22:07:39 2009 +0000

	Delete bootstrap/jdk1.7.0 on clean.

	2009-11-04 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Make sure bootstrap/jdk1.7.0 gets
	deleted on clean.


diffstat:

2 files changed, 7 insertions(+)
ChangeLog   |    6 ++++++
Makefile.am |    1 +

diffs (24 lines):

diff -r ce2937846cc0 -r 9eb43c172d5b ChangeLog
--- a/ChangeLog	Wed Nov 04 21:27:26 2009 +0000
+++ b/ChangeLog	Wed Nov 04 22:07:39 2009 +0000
@@ -1,3 +1,9 @@ 2009-11-04  Andrew John Hughes  <ahughes
+2009-11-04  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make sure bootstrap/jdk1.7.0 gets deleted
+	on clean.
+	
 2009-11-04  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-use-system-tzdata.patch:
diff -r ce2937846cc0 -r 9eb43c172d5b Makefile.am
--- a/Makefile.am	Wed Nov 04 21:27:26 2009 +0000
+++ b/Makefile.am	Wed Nov 04 22:07:39 2009 +0000
@@ -2506,6 +2506,7 @@ clean-plugs: clean-tools-jar clean-rt
 clean-plugs: clean-tools-jar clean-rt
 	rm -f stamps/plugs.stamp
 	rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	rm -rf bootstrap/jdk1.7.0
 
 # Target Aliases
 # ===============


From xerxes at zafena.se  Thu Nov  5 00:38:15 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 05 Nov 2009 09:38:15 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <200911041247.nA4ClYdC017324@parsley.camswl.com>
References: <200911041247.nA4ClYdC017324@parsley.camswl.com>
Message-ID: <4AF28EF7.9030308@zafena.se>

Edward Nevill skrev:
> Hi Folks,
>
> The following changes make hs16 work for ARM and add OSR support for Shark. The files
> affected are
>
> - asm_helper.cpp
> - bytecodes_arm.def
> - cppInterpreter_arm.S
> - sharkCacheDecache.cpp
>
> Regards,
> Ed.
>
>
> +#ifdef ON_STACK_REPLACEMENT
> +osr_migrate:
> +	ldr	tmp1, [r0, #128]	@ osr_method->osr_entry()
> +	ldr	tmp2, [istate, #ISTATE_ADVANCE_PC]
> +@	ldr	istate, [istate, #ISTATE_NEXT_FRAME]
> +	mov	r0, r3
> +	bl	_ZN13SharedRuntime19OSR_migration_beginEP10JavaThread
> +	mov	r1, r0
> +	ldr	r0, [istate, #ISTATE_METHOD]
> +	ldrh	lr, [r0, #METHOD_MAXLOCALS]
> +	ldrh	ip, [r0, #METHOD_SIZEOFPARAMETERS]
> +	ldr	r3, [istate, #ISTATE_THREAD]
> +	sub	lr, lr, ip
> +	ldr	r2, [r3, #THREAD_TOP_ZERO_FRAME]
> +	add	ip, r2, #4
> +	ldr	r2, [r2]
> +	add	ip, ip, lr, lsl #2
> +	str	r2, [r3, #THREAD_TOP_ZERO_FRAME]
> +	str	ip, [r3, #THREAD_JAVA_SP]
> +	mov	r2, tmp1
> +; r0 = method
> +; r1 = osr_buf
> +; r2 = osr_entry
> +	mov	lr, pc
> +	ldr	pc, [tmp1]
> +
> +	cmp	tmp2, #0
> +	ldmeqfd	arm_sp!, {regset, pc}
>  
Hi Edward!

I tried to build the regular hs14 with your patch applied and hit this
error while linking launcher.

Linking launcher...
/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `osr_buf'
/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `osr_entry'
/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `method'
collect2: ld returned 1 exit status
make[6]: *** [gamma] Error 1
make[6]: Leaving directory `

are the three lines

+; r0 = method
+; r1 = osr_buf
+; r2 = osr_entry

meant to be comments?


Cheers
Xerxes


From xerxes at zafena.se  Thu Nov  5 01:27:13 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 05 Nov 2009 10:27:13 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <4AF28EF7.9030308@zafena.se>
References: <200911041247.nA4ClYdC017324@parsley.camswl.com>
	<4AF28EF7.9030308@zafena.se>
Message-ID: <4AF29A71.6000901@zafena.se>

Xerxes R?nby skrev:
> Edward Nevill skrev:
>   
>> Hi Folks,
>>
>> The following changes make hs16 work for ARM and add OSR support for Shark. The files
>> affected are
>>
>> - asm_helper.cpp
>> - bytecodes_arm.def
>> - cppInterpreter_arm.S
>> - sharkCacheDecache.cpp
>>
>> Regards,
>> Ed.
>>
>>
>> +#ifdef ON_STACK_REPLACEMENT
>> +osr_migrate:
>> +	ldr	tmp1, [r0, #128]	@ osr_method->osr_entry()
>> +	ldr	tmp2, [istate, #ISTATE_ADVANCE_PC]
>> +@	ldr	istate, [istate, #ISTATE_NEXT_FRAME]
>> +	mov	r0, r3
>> +	bl	_ZN13SharedRuntime19OSR_migration_beginEP10JavaThread
>> +	mov	r1, r0
>> +	ldr	r0, [istate, #ISTATE_METHOD]
>> +	ldrh	lr, [r0, #METHOD_MAXLOCALS]
>> +	ldrh	ip, [r0, #METHOD_SIZEOFPARAMETERS]
>> +	ldr	r3, [istate, #ISTATE_THREAD]
>> +	sub	lr, lr, ip
>> +	ldr	r2, [r3, #THREAD_TOP_ZERO_FRAME]
>> +	add	ip, r2, #4
>> +	ldr	r2, [r2]
>> +	add	ip, ip, lr, lsl #2
>> +	str	r2, [r3, #THREAD_TOP_ZERO_FRAME]
>> +	str	ip, [r3, #THREAD_JAVA_SP]
>> +	mov	r2, tmp1
>> +; r0 = method
>> +; r1 = osr_buf
>> +; r2 = osr_entry
>> +	mov	lr, pc
>> +	ldr	pc, [tmp1]
>> +
>> +	cmp	tmp2, #0
>> +	ldmeqfd	arm_sp!, {regset, pc}
>>  
>>     
> Hi Edward!
>
> I tried to build the regular hs14 with your patch applied and hit this
> error while linking launcher.
>
> Linking launcher...
> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
> undefined reference to `osr_buf'
> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
> undefined reference to `osr_entry'
> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
> undefined reference to `method'
> collect2: ld returned 1 exit status
> make[6]: *** [gamma] Error 1
> make[6]: Leaving directory `
>
> are the three lines
>
> +; r0 = method
> +; r1 = osr_buf
> +; r2 = osr_entry
>
> meant to be comments?
>
>
> Cheers
> Xerxes
>   
My build linked sucessfully when i changed those three lines to @ comments

Xerxes

============= cut here
Index: icedtea6-tot/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
===================================================================
---
icedtea6-tot.orig/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S   
2009-11-05 08:40:18.000000000 +0000
+++ icedtea6-tot/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S   
2009-11-05 08:41:24.000000000 +0000
@@ -2727,9 +2727,9 @@
     str    r2, [r3, #THREAD_TOP_ZERO_FRAME]
     str    ip, [r3, #THREAD_JAVA_SP]
     mov    r2, tmp1
-; r0 = method
-; r1 = osr_buf
-; r2 = osr_entry
+@ r0 = method
+@ r1 = osr_buf
+@ r2 = osr_entry
     mov    lr, pc
     ldr    pc, [tmp1]
 



From ed at camswl.com  Thu Nov  5 02:10:19 2009
From: ed at camswl.com (Edward Nevill)
Date: Thu, 5 Nov 2009 10:10:19 GMT
Subject: Request to commit: HS16 + OSR changes for ARM
Message-ID: <200911051010.nA5AAJ71023167@parsley.camswl.com>

>> +; r0 = method
>> +; r1 = osr_buf
>> +; r2 = osr_entry
>> +	mov	lr, pc
>> +	ldr	pc, [tmp1]
>> +
>> +	cmp	tmp2, #0
>> +	ldmeqfd	arm_sp!, {regset, pc}
>>  
>Hi Edward!
>
>I tried to build the regular hs14 with your patch applied and hit this
>error while linking launcher.
>
>Linking launcher...
>/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>undefined reference to `osr_buf'
>/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>undefined reference to `osr_entry'
>/ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>undefined reference to `method'
>collect2: ld returned 1 exit status
>make[6]: *** [gamma] Error 1
>make[6]: Leaving directory `
>
>are the three lines
>
>+; r0 = method
>+; r1 = osr_buf
>+; r2 = osr_entry
>

Yes, thanks for spotting this. A merge problem.

Other than this are you happy with the changes? I have successfully built hs14, hs16 & hs16 with Shark (with the above change applied).

Regards,
Ed.


From a.radke at arcor.de  Thu Nov  5 02:10:07 2009
From: a.radke at arcor.de (Andreas Radke)
Date: Thu, 5 Nov 2009 11:10:07 +0100 (CET)
Subject: npplugin build fails with recent xulrunner
Message-ID: <alpine.LNX.2.00.0911051106290.3451@workstation64.home>

Either the xulrunner version check doesn't work well here some more 
changes are needed:

[andyrtr at workstation64 trunk]$ grep -i xulrunner 
openjdk6-hg-6.b17_hg_20091105-1-x86_64-build.log.4
checking for XULRUNNER... yes
checking for xulrunner version... 1090104
[andyrtr at workstation64 trunk]$ pacman -Q xulrunner
xulrunner 1.9.1.4-1

running ArchLinux

In Datei, eingef?gt von IcedTeaNPPlugin.cc:75:
IcedTeaScriptablePluginObject.h:43:19: Fehler: npupp.h: Datei oder 
Verzeichnis nicht gefunden
In file included from IcedTeaNPPlugin.h:61,
                  from IcedTeaJavaRequestProcessor.h:46,
                  from IcedTeaScriptablePluginObject.h:49,
                  from IcedTeaNPPlugin.cc:75:
IcedTeaPluginUtils.h:204: Fehler: expected ?;? before ?(? token
IcedTeaPluginUtils.h:206: Fehler: ?NPVariant? has not been declared
IcedTeaPluginUtils.h:208: Fehler: expected ?;? before ?(? token
In file included from IcedTeaNPPlugin.h:62,
                  from IcedTeaJavaRequestProcessor.h:46,
                  from IcedTeaScriptablePluginObject.h:49,
                  from IcedTeaNPPlugin.cc:75:
IcedTeaPluginRequestProcessor.h:86: Fehler: ?NPVariant? has not been 
declared
IcedTeaPluginRequestProcessor.h:125: Fehler: ?NPVariant? has not been 
declared
In file included from IcedTeaJavaRequestProcessor.h:46,
                  from IcedTeaScriptablePluginObject.h:49,
                  from IcedTeaNPPlugin.cc:75:
IcedTeaNPPlugin.h:103: Fehler: ?NPNetscapeFuncs? does not name a type
IcedTeaNPPlugin.h:130: Fehler: expected constructor, destructor, or type 
conversion before ?*? token
IcedTeaNPPlugin.h:133: Fehler: expected constructor, destructor, or type 
conversion before ?*? token
In file included from IcedTeaScriptablePluginObject.h:49,
                  from IcedTeaNPPlugin.cc:75:

and more...

-Andy

From xerxes at zafena.se  Thu Nov  5 02:33:08 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 05 Nov 2009 11:33:08 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <200911051010.nA5AAJ71023167@parsley.camswl.com>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>
Message-ID: <4AF2A9E4.4080301@zafena.se>

Edward Nevill skrev:
>>> +; r0 = method
>>> +; r1 = osr_buf
>>> +; r2 = osr_entry
>>> +	mov	lr, pc
>>> +	ldr	pc, [tmp1]
>>> +
>>> +	cmp	tmp2, #0
>>> +	ldmeqfd	arm_sp!, {regset, pc}
>>>  
>>>       
>> Hi Edward!
>>
>> I tried to build the regular hs14 with your patch applied and hit this
>> error while linking launcher.
>>
>> Linking launcher...
>> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>> undefined reference to `osr_buf'
>> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>> undefined reference to `osr_entry'
>> /ssd/icedtea6-tot-asm-shark/openjdk-ecj/build/linux-arm/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
>> undefined reference to `method'
>> collect2: ld returned 1 exit status
>> make[6]: *** [gamma] Error 1
>> make[6]: Leaving directory `
>>
>> are the three lines
>>
>> +; r0 = method
>> +; r1 = osr_buf
>> +; r2 = osr_entry
>>
>>     
>
> Yes, thanks for spotting this. A merge problem.
>
> Other than this are you happy with the changes? I have successfully built hs14, hs16 & hs16 with Shark (with the above change applied).
>
> Regards,
> Ed.
>   
I am very happy with the changes, it solves all issues that I currently
know!
I would like to see it all commited into the icedtea6 trunk.

With best regards,
Xerxes



From gbenson at redhat.com  Thu Nov  5 02:51:08 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 5 Nov 2009 10:51:08 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <4AF2A9E4.4080301@zafena.se>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>
	<4AF2A9E4.4080301@zafena.se>
Message-ID: <20091105105108.GA3634@redhat.com>

Xerxes R?nby wrote:
> Edward Nevill skrev:
> > Other than this are you happy with the changes? I have
> > successfully built hs14, hs16 & hs16 with Shark (with the above
> > change applied).
>   
> I am very happy with the changes, it solves all issues that I
> currently know!
> I would like to see it all commited into the icedtea6 trunk.

Please do not commit the Shark change unless your contributions
are covered by the SCA.

Cheers,
Gary

--
http://gbenson.net/


From doko at ubuntu.com  Thu Nov  5 03:05:05 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 05 Nov 2009 12:05:05 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <20091105105108.GA3634@redhat.com>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>	<4AF2A9E4.4080301@zafena.se>
	<20091105105108.GA3634@redhat.com>
Message-ID: <4AF2B161.3070103@ubuntu.com>

On 05.11.2009 11:51, Gary Benson wrote:
> Please do not commit the Shark change unless your contributions
> are covered by the SCA.

why not? commits to IcedTea never had the precondition of SCA coverage. Is this 
a policy change that I did miss?

  Matthias


From xerxes at zafena.se  Thu Nov  5 03:18:37 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 05 Nov 2009 12:18:37 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <20091105105108.GA3634@redhat.com>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>	<4AF2A9E4.4080301@zafena.se>
	<20091105105108.GA3634@redhat.com>
Message-ID: <4AF2B48D.10001@zafena.se>

Gary Benson skrev:
> Xerxes R?nby wrote:
>   
>> Edward Nevill skrev:
>>     
>>> Other than this are you happy with the changes? I have
>>> successfully built hs14, hs16 & hs16 with Shark (with the above
>>> change applied).
>>>       
>>   
>> I am very happy with the changes, it solves all issues that I
>> currently know!
>> I would like to see it all commited into the icedtea6 trunk.
>>     
>
> Please do not commit the Shark change unless your contributions
> are covered by the SCA.
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>   
I assumed Ed's statement from
http://mail.openjdk.java.net/pipermail/zero-dev/2009-July/000176.html
are still valid for these changes, Ed have anything changed reguarding
this matter?

"

BTW: I have signed the SCA so it is OK for any of these changes to be
checked into OpenJDK. ARM has disclaimed copyright interest as per
GPLv2 (although I have yet to get this in writing:-(). I have also
requested the JCK from Sun so hopefully should be in a positions to
verify it as Java Compliant.

Best Regards,
Ed.

"


At least i see no issues for you Gary to push these Shark changes upstream.

Cheers
Xerxes




From mark at klomp.org  Thu Nov  5 03:25:44 2009
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 05 Nov 2009 12:25:44 +0100
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <4AF2B161.3070103@ubuntu.com>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>
	<4AF2A9E4.4080301@zafena.se> <20091105105108.GA3634@redhat.com>
	<4AF2B161.3070103@ubuntu.com>
Message-ID: <1257420344.3379.2.camel@springer.wildebeest.org>

On Thu, 2009-11-05 at 12:05 +0100, Matthias Klose wrote:
> commits to IcedTea never had the precondition of SCA coverage. Is this 
> a policy change that I did miss?

Not that I know. IcedTea was specifically setup to be able to work on
code without legal politics (except for making sure the licenses used
are Free and compatible).



From gbenson at redhat.com  Thu Nov  5 03:30:21 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 5 Nov 2009 11:30:21 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <4AF2B161.3070103@ubuntu.com>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>
	<4AF2A9E4.4080301@zafena.se> <20091105105108.GA3634@redhat.com>
	<4AF2B161.3070103@ubuntu.com>
Message-ID: <20091105113021.GC3634@redhat.com>

Matthias Klose wrote:
> On 05.11.2009 11:51, Gary Benson wrote:
> > Please do not commit the Shark change unless your contributions
> > are covered by the SCA.
>
> why not? commits to IcedTea never had the precondition of SCA
> coverage.  Is this a policy change that I did miss?

It's not an IcedTea policy, but ultimately the goal for Shark is to
get it upstream in much the same way as Zero now is, and I won't be
able to do that unless Shark is SCA clean.

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Thu Nov  5 03:32:06 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 5 Nov 2009 11:32:06 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <4AF2B48D.10001@zafena.se>
References: <200911051010.nA5AAJ71023167@parsley.camswl.com>
	<4AF2A9E4.4080301@zafena.se> <20091105105108.GA3634@redhat.com>
	<4AF2B48D.10001@zafena.se>
Message-ID: <20091105113206.GD3634@redhat.com>

Xerxes R?nby wrote:
> I assumed Ed's statement from
> http://mail.openjdk.java.net/pipermail/zero-dev/2009-July/000176.html
> are still valid for these changes, Ed have anything changed reguarding
> this matter?
> 
> "BTW: I have signed the SCA so it is OK for any of these changes to
> be checked into OpenJDK. ARM has disclaimed copyright interest as
> per GPLv2 (although I have yet to get this in writing:-()."

Did you ever get it in writing Ed?

Cheers,
Gary

-- 
http://gbenson.net/


From ed at camswl.com  Thu Nov  5 05:28:10 2009
From: ed at camswl.com (Edward Nevill)
Date: Thu, 5 Nov 2009 13:28:10 GMT
Subject: Request to commit: HS16 + OSR changes for ARM
Message-ID: <200911051328.nA5DSAoZ024065@parsley.camswl.com>

>Xerxes R?nby wrote:
>> I assumed Ed's statement from
>> http://mail.openjdk.java.net/pipermail/zero-dev/2009-July/000176.html
>> are still valid for these changes, Ed have anything changed reguarding
>> this matter?
>> 
>> "BTW: I have signed the SCA so it is OK for any of these changes to
>> be checked into OpenJDK. ARM has disclaimed copyright interest as
>> per GPLv2 (although I have yet to get this in writing:-()."
>
>Did you ever get it in writing Ed?
>
>Cheers,
>Gary

No,

Regards,
Ed.


From gbenson at redhat.com  Thu Nov  5 05:45:20 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 5 Nov 2009 13:45:20 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <200911051328.nA5DSAoZ024065@parsley.camswl.com>
References: <20091105113206.GD3634@redhat.com>
	<200911051328.nA5DSAoZ024065@parsley.camswl.com>
Message-ID: <20091105134520.GE3634@redhat.com>

Edward Nevill wrote:
> >Xerxes R?nby wrote:
> > > I assumed Ed's statement from
> > > http://mail.openjdk.java.net/pipermail/zero-dev/2009-July/000176.html
> > > are still valid for these changes, Ed have anything changed
> > > reguarding this matter?
> > > 
> > > "BTW: I have signed the SCA so it is OK for any of these changes
> > > to be checked into OpenJDK. ARM has disclaimed copyright
> > > interest as per GPLv2 (although I have yet to get this in
> > > writing:-()."
> >
> > Did you ever get it in writing Ed?
> 
> No,

Ok.  I'm thinking that it shouldn't be an issue for this particular
Shark change, because you made it at my instruction.  I'm going to
ask that aph confirm my logic on that though, I'm not 100% sure how
all this works.  If it's not ok then I can always recreate it and
commit it myself.

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 06:37:40 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 14:37:40 +0000
Subject: [Bug 401] New: OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N63T2-0005Fa-Qa@icedtea.classpath.org>

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

           Summary: OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
                    Eclipse 3.5
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mbaudier at argeo.org


When running Eclipse 3.5 (Galileo SR1) on a Linux CentOS 5.4 x86_64 (up to
date), the JVM systematically crashes, either directly or after a few minutes.

The JVM used is the OpenJDK 1.6 from the standard CentOS repositories:
1.6.0-b09 mixed mode linux-amd64.

Please also note that I am running nvidia proprietary X driver packaged by
elrepo.org.

I will attach an hs_err_pid*.log

I will also try to install the Sun JDK from their website to see if I get the
same kind of issue.

Please tell me if you need more information or if I can help (I should be able
to rebuild the JDK from the source repository if needed)


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 06:38:47 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 14:38:47 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N63U7-0005Ff-1a@icedtea.classpath.org>

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





------- Comment #1 from mbaudier at argeo.org  2009-11-05 14:38 -------
Created an attachment (id=272)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=272&action=view)
Crash log (hs_err_pid*.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 gbenson at redhat.com  Thu Nov  5 07:16:00 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 5 Nov 2009 15:16:00 +0000
Subject: Request to commit: HS16 + OSR changes for ARM
In-Reply-To: <20091105134520.GE3634@redhat.com>
References: <20091105113206.GD3634@redhat.com>
	<200911051328.nA5DSAoZ024065@parsley.camswl.com>
	<20091105134520.GE3634@redhat.com>
Message-ID: <20091105151600.GI3634@redhat.com>

Gary Benson wrote:
> Edward Nevill wrote:
> > > Xerxes R?nby wrote:
> > > > I assumed Ed's statement from
> > > > http://mail.openjdk.java.net/pipermail/zero-dev/2009-July/000176.html
> > > > are still valid for these changes, Ed have anything changed
> > > > reguarding this matter?
> > > > 
> > > > "BTW: I have signed the SCA so it is OK for any of these
> > > > changes to be checked into OpenJDK. ARM has disclaimed
> > > > copyright interest as per GPLv2 (although I have yet to get
> > > > this in writing:-()."
> > >
> > > Did you ever get it in writing Ed?
> > 
> > No,
> 
> Ok.  I'm thinking that it shouldn't be an issue for this particular
> Shark change, because you made it at my instruction.  I'm going to
> ask that aph confirm my logic on that though, I'm not 100% sure how
> all this works.  If it's not ok then I can always recreate it and
> commit it myself.

It's not an issue for this change.  Ed, you have my approval.

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 07:19:01 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 15:19:01 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N6473-0005IH-7h@icedtea.classpath.org>

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





------- Comment #2 from mark at klomp.org  2009-11-05 15:19 -------
This part of the log looks suspicious:
C2:673     
org.eclipse.core.internal.dtree.DataTreeNode.forwardDeltaWith([Lorg/eclipse/core/internal/dtree/AbstractDataTreeNode;[Lorg/eclipse/core/internal/dtree/AbstractDataTreeNode;Lorg/eclipse/core/internal/dtree/IComparator;)[Lorg/eclipse/core/internal/dtree/AbstractDataTreeNode;
(469 bytes)

There was an old bug that caused that method to crash the jit compiler. It was
fixed and backported a while ago:
changeset:   888:e4b644655e78
user:        Mark Wielaard <mark at klomp.org>
date:        Sun Jun 08 18:51:47 2008 +0200
files:       ChangeLog Makefile.am Makefile.in
patches/icedtea-eclipse-hotspot-6614100-6b06.patch
patches/icedtea-eclipse-hotspot-6614100-7b24.patch
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.

So please make sure you upgrade your icedtea install to one that includes this
fix.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 07:24:46 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 15:24:46 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N64Cc-0005Ii-9I@icedtea.classpath.org>

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





------- Comment #3 from mbaudier at argeo.org  2009-11-05 15:24 -------
Thanks for the quick feedback!

Meanwhile I have installed and tested Sun's JDK and it works fine.

I will rebuild IcedTea: the OpenJDK provided by RedHat seems to have quite a
bad reputation...

I'll let know here whether the latest version fixed this problem.


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


From enevill at icedtea.classpath.org  Thu Nov  5 09:01:17 2009
From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 17:01:17 +0000
Subject: /hg/icedtea6: Edward Nevill <ed@camswl.com>
Message-ID: <hg.a88ccd40d4c0.1257440477.2873452341184383832@icedtea.classpath.org>

changeset a88ccd40d4c0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a88ccd40d4c0
author: "Edward Nevill (ed at camswl.com)"
date: Thu Nov 05 17:05:39 2009 +0000

	Edward Nevill <ed at camswl.com>


diffstat:

5 files changed, 331 insertions(+), 170 deletions(-)
ChangeLog                                              |    9 
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp           |    9 
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def        |  142 +++---
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S     |  338 +++++++++++-----
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp |    3 

diffs (truncated from 1276 to 500 lines):

diff -r cda20a4144b7 -r a88ccd40d4c0 ChangeLog
--- a/ChangeLog	Tue Nov 03 14:08:22 2009 +0100
+++ b/ChangeLog	Thu Nov 05 17:05:39 2009 +0000
@@ -1,3 +1,12 @@ 2009-11-03 Martin Matejovic <mmatejov at re
+2009-11-05 Edward Nevill <ed at camswl.com>
+
+	* Make OSR work with Shark
+	* Fix hs16 build
+	* ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
+	* ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+
 2009-11-03 Martin Matejovic <mmatejov at redhat.com>
 	* patches/security/icedtea-6862968.patch
 	* patches/security/icedtea-6863503.patch
diff -r cda20a4144b7 -r a88ccd40d4c0 ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	Tue Nov 03 14:08:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	Thu Nov 05 17:05:39 2009 +0000
@@ -110,6 +110,7 @@ void VMStructs::print_vm_offsets(void)
 	print_def("METHOD_NATIVEHANDLER", sizeof(methodOopDesc));
 	print_def("METHOD_SIGNATUREHANDLER", sizeof(methodOopDesc)+4);
 	nl();
+        print_def("CONSTMETHOD_CODESIZE", offset_of(constMethodOopDesc, _code_size));
 	print_def("CONSTMETHOD_CODEOFFSET", sizeof(constMethodOopDesc));
 	nl();
 	print_def("JNIHANDLEBLOCK_TOP", offset_of(JNIHandleBlock, _top));
@@ -124,6 +125,14 @@ void VMStructs::print_vm_offsets(void)
 	nl();
 	print_def("CONSTANTPOOL_TAGS", offset_of(constantPoolOopDesc, _tags));
 	print_def("CONSTANTPOOL_CACHE", offset_of(constantPoolOopDesc, _cache));
+	print_def("CONSTANTPOOL_BASE", sizeof(constantPoolOopDesc));
+	nl();
+	print_def("CP_OFFSET", in_bytes(constantPoolCacheOopDesc::base_offset()));
+	nl();
+	print_def("BASE_OFFSET_BYTE", arrayOopDesc::base_offset_in_bytes(T_BYTE));
+	print_def("BASE_OFFSET_SHORT", arrayOopDesc::base_offset_in_bytes(T_SHORT));
+	print_def("BASE_OFFSET_WORD", arrayOopDesc::base_offset_in_bytes(T_INT));
+	print_def("BASE_OFFSET_LONG", arrayOopDesc::base_offset_in_bytes(T_LONG));
 	nl();
 	print_def("SIZEOF_HANDLEMARK", sizeof(HandleMark));
 }
diff -r cda20a4144b7 -r a88ccd40d4c0 ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Tue Nov 03 14:08:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Thu Nov 05 17:05:39 2009 +0000
@@ -521,7 +521,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
 	DISPATCH_NEXT
-	ldr	tmp1, [r3, #12]
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -541,7 +541,7 @@ return_register_finalizer = 0xe5, 1
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #3
-	ldr	tmp2, [r3, #16]
+	ldr	tmp2, [r3, #BASE_OFFSET_LONG]
 	DISPATCH_NEXT
 	ldr	tmp1, [r3, #20]
 	DISPATCH_NEXT
@@ -565,7 +565,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	r3, r3, r2
 	DISPATCH_NEXT
-	ldrsb	tmp1, [r3, #12]
+	ldrsb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -586,7 +586,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
 	DISPATCH_NEXT
-	ldrh	tmp1, [r3, #12]
+	ldrh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -607,7 +607,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
 	DISPATCH_NEXT
-	ldrsh	tmp1, [r3, #12]
+	ldrsh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUT_STACK	0, tmp1
 	DISPATCH_FINISH
@@ -742,7 +742,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2, lsl #2
 	DISPATCH_NEXT
-	str	r3, [tmp1, #12]
+	str	r3, [tmp1, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -758,7 +758,7 @@ return_register_finalizer = 0xe5, 1
 	bcs	array_bound_exception_jpc_1_tmp2
 	DISPATCH_NEXT
 	add	tmp2, tmp1, tmp2, lsl #3
-	str	r1, [tmp2, #16]
+	str	r1, [tmp2, #BASE_OFFSET_LONG]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	str	r3, [tmp2, #20]
@@ -778,7 +778,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2
 	DISPATCH_NEXT
-	strb	r3, [tmp1, #12]
+	strb	r3, [tmp1, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -795,7 +795,7 @@ return_register_finalizer = 0xe5, 1
 	DISPATCH_NEXT
 	add	tmp1, tmp1, tmp2, lsl #1
 	DISPATCH_NEXT
-	strh	r3, [tmp1, #12]
+	strh	r3, [tmp1, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -1994,7 +1994,7 @@ 1:
 	ldr	r3, [istate, #ISTATE_METHOD]			@ method
 	ldrb	lr, [jpc, #1]
 
-	ldr	tmp1, [r3, #12]			@ constants
+	ldr	tmp1, [r3, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2012,14 +2012,14 @@ 1:
 	bne	1f
 
 	add	r3, tmp1, lr, lsl #2
-	ldr	r3, [r3, #32]
+	ldr	r3, [r3, #CONSTANTPOOL_BASE]
 	DISPATCH_NEXT
 	PUSH	r3
 	DISPATCH_FINISH
 1:
 	cmp	r3, #JVM_CONSTANT_Class
 	bne	2f
-	add	r0, tmp1, #32
+	add	r0, tmp1, #CONSTANTPOOL_BASE
 	ldr	r0, [r0, lr, lsl #2]
 	ldr	r1, [r0, #60]
 	PUSH	r1
@@ -2051,7 +2051,7 @@ 2:
 
 	ldr	r3, [istate, #ISTATE_METHOD]			@ method
 	ldrb	ip, [jpc, #2]
-	ldr	r2, [r3, #12]			@ constants
+	ldr	r2, [r3, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2069,7 +2069,7 @@ 2:
 	bne	1f
 
 	add	r3, r2, lr, lsl #2
-	ldr	r3, [r3, #32]
+	ldr	r3, [r3, #CONSTANTPOOL_BASE]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	PUSH	r3
@@ -2077,7 +2077,7 @@ 1:
 1:
 	cmp	r3, #JVM_CONSTANT_Class
 	bne	2f
-	add	r0, r2, #32
+	add	r0, r2, #CONSTANTPOOL_BASE
 	ldr	r0, [r0, lr, lsl #2]
 	ldr	r1, [r0, #60]
 	PUSH	r1
@@ -2109,7 +2109,7 @@ 2:
 
 	ldr	tmp1, [istate, #ISTATE_METHOD]			@ method
 	ldrb	lr, [jpc, #2]
-	ldr	r2, [tmp1, #12]			@ constants
+	ldr	r2, [tmp1, #METHOD_CONSTANTS]			@ constants
 
 	DISPATCH_START	\seq_len
 
@@ -2126,8 +2126,8 @@ 2:
 	bne	vm_fatal_error
 
 	add	tmp1, r2, r3, lsl #2
-	ldr	r3, [tmp1, #32]
-	ldr	tmp1, [tmp1, #36]
+	ldr	r3, [tmp1, #CONSTANTPOOL_BASE]
+	ldr	tmp1, [tmp1, #CONSTANTPOOL_BASE+4]
 	DISPATCH_NEXT
 	DISPATCH_NEXT
 	PUSH	r3, tmp1
@@ -3126,7 +3126,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #2
-	ldr	lr, [r3, #12]
+	ldr	lr, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3145,7 +3145,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #2
-	ldr	lr, [r3, #12]
+	ldr	lr, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3166,7 +3166,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2
-	ldrsb	lr, [r3, #12]
+	ldrsb	lr, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3187,7 +3187,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrh	lr, [r3, #12]
+	ldrh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3208,7 +3208,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrsh	lr, [r3, #12]
+	ldrsh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3227,7 +3227,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2
-	ldrsb	lr, [r3, #12]
+	ldrsb	lr, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3246,7 +3246,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrh	lr, [r3, #12]
+	ldrh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3265,7 +3265,7 @@ 1:
 	cmp	r2, lr
 	bcs	array_bound_exception_jpc_1
 	add	r3, r3, r2, lsl #1
-	ldrsh	lr, [r3, #12]
+	ldrsh	lr, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_NEXT
 	PUSH	lr
 	DISPATCH_FINISH
@@ -3289,7 +3289,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -3309,7 +3309,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2
-	strb	tmp1, [r3, #12]
+	strb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -3329,7 +3329,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
-	strh	tmp1, [r3, #12]
+	strh	tmp1, [r3, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -3346,7 +3346,7 @@ 1:
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3, lsl #2
-	str	r2, [tmp1, #12]
+	str	r2, [tmp1, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -3363,7 +3363,7 @@ 1:
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3
-	strb	r2, [tmp1, #12]
+	strb	r2, [tmp1, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -3380,7 +3380,7 @@ 1:
 	bcs	array_bound_exception_jpc_1_r3
 	DISPATCH_NEXT
 	add	tmp1, tmp1, r3, lsl #1
-	strh	r2, [tmp1, #12]
+	strh	r2, [tmp1, #BASE_OFFSET_SHORT]
 	DISPATCH_FINISH
 }
 
@@ -4754,7 +4754,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_3_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4775,7 +4775,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4796,7 +4796,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2, r3
 	DISPATCH_FINISH
@@ -4814,7 +4814,7 @@ 1:
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
 	POP	lr			@ r2 = index, lr = arrayref
-	ldr	r2, [r3, #12]
+	ldr	r2, [r3, #BASE_OFFSET_WORD]
 	SW_NPC	cmp	lr, #0
 	SW_NPC	beq	null_ptr_exception_jpc_1
 .abortentry44:
@@ -4823,7 +4823,7 @@ 1:
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_1
 	add	lr, lr, r2, lsl #2
-	ldr	r2, [lr, #12]
+	ldr	r2, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	PUSH	r2
 	DISPATCH_FINISH
@@ -4841,7 +4841,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_3_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	str	r3, [locals, -r2, lsl #2]
 	DISPATCH_FINISH
@@ -4860,7 +4860,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	r3, [lr, #12]
+	ldr	r3, [lr, #BASE_OFFSET_WORD]
 	DISPATCH_NEXT
 	str	r3, [locals, r2, lsl #2]
 	DISPATCH_FINISH
@@ -4876,7 +4876,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4888,7 +4888,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #2
-	str	tmp1, [r3, #12]
+	str	tmp1, [r3, #BASE_OFFSET_WORD]
 	DISPATCH_FINISH
 }
 
@@ -4902,7 +4902,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4914,7 +4914,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2
-	strb	tmp1, [r3, #12]
+	strb	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -4928,7 +4928,7 @@ 1:
 	cmp	r3, tmp1
 	bcs	array_bound_exception_jpc_2_r3
 	add	lr, lr, r3, lsl #2
-	ldr	tmp1, [lr, #12]
+	ldr	tmp1, [lr, #BASE_OFFSET_WORD]
 
 	POP	r2, r3		@ tmp1 = value, r2 = index, r3 = arrayref
 	SW_NPC	cmp	r3, #0
@@ -4940,7 +4940,7 @@ 1:
 	bcs	array_bound_exception_jpc_1
 	DISPATCH_NEXT
 	add	r3, r3, r2, lsl #1
-	strh	tmp1, [r3, #12]
+	strh	tmp1, [r3, #BASE_OFFSET_BYTE]
 	DISPATCH_FINISH
 }
 
@@ -4955,7 +4955,7 @@ 1:
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	and	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -4974,7 +4974,7 @@ 1:
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	orr	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -4993,7 +4993,7 @@ 1:
 	cmp	r2, tmp1
 	bcs	array_bound_exception_jpc_2
 	add	r3, r3, r2, lsl #2
-	ldr	tmp1, [r3, #12]		@ tmp1 = tos
+	ldr	tmp1, [r3, #BASE_OFFSET_WORD]		@ tmp1 = tos
 	POP	r2			@ r2 = tosm1
 	DISPATCH_NEXT
 	eor	tmp1, r2, tmp1		@ tosm1 <dop> tos
@@ -5012,7 +5012,7 @@ 1:
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5035,7 +5035,7 @@ 1:
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5058,7 +5058,7 @@ 1:
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2
-	ldr	r3, [r3, #12]		@ r1 = tos
+	ldr	r3, [r3, #BASE_OFFSET_WORD]		@ r1 = tos
 
         ldrsb   r1, [jpc, #2]
         ldrb    ip, [jpc, #3]
@@ -5081,7 +5081,7 @@ 1:
 	cmp	r2, r1
 	bcs	array_bound_exception_jpc_0
 	add	r3, r3, r2, lsl #2


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 09:21:18 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 17:21:18 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N661O-0005Pz-Ux@icedtea.classpath.org>

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


mbaudier at argeo.org changed:

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




------- Comment #4 from mbaudier at argeo.org  2009-11-05 17:21 -------
I confirm that after building locally the latest IcedTea release, I don't have
the problem anymore:

[mbaudier at alma icedtea6-1.6]$ ./openjdk/build/linux-amd64/bin/java -version
java version "1.6.0_0"
OpenJDK Runtime Environment (IcedTea6 1.6.1-r2c854193cc9d) (build 1.6.0_0-b16)
OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode)

Thanks for your help!


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov  5 10:54:29 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 18:54:29 +0000
Subject: [Bug 368] Eclipse repeatedly crashes after changing C++ Project
	Properties
Message-ID: <E1N67TZ-0007Ie-4l@icedtea.classpath.org>

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





------- Comment #3 from jon.vanalten at redhat.com  2009-11-05 18:54 -------
Hi,

We recently had another report with the exact same stack trace.  See
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=401

If you could try building a newer IcedTea and see if it resolves your issue
that would be great.


-- 
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 Ivan.Krylov at Sun.COM  Thu Nov  5 11:06:39 2009
From: Ivan.Krylov at Sun.COM (Ivan Krylov)
Date: Thu, 05 Nov 2009 22:06:39 +0300
Subject: [patch] add missing include in nativeInst_<arch>.cpp
In-Reply-To: <17c6771e0911040813j6231a680h5c4ea42a39bf4fd3@mail.gmail.com>
References: <4AEAC862.6050504@ubuntu.com> <4AF190D8.1030200@Sun.COM>
	<17c6771e0911040813j6231a680h5c4ea42a39bf4fd3@mail.gmail.com>
Message-ID: <4AF3223F.7060101@sun.com>

Andrew,

>Won't gcc.make still set it to 1 during the build? i.e. isn't
>USE_PRECOMPILED_HEADER= the default anyway?

Apparently no. It is easy enough to try and see yourself.
My understanding of how gmake works is that what is set in command line is passed down to the next makefile in a recursive call via MAKEFLAGS variable.
And we do have recursive call call of make.
However if the value was passed to make via environment variable - it does get overwritten by a makefile (unless -e option is given).

Thanks,
Ivan





Andrew John Hughes wrote:
> 2009/11/4 Ivan Krylov <Ivan.Krylov at sun.com>:
>   
>> Hello Matthias,
>>
>> Can you say why do you want to change default option to precompiled=off ?
>> Precompilation helps to build hotspot *a lot* faster.
>> If you need not to use pch just call
>> make USE_PRECOMPILED_HEADER=
>>     
>
> Won't gcc.make still set it to 1 during the build? i.e. isn't
> USE_PRECOMPILED_HEADER= the default anyway?
>
> I presume the other include fix can be pushed without problem?
>
>   
>> For debugging purposes you may also want to use HOTSPOT_BUILD_JOBS=1 to
>> disable parallel build.
>>
>> Thanks,
>>
>> Ivan
>>
>> Matthias Klose wrote:
>>     
>>> unsure if this is related to zero/shark, but at least that's in the
>>> upstream sources for OpenJDK6.
>>>
>>> These include failures are usually seen, when not using precompiled
>>> headers (which is a useful thing to track down compiler bugs).
>>>
>>> attached are two patches to fix the include problem, and one to disable
>>> the use of precompiled headers setting an envvar. This way release builds
>>> could be built with and without precompiled headers.
>>>
>>>  Matthias
>>>       
>>     
>
>
>
>   



From mmatejov at icedtea.classpath.org  Thu Nov  5 14:20:37 2009
From: mmatejov at icedtea.classpath.org (mmatejov at icedtea.classpath.org)
Date: Thu, 05 Nov 2009 22:20:37 +0000
Subject: /hg/icedtea6: Add latest security patches
Message-ID: <hg.d966ce93b58b.1257459637.2873452341184383832@icedtea.classpath.org>

changeset d966ce93b58b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d966ce93b58b
author: Martin Matejovic <mmatejov at redhat.com>
date: Thu Nov 05 23:24:59 2009 +0100

	Add latest security patches 2009-11-05 Martin Matejovic
	<mmatejov at redhat.com>
		* patches/security/icedtea-6631533.patch
		* patches/security/icedtea-6632445.patch
		* patches/security/icedtea-6636650.patch
		* patches/security/icedtea-6631533.patch
		* patches/security/icedtea-6657026.patch
		* patches/security/icedtea-6657138.patch
		* patches/security/icedtea-6822057.patch
		* patches/security/icedtea-6824265.patch
		* patches/security/icedtea-6861062.patch
		* patches/security/icedtea-6872358.patch
		* Makefile.am: apply the above


diffstat:

11 files changed, 3484 insertions(+), 1 deletion(-)
ChangeLog                              |   13 
Makefile.am                            |   11 
patches/security/icedtea-6631533.patch |  184 +++
patches/security/icedtea-6632445.patch |  103 ++
patches/security/icedtea-6636650.patch |  139 ++
patches/security/icedtea-6657026.patch | 1608 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6657138.patch |  775 +++++++++++++++
patches/security/icedtea-6822057.patch |   32 
patches/security/icedtea-6824265.patch |  119 ++
patches/security/icedtea-6861062.patch |  344 ++++++
patches/security/icedtea-6872358.patch |  157 +++

diffs (truncated from 3538 to 500 lines):

diff -r a88ccd40d4c0 -r d966ce93b58b ChangeLog
--- a/ChangeLog	Thu Nov 05 17:05:39 2009 +0000
+++ b/ChangeLog	Thu Nov 05 23:24:59 2009 +0100
@@ -1,3 +1,16 @@ 2009-11-05 Edward Nevill <ed at camswl.com>
+2009-11-05 Martin Matejovic <mmatejov at redhat.com>
+	* patches/security/icedtea-6631533.patch
+	* patches/security/icedtea-6632445.patch
+	* patches/security/icedtea-6636650.patch
+	* patches/security/icedtea-6631533.patch
+	* patches/security/icedtea-6657026.patch
+	* patches/security/icedtea-6657138.patch
+	* patches/security/icedtea-6822057.patch
+	* patches/security/icedtea-6824265.patch
+	* patches/security/icedtea-6861062.patch
+	* patches/security/icedtea-6872358.patch
+	* Makefile.am: apply the above 
+
 2009-11-05 Edward Nevill <ed at camswl.com>
 
 	* Make OSR work with Shark
diff -r a88ccd40d4c0 -r d966ce93b58b Makefile.am
--- a/Makefile.am	Thu Nov 05 17:05:39 2009 +0000
+++ b/Makefile.am	Thu Nov 05 23:24:59 2009 +0100
@@ -594,7 +594,16 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6863503.patch \
 	patches/security/icedtea-6864911.patch \
 	patches/security/icedtea-6872357.patch \
-	patches/security/icedtea-6874643.patch
+	patches/security/icedtea-6874643.patch \
+	patches/security/icedtea-6631533.patch \
+	patches/security/icedtea-6632445.patch \
+	patches/security/icedtea-6636650.patch \
+	patches/security/icedtea-6657026.patch \
+	patches/security/icedtea-6657138.patch \
+	patches/security/icedtea-6822057.patch \
+	patches/security/icedtea-6824265.patch \
+	patches/security/icedtea-6861062.patch \
+	patches/security/icedtea-6872358.patch 
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6631533.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6631533.patch	Thu Nov 05 23:24:59 2009 +0100
@@ -0,0 +1,184 @@
+--- old/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.948600000 +0400
++++ openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.153000000 +0400
+@@ -944,15 +944,15 @@
+      * and it does not permit read access to the given file.
+      */
+     public static ICC_Profile getInstance(String fileName) throws IOException {
+-    ICC_Profile thisProfile;
+-    FileInputStream fis;
++        ICC_Profile thisProfile;
++        FileInputStream fis = null;
+ 
+-        SecurityManager security = System.getSecurityManager();
+-        if (security != null) {
+-            security.checkRead(fileName);
+-        }
+ 
+-        if ((fis = openProfile(fileName)) == null) {
++        File f = getProfileFile(fileName);
++        if (f != null) {
++            fis = new FileInputStream(f);
++        }
++        if (fis == null) {
+             throw new IOException("Cannot open file " + fileName);
+         }
+ 
+@@ -1064,13 +1064,24 @@
+ 
+ 
+     void activateDeferredProfile() {
+-    byte profileData[];
+-    FileInputStream fis;
+-    String fileName = deferralInfo.filename;
++        byte profileData[];
++        FileInputStream fis;
++        final String fileName = deferralInfo.filename;
+ 
+         profileActivator = null;
+         deferralInfo = null;
+-        if ((fis = openProfile(fileName)) == null) {
++        PrivilegedAction<FileInputStream> pa = new PrivilegedAction<FileInputStream>() {
++            public FileInputStream run() {
++                File f = getStandardProfileFile(fileName);
++                if (f != null) {
++                    try {
++                        return new FileInputStream(f);
++                    } catch (FileNotFoundException e) {}
++                }
++                return null;
++            }
++        };
++        if ((fis = AccessController.doPrivileged(pa)) == null) {
+             throw new IllegalArgumentException("Cannot open file " + fileName);
+         }
+         try {
+@@ -1765,66 +1776,88 @@
+      * available, such as a profile for sRGB.  Built-in profiles use .pf as
+      * the file name extension for profiles, e.g. sRGB.pf.
+      */
+-    private static FileInputStream openProfile(final String fileName) {
+-        return (FileInputStream)java.security.AccessController.doPrivileged(
+-            new java.security.PrivilegedAction() {
+-            public Object run() {
+-                return privilegedOpenProfile(fileName);
+-            }
+-        });
+-    }
+-
+-    /*
+-     * this version is called from doPrivileged in privilegedOpenProfile.
+-     * the whole method is privileged!
+-     */
+-    private static FileInputStream privilegedOpenProfile(String fileName) {
+-        FileInputStream fis = null;
++    private static File getProfileFile(String fileName) {
+         String path, dir, fullPath;
+ 
+         File f = new File(fileName); /* try absolute file name */
+-
++        if (f.isAbsolute()) {
++            /* Rest of code has little sense for an absolute pathname,
++               so return here. */
++            return f.isFile() ? f : null;
++        }
+         if ((!f.isFile()) &&
+                 ((path = System.getProperty("java.iccprofile.path")) != null)){
+                                     /* try relative to java.iccprofile.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
++                fullPath = dir + File.separatorChar + fileName;
++                f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
+                 }
+             }
++        }
+ 
+-        if ((!f.isFile()) &&
++        if (((f == null) || (!f.isFile())) &&
+                 ((path = System.getProperty("java.class.path")) != null)) {
+                                     /* try relative to java.class.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
+-                }
+-            }
+-
+-        if (!f.isFile()) { /* try the directory of built-in profiles */
+-                dir = System.getProperty("java.home") +
+-                    File.separatorChar + "lib" + File.separatorChar + "cmm";
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
+                 fullPath = dir + File.separatorChar + fileName;
+                 f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
++                }
+             }
++        }
++        if ((f == null) || (!f.isFile())) {
++            /* try the directory of built-in profiles */
++            f = getStandardProfileFile(fileName);
++        }
++        if (f != null && f.isFile()) {
++            return f;
++        }
++        return null;
++    }
+ 
+-        if (f.isFile()) {
+-            try {
+-                fis = new FileInputStream(f);
+-            } catch (FileNotFoundException e) {
++    /**
++     * Returns a file object corresponding to a built-in profile
++     * specified by fileName.
++     * If there is no built-in profile with such name, then the method
++     * returns null.
++     */
++    private static File getStandardProfileFile(String fileName) {
++        String dir = System.getProperty("java.home") +
++            File.separatorChar + "lib" + File.separatorChar + "cmm";
++        String fullPath = dir + File.separatorChar + fileName;
++        File f = new File(fullPath);
++        return (f.isFile() && isChildOf(f, dir)) ? f : null;
++    }
++
++    /**
++     * Checks whether given file resides inside give directory.
++     */
++    private static boolean isChildOf(File f, String dirName) {
++        try {
++            File dir = new File(dirName);
++            String canonicalDirName = dir.getCanonicalPath();
++            if (!canonicalDirName.endsWith(File.separator)) {
++                canonicalDirName += File.separator;
+             }
++            String canonicalFileName = f.getCanonicalPath();
++            return canonicalFileName.startsWith(canonicalDirName);
++        } catch (IOException e) {
++            /* we do not expect the IOException here, because invocation
++             * of this function is always preceeded by isFile() call.
++             */
++            return false;
+         }
+-        return fis;
+     }
+ 
+-
+     /*
+      * Serialization support.
+      *
diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6632445.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6632445.patch	Thu Nov 05 23:24:59 2009 +0100
@@ -0,0 +1,103 @@
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:52.144000000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:51.488000000 +0400
+@@ -62,6 +62,8 @@
+ 
+ import java.io.*;
+ import java.nio.*;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.StringTokenizer;
+@@ -502,12 +504,18 @@
+             iis.reset();
+ 
+             try {
+-                if (metadata.colorSpace == PROFILE_LINKED)
++                if (metadata.colorSpace == PROFILE_LINKED &&
++                    isLinkedProfileAllowed() &&
++                    !isUncOrDevicePath(profile))
++                {
++                    String path = new String(profile, "windows-1252");
++
+                     colorSpace =
+-                        new ICC_ColorSpace(ICC_Profile.getInstance(new String(profile)));
+-                else
++                        new ICC_ColorSpace(ICC_Profile.getInstance(path));
++                } else {
+                     colorSpace =
+                         new ICC_ColorSpace(ICC_Profile.getInstance(profile));
++                }
+             } catch (Exception e) {
+                 colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+             }
+@@ -1745,4 +1753,69 @@
+         public void sequenceStarted(ImageReader src, int minIndex) {}
+         public void readAborted(ImageReader src) {}
+     }
++
++    private static Boolean isLinkedProfileDisabled = null;
++
++    private static boolean isLinkedProfileAllowed() {
++        if (isLinkedProfileDisabled == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    return Boolean.getBoolean("sun.imageio.plugins.bmp.disableLinkedProfiles");
++                }
++            };
++            isLinkedProfileDisabled = AccessController.doPrivileged(a);
++        }
++        return !isLinkedProfileDisabled;
++    }
++
++    private static Boolean isWindowsPlatform = null;
++
++    /**
++     * Verifies whether the byte array contans a unc path.
++     * Non-UNC path examples:
++     *  c:\path\to\file  - simple notation
++     *  \\?\c:\path\to\file - long notation
++     *
++     * UNC path examples:
++     *  \\server\share - a UNC path in simple notation
++     *  \\?\UNC\server\share - a UNC path in long notation
++     *  \\.\some\device - a path to device.
++     */
++    private static boolean isUncOrDevicePath(byte[] p) {
++        if (isWindowsPlatform == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    String osname = System.getProperty("os.name");
++                    return (osname != null &&
++                            osname.toLowerCase().startsWith("win"));
++                }
++            };
++            isWindowsPlatform = AccessController.doPrivileged(a);
++        }
++
++        if (!isWindowsPlatform) {
++            /* no need for the check on platforms except windows */
++            return false;
++        }
++
++        /* normalize prefix of the path */
++        if (p[0] == '/') p[0] = '\\';
++        if (p[1] == '/') p[1] = '\\';
++        if (p[3] == '/') p[3] = '\\';
++
++
++        if ((p[0] == '\\') && (p[1] == '\\')) {
++            if ((p[2] == '?') && (p[3] == '\\')) {
++                // long path: whether unc or local
++                return ((p[4] == 'U' || p[4] == 'u') &&
++                        (p[5] == 'N' || p[5] == 'n') &&
++                        (p[6] == 'C' || p[6] == 'c'));
++            } else {
++                // device path or short unc notation
++                return true;
++            }
++        } else {
++            return false;
++        }
++    }
+ }
diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6636650.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6636650.patch	Thu Nov 05 23:24:59 2009 +0100
@@ -0,0 +1,139 @@
+--- old/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:47 2009
++++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:46 2009
+@@ -147,11 +147,6 @@
+         registerNatives();
+     }
+ 
+-    // If initialization succeed this is set to true and security checks will
+-    // succeed.  Otherwise the object is not initialized and the object is
+-    // useless.
+-    private boolean initialized = false;
+-
+     // The parent class loader for delegation
+     private ClassLoader parent;
+ 
+@@ -177,6 +172,18 @@
+     // to its corresponding Package object.
+     private HashMap packages = new HashMap();
+ 
++    private static Void checkCreateClassLoader() {
++        SecurityManager security = System.getSecurityManager();
++        if (security != null) {
++            security.checkCreateClassLoader();
++        }
++        return null;
++    }
++
++    private ClassLoader(Void unused, ClassLoader parent) {
++        this.parent = parent;
++    }
++
+     /**
+      * Creates a new class loader using the specified parent class loader for
+      * delegation.
+@@ -197,12 +204,7 @@
+      * @since  1.2
+      */
+     protected ClassLoader(ClassLoader parent) {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = parent;
+-	initialized = true;
++        this(checkCreateClassLoader(), parent);
+     }
+ 
+     /**
+@@ -221,15 +223,9 @@
+      *          of a new class loader.
+      */
+     protected ClassLoader() {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = getSystemClassLoader();
+-	initialized = true;
++        this(checkCreateClassLoader(), getSystemClassLoader());
+     }
+ 
+-
+     // -- Class --
+ 
+     /**
+@@ -611,7 +607,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+ 	protectionDomain = preDefineClass(name, protectionDomain);
+ 
+ 	Class c = null;
+@@ -693,8 +688,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+-
+ 	int len = b.remaining();
+ 
+ 	// Use byte[] if not a direct ByteBufer:
+@@ -842,7 +835,6 @@
+      * @see  #defineClass(String, byte[], int, int)
+      */
+     protected final void resolveClass(Class<?> c) {
+-	check();
+ 	resolveClass0(c);
+     }
+ 
+@@ -873,7 +865,6 @@
+     protected final Class<?> findSystemClass(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	ClassLoader system = getSystemClassLoader();
+ 	if (system == null) {
+ 	    if (!checkName(name))
+@@ -886,7 +877,6 @@
+     private Class findBootstrapClass0(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	if (!checkName(name))
+ 	    throw new ClassNotFoundException(name);
+ 	return findBootstrapClass(name);
+@@ -895,13 +885,6 @@
+     private native Class findBootstrapClass(String name)
+ 	throws ClassNotFoundException;
+ 
+-    // Check to make sure the class loader has been initialized.
+-    private void check() {
+-	if (!initialized) {
+-	    throw new SecurityException("ClassLoader object not initialized");
+-	}
+-    }
+-
+     /**
+      * Returns the class with the given <a href="#name">binary name</a> if this
+      * loader has been recorded by the Java virtual machine as an initiating
+@@ -917,7 +900,6 @@
+      * @since  1.1
+      */
+     protected final Class<?> findLoadedClass(String name) {
+-	check();
+ 	if (!checkName(name))
+ 	    return null;
+ 	return findLoadedClass0(name);
+@@ -938,11 +920,9 @@
+      * @since  1.1
+      */
+     protected final void setSigners(Class<?> c, Object[] signers) {
+-        check();
+ 	c.setSigners(signers);
+     }
+ 
+-
+     // -- Resource --
+ 
+     /**
diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6657026.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6657026.patch	Thu Nov 05 23:24:59 2009 +0100
@@ -0,0 +1,1608 @@
+--- old/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:32.501050200 +0400
++++ openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:31.670050200 +0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
++ * Copyright 1997-2009 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
+@@ -27,10 +27,7 @@
+ package javax.swing;
+ 
+ import java.awt.event.*;
+-import java.applet.*;
+ import java.awt.*;
+-import java.io.Serializable;
+-import sun.swing.UIAction;


From gbenson at redhat.com  Fri Nov  6 03:39:38 2009
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 6 Nov 2009 11:39:38 +0000
Subject: [patch] rfc: shark overloaded intrinsic suffix fix
In-Reply-To: <4ACB52C0.10609@zafena.se>
References: <4ACB52C0.10609@zafena.se>
Message-ID: <20091106113938.GA3745@redhat.com>

Push away :)

Cheers,
Gary

Xerxes R?nby wrote:
> I was toying with adding some optimization passes and verify passes to
> speed up and more runtime checks to shark, while doing so then one of
> the verify passes found at least one oddity in the shark sourcecode.
> The attached patch fixes this verifier issue.
> 
> verifier output:
> Overloaded intrinsic has incorrect suffix: '.i32'. It should be '.i32.p0i32'
> i32 (i32*, i32, i32)* @llvm.atomic.cmp.swap.i32
> Broken module found, compilation aborted!
> Stack dump:
> 0.    Running pass 'Module Verifier' on function
> '@"java.io.BufferedReader::readLine"'
> Avbruten (SIGABRT)
> 
> http://llvm.org/docs/LangRef.html#int_atomics
> 
> Ok to push?
> 
> Cheers
> Xerxes
> 

> Index: icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
> ===================================================================
> --- icedtea6.orig/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-10-06 12:37:23.000000000 +0200
> +++ icedtea6/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	2009-10-06 12:54:11.000000000 +0200
>  -402,7 +402,7 @@
>  #ifdef ARM
>      (address) zero_cmpxchg_int,
>  #else
> -    "llvm.atomic.cmp.swap.i32",
> +    "llvm.atomic.cmp.swap.i32.p0i32",
>  #endif // ARM
>      "Iii", "i");
>  }
>  -422,7 +422,7 @@
>  #ifdef ARM
>      (address) zero_cmpxchg_ptr,
>  #else
> -    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"),
> +    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32") ".p0i" LP64_ONLY("64") NOT_LP64("32"),
>  #endif // ARM
>      "Xxx", "x");
>  }


-- 
http://gbenson.net/


From xranby at icedtea.classpath.org  Fri Nov  6 04:02:21 2009
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Fri, 06 Nov 2009 12:02:21 +0000
Subject: /hg/icedtea6: 2009-11-06  Xerxes R?nby  <xerxes@zafena.se>
Message-ID: <hg.b7141f77eb4d.1257508941.2873452341184383832@icedtea.classpath.org>

changeset b7141f77eb4d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b7141f77eb4d
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Nov 06 13:03:15 2009 +0100

	2009-11-06 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::cmpxchg_int): Correct suffix for the
	llvm.atomic.cmp.swap intrinsic. (SharkBuilder::cmpxchg_ptr):
	Likewise.


diffstat:

2 files changed, 9 insertions(+), 2 deletions(-)
ChangeLog                                         |    7 +++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |    4 ++--

diffs (35 lines):

diff -r d966ce93b58b -r b7141f77eb4d ChangeLog
--- a/ChangeLog	Thu Nov 05 23:24:59 2009 +0100
+++ b/ChangeLog	Fri Nov 06 13:03:15 2009 +0100
@@ -1,3 +1,10 @@ 2009-11-05 Martin Matejovic <mmatejov at re
+2009-11-06  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::cmpxchg_int): Correct suffix for the
+	llvm.atomic.cmp.swap intrinsic.
+	(SharkBuilder::cmpxchg_ptr): Likewise.
+
 2009-11-05 Martin Matejovic <mmatejov at redhat.com>
 	* patches/security/icedtea-6631533.patch
 	* patches/security/icedtea-6632445.patch
diff -r d966ce93b58b -r b7141f77eb4d ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Nov 05 23:24:59 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 06 13:03:15 2009 +0100
@@ -402,7 +402,7 @@ Value* SharkBuilder::cmpxchg_int()
 #ifdef ARM
     (address) zero_cmpxchg_int,
 #else
-    "llvm.atomic.cmp.swap.i32",
+    "llvm.atomic.cmp.swap.i32.p0i32",
 #endif // ARM
     "Iii", "i");
 }
@@ -422,7 +422,7 @@ Value* SharkBuilder::cmpxchg_ptr()
 #ifdef ARM
     (address) zero_cmpxchg_ptr,
 #else
-    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"),
+    "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32") ".p0i" LP64_ONLY("64") NOT_LP64("32"),
 #endif // ARM
     "Xxx", "x");
 }


From xerxes at zafena.se  Fri Nov  6 04:45:17 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 06 Nov 2009 13:45:17 +0100
Subject: /hg/icedtea6: Add latest security patches
In-Reply-To: <hg.d966ce93b58b.1257459637.2873452341184383832@icedtea.classpath.org>
References: <hg.d966ce93b58b.1257459637.2873452341184383832@icedtea.classpath.org>
Message-ID: <4AF41A5D.2030109@zafena.se>

Hi Martin!

the patch

patches/security/icedtea-6822057.patch

 unfortunally breaks the build of icedtea6.

cheers
Xerxes

mmatejov at icedtea.classpath.org skrev:
> changeset d966ce93b58b in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d966ce93b58b
> author: Martin Matejovic <mmatejov at redhat.com>
> date: Thu Nov 05 23:24:59 2009 +0100
>
> 	Add latest security patches 2009-11-05 Martin Matejovic
> 	<mmatejov at redhat.com>
> 		* patches/security/icedtea-6631533.patch
> 		* patches/security/icedtea-6632445.patch
> 		* patches/security/icedtea-6636650.patch
> 		* patches/security/icedtea-6631533.patch
> 		* patches/security/icedtea-6657026.patch
> 		* patches/security/icedtea-6657138.patch
> 		* patches/security/icedtea-6822057.patch
> 		* patches/security/icedtea-6824265.patch
> 		* patches/security/icedtea-6861062.patch
> 		* patches/security/icedtea-6872358.patch
> 		* Makefile.am: apply the above
>
>
>
>
> diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6657026.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/security/icedtea-6657026.patch	Thu Nov 05 23:24:59 2009 +0100
> @@ -0,0 +1,1608 @@
> +--- old/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:32.501050200 +0400
> ++++ openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:31.670050200 +0400
> +@@ -1,5 +1,5 @@
> + /*
> +- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
> ++ * Copyright 1997-2009 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
> +@@ -27,10 +27,7 @@
> + package javax.swing;
> + 
> + import java.awt.event.*;
> +-import java.applet.*;
> + import java.awt.*;
> +-import java.io.Serializable;
> +-import sun.swing.UIAction;
>   
Applying patches/security/icedtea-6636650.patch
patching file openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
Hunk #1 succeeded at 163 (offset 16 lines).
Hunk #2 succeeded at 188 (offset 16 lines).
Hunk #3 succeeded at 220 (offset 16 lines).
Hunk #4 succeeded at 239 (offset 16 lines).
Hunk #5 succeeded at 623 (offset 16 lines).
Hunk #6 succeeded at 704 (offset 16 lines).
Hunk #7 succeeded at 851 (offset 16 lines).
Hunk #8 succeeded at 881 (offset 16 lines).
Hunk #9 succeeded at 893 (offset 16 lines).
Hunk #10 succeeded at 901 (offset 16 lines).
Hunk #11 succeeded at 916 (offset 16 lines).
Hunk #12 succeeded at 936 (offset 16 lines).
Checking patches/security/icedtea-6657026.patch
misordered hunks! output would be garbled
9 out of 12 hunks FAILED -- saving rejects to file
openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java.rej
ERROR patch patches/security/icedtea-6657026.patch FAILED!
WARNING make clean-patch before retrying a fix
make: *** [stamps/patch.stamp] Fel 2

real    5m50.212s
user    0m4.400s
sys    0m4.260s



From xerxes at zafena.se  Fri Nov  6 04:46:46 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 06 Nov 2009 13:46:46 +0100
Subject: /hg/icedtea6: Add latest security patches
In-Reply-To: <4AF41A5D.2030109@zafena.se>
References: <hg.d966ce93b58b.1257459637.2873452341184383832@icedtea.classpath.org>
	<4AF41A5D.2030109@zafena.se>
Message-ID: <4AF41AB6.8090903@zafena.se>

i mean
patches/security/icedtea-6657026.patch

breaks build.

sorry for the copy n paste error.

Xerxes R?nby skrev:
> Hi Martin!
>
> the patch
>
> patches/security/icedtea-6822057.patch
>
>  unfortunally breaks the build of icedtea6.
>
> cheers
> Xerxes
>
> mmatejov at icedtea.classpath.org skrev:
>   
>> changeset d966ce93b58b in /hg/icedtea6
>> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d966ce93b58b
>> author: Martin Matejovic <mmatejov at redhat.com>
>> date: Thu Nov 05 23:24:59 2009 +0100
>>
>> 	Add latest security patches 2009-11-05 Martin Matejovic
>> 	<mmatejov at redhat.com>
>> 		* patches/security/icedtea-6631533.patch
>> 		* patches/security/icedtea-6632445.patch
>> 		* patches/security/icedtea-6636650.patch
>> 		* patches/security/icedtea-6631533.patch
>> 		* patches/security/icedtea-6657026.patch
>> 		* patches/security/icedtea-6657138.patch
>> 		* patches/security/icedtea-6822057.patch
>> 		* patches/security/icedtea-6824265.patch
>> 		* patches/security/icedtea-6861062.patch
>> 		* patches/security/icedtea-6872358.patch
>> 		* Makefile.am: apply the above
>>
>>
>>
>>
>> diff -r a88ccd40d4c0 -r d966ce93b58b patches/security/icedtea-6657026.patch
>> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>> +++ b/patches/security/icedtea-6657026.patch	Thu Nov 05 23:24:59 2009 +0100
>> @@ -0,0 +1,1608 @@
>> +--- old/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:32.501050200 +0400
>> ++++ openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java	2009-08-11 12:05:31.670050200 +0400
>> +@@ -1,5 +1,5 @@
>> + /*
>> +- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
>> ++ * Copyright 1997-2009 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
>> +@@ -27,10 +27,7 @@
>> + package javax.swing;
>> + 
>> + import java.awt.event.*;
>> +-import java.applet.*;
>> + import java.awt.*;
>> +-import java.io.Serializable;
>> +-import sun.swing.UIAction;
>>   
>>     
> Applying patches/security/icedtea-6636650.patch
> patching file openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
> Hunk #1 succeeded at 163 (offset 16 lines).
> Hunk #2 succeeded at 188 (offset 16 lines).
> Hunk #3 succeeded at 220 (offset 16 lines).
> Hunk #4 succeeded at 239 (offset 16 lines).
> Hunk #5 succeeded at 623 (offset 16 lines).
> Hunk #6 succeeded at 704 (offset 16 lines).
> Hunk #7 succeeded at 851 (offset 16 lines).
> Hunk #8 succeeded at 881 (offset 16 lines).
> Hunk #9 succeeded at 893 (offset 16 lines).
> Hunk #10 succeeded at 901 (offset 16 lines).
> Hunk #11 succeeded at 916 (offset 16 lines).
> Hunk #12 succeeded at 936 (offset 16 lines).
> Checking patches/security/icedtea-6657026.patch
> misordered hunks! output would be garbled
> 9 out of 12 hunks FAILED -- saving rejects to file
> openjdk/jdk/src/share/classes/javax/swing/ToolTipManager.java.rej
> ERROR patch patches/security/icedtea-6657026.patch FAILED!
> WARNING make clean-patch before retrying a fix
> make: *** [stamps/patch.stamp] Fel 2
>
> real    5m50.212s
> user    0m4.400s
> sys    0m4.260s
>
>   



From doko at icedtea.classpath.org  Fri Nov  6 05:58:56 2009
From: doko at icedtea.classpath.org (doko at icedtea.classpath.org)
Date: Fri, 06 Nov 2009 13:58:56 +0000
Subject: /hg/icedtea6: Add missing context line in icedtea-6657026.patch
Message-ID: <hg.0ab9e9de339b.1257515936.2873452341184383832@icedtea.classpath.org>

changeset 0ab9e9de339b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0ab9e9de339b
author: doko at ubuntu.com
date: Fri Nov 06 15:03:12 2009 +0100

	Add missing context line in icedtea-6657026.patch

	2009-11-06 Matthias Klose <doko at ubuntu.com>

	 * patches/security/icedtea-6657026.patch: Add missing
	context line.


diffstat:

2 files changed, 7 insertions(+)
ChangeLog                              |    6 ++++++
patches/security/icedtea-6657026.patch |    1 +

diffs (38 lines):

diff -r b7141f77eb4d -r 0ab9e9de339b ChangeLog
--- a/ChangeLog	Fri Nov 06 13:03:15 2009 +0100
+++ b/ChangeLog	Fri Nov 06 15:03:12 2009 +0100
@@ -1,3 +1,7 @@ 2009-11-06  Xerxes R??nby  <xerxes at zafen
+2009-11-06  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/security/icedtea-6657026.patch: Add missing context line.
+
 2009-11-06  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
@@ -6,6 +10,7 @@ 2009-11-06  Xerxes R??nby  <xerxes at zafen
 	(SharkBuilder::cmpxchg_ptr): Likewise.
 
 2009-11-05 Martin Matejovic <mmatejov at redhat.com>
+
 	* patches/security/icedtea-6631533.patch
 	* patches/security/icedtea-6632445.patch
 	* patches/security/icedtea-6636650.patch
@@ -28,6 +33,7 @@ 2009-11-05 Edward Nevill <ed at camswl.com>
 	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
 
 2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+
 	* patches/security/icedtea-6862968.patch
 	* patches/security/icedtea-6863503.patch
 	* patches/security/icedtea-6864911.patch
diff -r b7141f77eb4d -r 0ab9e9de339b patches/security/icedtea-6657026.patch
--- a/patches/security/icedtea-6657026.patch	Fri Nov 06 13:03:15 2009 +0100
+++ b/patches/security/icedtea-6657026.patch	Fri Nov 06 15:03:12 2009 +0100
@@ -41,6 +41,7 @@
 +        return manager;
      }
  
+     // add keylistener here to trigger tip for access
 --- old/src/share/classes/javax/swing/UIManager.java	2009-08-11 12:05:43.423050200 +0400
 +++ openjdk/jdk/src/share/classes/javax/swing/UIManager.java	2009-08-11 12:05:42.671050200 +0400
 @@ -1,5 +1,5 @@


From doko at ubuntu.com  Fri Nov  6 06:25:59 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Fri, 06 Nov 2009 15:25:59 +0100
Subject: /hg/icedtea6: Add latest security patches
In-Reply-To: <4AF41AB6.8090903@zafena.se>
References: <hg.d966ce93b58b.1257459637.2873452341184383832@icedtea.classpath.org>	<4AF41A5D.2030109@zafena.se>
	<4AF41AB6.8090903@zafena.se>
Message-ID: <4AF431F7.7080602@ubuntu.com>

On 06.11.2009 13:46, Xerxes R?nby wrote:
> i mean
> patches/security/icedtea-6657026.patch
>
> breaks build.

fixed that one, but then the next one fails to apply as well. Didn't check the 
others. How were these tested?

   Matthias


From xerxes at zafena.se  Sat Nov  7 13:30:54 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Sat, 07 Nov 2009 22:30:54 +0100
Subject: [patch] rfc: shark llvm2.7 r84651 SharkMemoryManager fix.
Message-ID: <4AF5E70E.7040501@zafena.se>

The LLVM JITMemoryManager changed a little in r84651 and by using the
attached patch re-enables Shark to be build-able using the latest LLVM
svn trunk.
http://llvm.org/viewvc/llvm-project?view=rev&revision=84651

Clear to push?

Cheers and have a great day!
Xerxes

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: shark-llvm2.7-r84651.patch
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091107/21c423cc/shark-llvm2.7-r84651.patch 

From mvfranz at gmail.com  Sat Nov  7 14:18:10 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sat, 7 Nov 2009 17:18:10 -0500
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
Message-ID: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>

I have hit this bug.  Is there anyway to work around it during the build
process?

http://www.mail-archive.com/bug-classpath at gnu.org/msg06349.html
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091107/f3048c13/attachment.html 

From gnu_andrew at member.fsf.org  Sat Nov  7 17:06:58 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 8 Nov 2009 01:06:58 +0000
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
Message-ID: <17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>

2009/11/7 Michael Franz <mvfranz at gmail.com>:
> I have hit this bug.? Is there anyway to work around it during the build
> process?
>
> http://www.mail-archive.com/bug-classpath at gnu.org/msg06349.html
>
>

There already is a workaround.  If you check your build logs, you
should notice that the IcedTea build already downloads these drops
prior to the OpenJDK build commencing.

The reason you hit a problem is because you're not building the
IcedTea forest.  You're (presumably) building the bsd-port forest and
it doesn't yet have:

http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/600bc3d048be
http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/26b97fd0e595

That should appear when bsd-port gets b77.  Prior to that, you could
just apply the changeset to the bsd-port tree locally.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Sat Nov  7 17:45:46 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sat, 7 Nov 2009 20:45:46 -0500
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
Message-ID: <fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>

Actually, I am not using the bsd port.  I just used the default
configuration but enabled zero and shark.  I will look into the patches.

On Sat, Nov 7, 2009 at 8:06 PM, Andrew John Hughes <
gnu_andrew at member.fsf.org> wrote:

> 2009/11/7 Michael Franz <mvfranz at gmail.com>:
> > I have hit this bug.  Is there anyway to work around it during the build
> > process?
> >
> > http://www.mail-archive.com/bug-classpath at gnu.org/msg06349.html
> >
> >
>
> There already is a workaround.  If you check your build logs, you
> should notice that the IcedTea build already downloads these drops
> prior to the OpenJDK build commencing.
>
> The reason you hit a problem is because you're not building the
> IcedTea forest.  You're (presumably) building the bsd-port forest and
> it doesn't yet have:
>
> http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/600bc3d048be
> http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/26b97fd0e595
>
> That should appear when bsd-port gets b77.  Prior to that, you could
> just apply the changeset to the bsd-port tree locally.
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091107/f47dda29/attachment.html 

From gnu_andrew at member.fsf.org  Sat Nov  7 17:54:08 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 8 Nov 2009 01:54:08 +0000
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
Message-ID: <17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>

2009/11/8 Michael Franz <mvfranz at gmail.com>:
> Actually, I am not using the bsd port.? I just used the default
> configuration but enabled zero and shark.? I will look into the patches.
>
> On Sat, Nov 7, 2009 at 8:06 PM, Andrew John Hughes
> <gnu_andrew at member.fsf.org> wrote:
>>
>> 2009/11/7 Michael Franz <mvfranz at gmail.com>:
>> > I have hit this bug.? Is there anyway to work around it during the build
>> > process?
>> >
>> > http://www.mail-archive.com/bug-classpath at gnu.org/msg06349.html
>> >
>> >
>>
>> There already is a workaround. ?If you check your build logs, you
>> should notice that the IcedTea build already downloads these drops
>> prior to the OpenJDK build commencing.
>>
>> The reason you hit a problem is because you're not building the
>> IcedTea forest. ?You're (presumably) building the bsd-port forest and
>> it doesn't yet have:
>>
>> http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/600bc3d048be
>> http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/26b97fd0e595
>>
>> That should appear when bsd-port gets b77. ?Prior to that, you could
>> just apply the changeset to the bsd-port tree locally.
>> --
>> Andrew :-)
>>
>> Free Java Software Engineer
>> Red Hat, Inc. (http://www.redhat.com)
>>
>> Support Free Java!
>> Contribute to GNU Classpath and the OpenJDK
>> http://www.gnu.org/software/classpath
>> http://openjdk.java.net
>>
>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8
>
>

Then something is awry with your build.  If you can mail me config.log
and a full build.log I might have a better idea.  The IcedTea build
should download those files and put them in ${builddir}/drops.   Then
it sets ALT_DROPS_DIR=${builddir}/drops in the OpenJDK build and that
should be printed by ant prior to the bit you posted.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Sun Nov  8 06:49:59 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 8 Nov 2009 09:49:59 -0500
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
	<17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
Message-ID: <fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>

Andrew,

I sent you my logs directly, the message was too big for the list.  This is
what I have tried (for the list).

I tried to build ppc with zero/shark - hit classpath bug
I tried to build ppc no zero/no shark and get the same results.
I tried the zero/shark configuration on intel and the build fails before it
gets to the same location.
The default build on intel works fine.

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

From gnu_andrew at member.fsf.org  Sun Nov  8 12:08:43 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 8 Nov 2009 20:08:43 +0000
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
	<17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
	<fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>
Message-ID: <17c6771e0911081208k6bd09fecx73f77c63b9290d71@mail.gmail.com>

2009/11/8 Michael Franz <mvfranz at gmail.com>:
> Andrew,
>
> I sent you my logs directly, the message was too big for the list.? This is
> what I have tried (for the list).
>
> I tried to build ppc with zero/shark - hit classpath bug
> I tried to build ppc no zero/no shark and get the same results.
> I tried the zero/shark configuration on intel and the build fails before it
> gets to the same location.
> The default build on intel works fine.
>
> Michael
>
>
>

You don't seem to be running the stamps/download-drops.stamp target at
all during the build.
Check that you have the latest tip:

$ hg tip
changeset:   2031:9eb43c172d5b
tag:         tip
user:        Andrew John Hughes <ahughes at redhat.com>
date:        Wed Nov 04 22:07:39 2009 +0000
summary:     Delete bootstrap/jdk1.7.0 on clean.

If you still have the build directory, try:

$ make download-drops
$ make

-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Sun Nov  8 13:22:25 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 8 Nov 2009 16:22:25 -0500
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <17c6771e0911081208k6bd09fecx73f77c63b9290d71@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
	<17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
	<fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>
	<17c6771e0911081208k6bd09fecx73f77c63b9290d71@mail.gmail.com>
Message-ID: <fee4d890911081322p14b63c85wbf9cb59a0d8e6199@mail.gmail.com>

On Sun, Nov 8, 2009 at 3:08 PM, Andrew John Hughes <
gnu_andrew at member.fsf.org> wrote:

> 2009/11/8 Michael Franz <mvfranz at gmail.com>:
> > Andrew,
> >
> > I sent you my logs directly, the message was too big for the list.  This
> is
> > what I have tried (for the list).
> >
> > I tried to build ppc with zero/shark - hit classpath bug
> > I tried to build ppc no zero/no shark and get the same results.
> > I tried the zero/shark configuration on intel and the build fails before
> it
> > gets to the same location.
> > The default build on intel works fine.
> >
> > Michael
> >
> >
> >
>
> You don't seem to be running the stamps/download-drops.stamp target at
> all during the build.
> Check that you have the latest tip:
>
> $ hg tip
> changeset:   2031:9eb43c172d5b
> tag:         tip
> user:        Andrew John Hughes <ahughes at redhat.com>
> date:        Wed Nov 04 22:07:39 2009 +0000
> summary:     Delete bootstrap/jdk1.7.0 on clean.
>
> If you still have the build directory, try:
>
> $ make download-drops
> $ make
>
> This is what I have:
[mfranz at localhost icedtea]$ hg tip
changeset:   2031:9eb43c172d5b
tag:         tip
user:        Andrew John Hughes <ahughes at redhat.com>
date:        Wed Nov 04 22:07:39 2009 +0000
summary:     Delete bootstrap/jdk1.7.0 on clean.

[mfranz at localhost icedtea]$ make download-drops
make: Nothing to be done for `download-drops'.

I was using TIP before and noticed that it was always downloading the jar
files after I did a clean.  It does not seem to be doing that now (I have
pulled/updated since then).

I noticed that the stamps/download-drops.stamp is still there after a clean,
but there is no drops directory.

So, I think the build process has changed while I was doing this.  The drops
directory is no-longer deleted and the stamps are not removed.  However, I
ended up with an empty drops directory but stamps indicating they were
downloaded.

I removed the stamps directory and tried again.  The classpath error is
no-longer an issue.

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

From gnu_andrew at member.fsf.org  Sun Nov  8 14:45:59 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 8 Nov 2009 22:45:59 +0000
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <fee4d890911081322p14b63c85wbf9cb59a0d8e6199@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
	<17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
	<fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>
	<17c6771e0911081208k6bd09fecx73f77c63b9290d71@mail.gmail.com>
	<fee4d890911081322p14b63c85wbf9cb59a0d8e6199@mail.gmail.com>
Message-ID: <17c6771e0911081445w5de041f3j431be65709bce4ff@mail.gmail.com>

2009/11/8 Michael Franz <mvfranz at gmail.com>:
>
> On Sun, Nov 8, 2009 at 3:08 PM, Andrew John Hughes
> <gnu_andrew at member.fsf.org> wrote:
>>
>> 2009/11/8 Michael Franz <mvfranz at gmail.com>:
>> > Andrew,
>> >
>> > I sent you my logs directly, the message was too big for the list.? This
>> > is
>> > what I have tried (for the list).
>> >
>> > I tried to build ppc with zero/shark - hit classpath bug
>> > I tried to build ppc no zero/no shark and get the same results.
>> > I tried the zero/shark configuration on intel and the build fails before
>> > it
>> > gets to the same location.
>> > The default build on intel works fine.
>> >
>> > Michael
>> >
>> >
>> >
>>
>> You don't seem to be running the stamps/download-drops.stamp target at
>> all during the build.
>> Check that you have the latest tip:
>>
>> $ hg tip
>> changeset: ? 2031:9eb43c172d5b
>> tag: ? ? ? ? tip
>> user: ? ? ? ?Andrew John Hughes <ahughes at redhat.com>
>> date: ? ? ? ?Wed Nov 04 22:07:39 2009 +0000
>> summary: ? ? Delete bootstrap/jdk1.7.0 on clean.
>>
>> If you still have the build directory, try:
>>
>> $ make download-drops
>> $ make
>>
> This is what I have:
> [mfranz at localhost icedtea]$ hg tip
> changeset:?? 2031:9eb43c172d5b
> tag:???????? tip
> user:??????? Andrew John Hughes <ahughes at redhat.com>
> date:??????? Wed Nov 04 22:07:39 2009 +0000
> summary:???? Delete bootstrap/jdk1.7.0 on clean.
>
> [mfranz at localhost icedtea]$ make download-drops
> make: Nothing to be done for `download-drops'.
>
> I was using TIP before and noticed that it was always downloading the jar
> files after I did a clean.? It does not seem to be doing that now (I have
> pulled/updated since then).
>

Yes, that's correct; I've made the tarballs only be deleted on a full
distclean (which gets rid of everything, including things like the
Makefile generated by configure).

> I noticed that the stamps/download-drops.stamp is still there after a clean,
> but there is no drops directory.
>
> So, I think the build process has changed while I was doing this.? The drops
> directory is no-longer deleted and the stamps are not removed.? However, I
> ended up with an empty drops directory but stamps indicating they were
> downloaded.
>
> I removed the stamps directory and tried again.? The classpath error is
> no-longer an issue.
>

So sounds like just a case of things changing in later revisions and
trying to use the same build directory.  This happens with tracking hg
and there's nothing we can really do to future-proof the build
directory against unknown future changes.  The easiest solution is to
do what I do and build in a separate directory which can then simply
be deleted when you start a fresh build.

> Michael
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From Tim.Bell at Sun.COM  Sun Nov  8 14:49:52 2009
From: Tim.Bell at Sun.COM (Tim Bell)
Date: Sun, 08 Nov 2009 14:49:52 -0800
Subject: classpath/41699 On Fedora 11 PowerPC IcedTea 7 Build
In-Reply-To: <17c6771e0911081445w5de041f3j431be65709bce4ff@mail.gmail.com>
References: <fee4d890911071418s703e9991u16b51dcb3d95a561@mail.gmail.com>
	<17c6771e0911071706r41cd9b51h89972f0c7fa62aae@mail.gmail.com>
	<fee4d890911071745y528befd9uf230fb939aec4df0@mail.gmail.com>
	<17c6771e0911071754w518e6963gc58b1433c423da3d@mail.gmail.com>
	<fee4d890911080649l10af33e3j114b96fcf366c873@mail.gmail.com>
	<17c6771e0911081208k6bd09fecx73f77c63b9290d71@mail.gmail.com>
	<fee4d890911081322p14b63c85wbf9cb59a0d8e6199@mail.gmail.com>
	<17c6771e0911081445w5de041f3j431be65709bce4ff@mail.gmail.com>
Message-ID: <4AF74B10.70000@sun.com>

Andrew John Hughes wrote:
(snip...)

> So sounds like just a case of things changing in later revisions and
> trying to use the same build directory.  This happens with tracking hg
> and there's nothing we can really do to future-proof the build
> directory against unknown future changes.  The easiest solution is to
> do what I do and build in a separate directory which can then simply
> be deleted when you start a fresh build.

+1  --  When in doubt, rename or delete the previous build directory, then
start a new build from scratch...

Tim



From mvfranz at gmail.com  Sun Nov  8 15:46:24 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 8 Nov 2009 18:46:24 -0500
Subject: What is the status of Zero on OpenJDK 7
Message-ID: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>

Hi,

I notice that most of the documentation talks about OpenJDK 6, does
Zero/Shark currently compile with OpenJDK 7?

Michael
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091108/86d8f175/attachment.html 

From gnu_andrew at member.fsf.org  Sun Nov  8 15:49:46 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 8 Nov 2009 23:49:46 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
Message-ID: <17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>

2009/11/8 Michael Franz <mvfranz at gmail.com>:
> Hi,
>
> I notice that most of the documentation talks about OpenJDK 6, does
> Zero/Shark currently compile with OpenJDK 7?
>
> Michael
>

Yes.  In fact, Zero has been accepted upstream for OpenJDK7:

http://gbenson.net/?p=166
http://blog.fuseyism.com/index.php/2009/10/15/zero-assembler-port-upstream/
http://blog.fuseyism.com/index.php/2009/11/01/halfway-there/

which means it should appear in the bsd-port repository when they
update to b76/milestone 5, but will need some porting work to run on
that platform.

Shark builds but can't currently bootstrap itself.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Sun Nov  8 15:55:30 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 8 Nov 2009 18:55:30 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
Message-ID: <fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>

So, I should be able to build on Fedora 11?  I am currently getting errors
when NOT use bsd.

g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DPPC -DZERO_LIBARCH=\"ppc\"
-DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/asm
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/c1
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/ci
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/classfile
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/code
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/compiler
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/g1
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/parNew
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/shared
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_interface
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/interpreter
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/memory
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/prims
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/runtime
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/services
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/shark
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/utilities
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/cpu/zero/vm
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/os/linux/vm
-I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"17.0-b04\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"mfranz\""
-DHOTSPOT_LIB_ARCH=\"ppc\" -DJRE_RELEASE_VERSION="\"1.7.0_0-b75\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDISTRIBUTION_ID="\"Built on Fedora
release 11 (Leonidas)\"" -DSHARK -I/usr/lib/libffi-3.0.5/include
-I/usr/include  -DNDEBUG  -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS  -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
-fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32  -fPIC
-DSHARK_LLVM_VERSION=25 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT
-fcheck-new -m32 -pipe -g -O3 -fno-strict-aliasing -D_LP64=1 -Werror
-Wpointer-arith -Wsign-compare    -c -x c++-header -c
../generated/incls/_precompiled.incl -o incls/_precompiled.incl.gch
In file included from ../generated/incls/_precompiled.incl:52:
/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:234:1:
error: multi-line comment
/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:237:1:
error: multi-line comment
/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:240:1:
error: multi-line comment
/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:243:1:
error: multi-line comment

Michael

On Sun, Nov 8, 2009 at 6:49 PM, Andrew John Hughes <
gnu_andrew at member.fsf.org> wrote:

> 2009/11/8 Michael Franz <mvfranz at gmail.com>:
> > Hi,
> >
> > I notice that most of the documentation talks about OpenJDK 6, does
> > Zero/Shark currently compile with OpenJDK 7?
> >
> > Michael
> >
>
> Yes.  In fact, Zero has been accepted upstream for OpenJDK7:
>
> http://gbenson.net/?p=166
> http://blog.fuseyism.com/index.php/2009/10/15/zero-assembler-port-upstream/
> http://blog.fuseyism.com/index.php/2009/11/01/halfway-there/
>
> which means it should appear in the bsd-port repository when they
> update to b76/milestone 5, but will need some porting work to run on
> that platform.
>
> Shark builds but can't currently bootstrap itself.
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091108/5b4ad611/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Sun Nov  8 17:53:05 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 01:53:05 +0000
Subject: [Bug 303] qt-integration plugin in eclipse crashes while opening ui
	file
Message-ID: <E1N7JRJ-0004j9-Lm@icedtea.classpath.org>

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


ravaleshb at gmail.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 andrew at icedtea.classpath.org  Sun Nov  8 18:17:39 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 02:17:39 +0000
Subject: /hg/icedtea6: 3 new changesets
Message-ID: <hg.4f0b3652adee.1257733059.2873452341184383832@icedtea.classpath.org>

changeset 4f0b3652adee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4f0b3652adee
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 00:20:07 2009 +0000

	Fix security patches that fail to apply.

	2009-11-08 Andrew John Hughes <ahughes at redhat.com>

	 * patches/security/icedtea-6657138.patch,
		* patches/security/icedtea-6824265.patch: Fix security patches
	which don't apply.


changeset 1b34da20e2d1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1b34da20e2d1
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 01:02:53 2009 +0000

	Add missing security patch from OpenJDK repository.

	2009-11-08 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add missing security patch.
		* NEWS: List new security fixes with CVEs.
		* patches/security/icedtea-6664512.patch: Missing security
	patch from OpenJDK6 repository.


changeset 4073d444623d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4073d444623d
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 02:20:58 2009 +0000

	List all mandatory patches together. Include bug ID for XShm patch.

	2009-11-08 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-xshm.patch: Renamed to...
		* Makefile.am: List all mandatory patches together. Rename
	xshm patch to include bug ID.
		* patches/icedtea-6897844-xshm.patch: ...include bug ID.


diffstat:

8 files changed, 1937 insertions(+), 679 deletions(-)
ChangeLog                              |   22 
Makefile.am                            |  112 +-
NEWS                                   |   16 
patches/icedtea-6897844-xshm.patch     |   13 
patches/icedtea-xshm.patch             |   13 
patches/security/icedtea-6657138.patch | 1164 ++++++++++++++----------------
patches/security/icedtea-6664512.patch | 1227 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6824265.patch |   49 -

diffs (truncated from 2850 to 500 lines):

diff -r 0ab9e9de339b -r 4073d444623d ChangeLog
--- a/ChangeLog	Fri Nov 06 15:03:12 2009 +0100
+++ b/ChangeLog	Mon Nov 09 02:20:58 2009 +0000
@@ -1,3 +1,25 @@ 2009-11-06  Matthias Klose  <doko at ubuntu
+2009-11-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-xshm.patch: Renamed to...
+	* Makefile.am:
+	List all mandatory patches together.  Rename
+	xshm patch to include bug ID.
+	* patches/icedtea-6897844-xshm.patch:
+	...include bug ID.
+
+2009-11-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add missing security patch.
+	* NEWS: List new security fixes with CVEs.
+	* patches/security/icedtea-6664512.patch:
+	Missing security patch from OpenJDK6 repository.
+	
+2009-11-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/security/icedtea-6657138.patch,
+	* patches/security/icedtea-6824265.patch:
+	Fix security patches which don't apply.
+
 2009-11-06  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/security/icedtea-6657026.patch: Add missing context line.
diff -r 0ab9e9de339b -r 4073d444623d Makefile.am
--- a/Makefile.am	Fri Nov 06 15:03:12 2009 +0100
+++ b/Makefile.am	Mon Nov 09 02:20:58 2009 +0000
@@ -603,60 +603,8 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6822057.patch \
 	patches/security/icedtea-6824265.patch \
 	patches/security/icedtea-6861062.patch \
-	patches/security/icedtea-6872358.patch 
-
-if WITH_RHINO
-ICEDTEA_PATCHES += \
-	patches/icedtea-rhino.patch
-endif
-
-if BUILD_CACAO
-ICEDTEA_PATCHES += \
-	patches/icedtea-cacao.patch \
-	patches/icedtea-cacao-no-mmap-first-page.patch \
-	patches/cacao/no-strict-aliasing.patch
-endif
-if WITH_CACAO
-ICEDTEA_PATCHES += \
-	patches/icedtea-cacao-ignore-jdi-tests.patch \
-	patches/icedtea-cacao-ignore-tests.patch
-endif
-
-if ENABLE_PULSE_JAVA
-ICEDTEA_PATCHES += \
-	patches/icedtea-pulse-soundproperties.patch
-endif
-
-if ENABLE_XRENDER
-XRENDER_PATCHES = patches/xrender/icedtea-???.patch
-XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
-ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
-endif
-
-if ENABLE_NIO2
-ICEDTEA_PATCHES += patches/icedtea-nio2.patch
-endif
-
-if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
-endif
-
-if ENABLE_NSS
-ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \
-		   patches/icedtea-nss-6763530.patch
-endif
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
-	patches/hotspot/$(HSBUILD)/zero.patch
-else
-ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
-	patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
-	patches/hotspot/original/icedtea-6791168.patch \
-	patches/hotspot/original/icedtea-6793825-includedb.patch
-endif
-
-ICEDTEA_PATCHES += \
+	patches/security/icedtea-6872358.patch \
+	patches/security/icedtea-6664512.patch \
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-awt-window-size.patch \
 	patches/icedtea-java2d-dasher.patch \
@@ -678,8 +626,60 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-s390-serialize.patch \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
 	patches/icedtea-no-precompiled.patch \
-	patches/icedtea-xshm.patch \
-	$(DISTRIBUTION_PATCHES)
+	patches/icedtea-6897844-xshm.patch
+
+if WITH_RHINO
+ICEDTEA_PATCHES += \
+	patches/icedtea-rhino.patch
+endif
+
+if BUILD_CACAO
+ICEDTEA_PATCHES += \
+	patches/icedtea-cacao.patch \
+	patches/icedtea-cacao-no-mmap-first-page.patch \
+	patches/cacao/no-strict-aliasing.patch
+endif
+if WITH_CACAO
+ICEDTEA_PATCHES += \
+	patches/icedtea-cacao-ignore-jdi-tests.patch \
+	patches/icedtea-cacao-ignore-tests.patch
+endif
+
+if ENABLE_PULSE_JAVA
+ICEDTEA_PATCHES += \
+	patches/icedtea-pulse-soundproperties.patch
+endif
+
+if ENABLE_XRENDER
+XRENDER_PATCHES = patches/xrender/icedtea-???.patch
+XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
+ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
+endif
+
+if ENABLE_NIO2
+ICEDTEA_PATCHES += patches/icedtea-nio2.patch
+endif
+
+if ENABLE_SYSTEMTAP
+ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
+endif
+
+if ENABLE_NSS
+ICEDTEA_PATCHES += patches/icedtea-nss-config.patch \
+		   patches/icedtea-nss-6763530.patch
+endif
+
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
+	patches/hotspot/$(HSBUILD)/zero.patch
+else
+ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
+	patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
+	patches/hotspot/original/icedtea-6791168.patch \
+	patches/hotspot/original/icedtea-6793825-includedb.patch
+endif
+
+ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
diff -r 0ab9e9de339b -r 4073d444623d NEWS
--- a/NEWS	Fri Nov 06 15:03:12 2009 +0100
+++ b/NEWS	Mon Nov 09 02:20:58 2009 +0000
@@ -8,6 +8,22 @@ New in release 1.7 (XXXX-XX-XX):
 - libjpeg7 supported.
 - Added JNI call tracing using systemtap version 1.0+ when
   configuring with --enable-systemtap. See tapset/hotspot_jni.stp.
+- Latest security updates:
+  - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+  - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+  - (CVE-2009-3881) resurrected classloaders can still have children (6636650) 
+  - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+  - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+  - (CVE-2009-3880) UI logging information leakage (6664512)
+  - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+  - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+  - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+  - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+  - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+  - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+  - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+  - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+  - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
 
 New in release 1.6 (2009-09-10):
 
diff -r 0ab9e9de339b -r 4073d444623d patches/icedtea-6897844-xshm.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6897844-xshm.patch	Mon Nov 09 02:20:58 2009 +0000
@@ -0,0 +1,13 @@
+--- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-30 13:25:52.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#ifndef X_ShmAttach
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
++#endif
+ 
+ extern int XShmQueryExtension();
+ 
diff -r 0ab9e9de339b -r 4073d444623d patches/icedtea-xshm.patch
--- a/patches/icedtea-xshm.patch	Fri Nov 06 15:03:12 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-30 13:25:52.000000000 -0400
-@@ -42,6 +42,10 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
- #include <X11/extensions/XShm.h>
-+#ifndef X_ShmAttach
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
-+#endif
- 
- extern int XShmQueryExtension();
- 
diff -r 0ab9e9de339b -r 4073d444623d patches/security/icedtea-6657138.patch
--- a/patches/security/icedtea-6657138.patch	Fri Nov 06 15:03:12 2009 +0100
+++ b/patches/security/icedtea-6657138.patch	Mon Nov 09 02:20:58 2009 +0000
@@ -1,6 +1,377 @@
---- old/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	Tue Jul 14 16:21:58 2009
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java	Tue Jul 14 16:21:58 2009
-@@ -8,6 +8,8 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java	2009-11-08 22:51:56.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.motif;
+ 
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.border.*;
+ import javax.swing.plaf.basic.*;
+@@ -46,16 +48,23 @@
+  */
+ public class MotifButtonUI extends BasicButtonUI {
+ 
+-    private final static MotifButtonUI motifButtonUI = new MotifButtonUI();
+-
+     protected Color selectColor;
+ 
+     private boolean defaults_initialized = false;
+ 
++    private static final Object MOTIF_BUTTON_UI_KEY = new Object();
++
+     // ********************************
+     //          Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent c){
++        AppContext appContext = AppContext.getAppContext();
++        MotifButtonUI motifButtonUI =
++                (MotifButtonUI) appContext.get(MOTIF_BUTTON_UI_KEY);
++        if (motifButtonUI == null) {
++            motifButtonUI = new MotifButtonUI();
++            appContext.put(MOTIF_BUTTON_UI_KEY, motifButtonUI);
++        }
+         return motifButtonUI;
+     }
+ 
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java	2009-11-08 22:53:23.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.motif;
+ 
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ 
+ import javax.swing.plaf.*;
+@@ -45,7 +47,7 @@
+  */
+ public class MotifCheckBoxUI extends MotifRadioButtonUI {
+ 
+-    private static final MotifCheckBoxUI motifCheckBoxUI = new MotifCheckBoxUI();
++    private static final Object MOTIF_CHECK_BOX_UI_KEY = new Object();
+ 
+     private final static String propertyPrefix = "CheckBox" + ".";
+ 
+@@ -56,6 +58,13 @@
+     //         Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent c){
++        AppContext appContext = AppContext.getAppContext();
++        MotifCheckBoxUI motifCheckBoxUI =
++                (MotifCheckBoxUI) appContext.get(MOTIF_CHECK_BOX_UI_KEY);
++        if (motifCheckBoxUI == null) {
++            motifCheckBoxUI = new MotifCheckBoxUI();
++            appContext.put(MOTIF_CHECK_BOX_UI_KEY, motifCheckBoxUI);
++        }
+         return motifCheckBoxUI;
+     }
+ 
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java	2009-11-08 22:46:58.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.motif;
+ 
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.plaf.basic.BasicLabelUI;
+ import javax.swing.plaf.ComponentUI;
+@@ -44,9 +46,16 @@
+  */
+ public class MotifLabelUI extends BasicLabelUI
+ {
+-    static MotifLabelUI sharedInstance = new MotifLabelUI();
++    private static final Object MOTIF_LABEL_UI_KEY = new Object();
+ 
+     public static ComponentUI createUI(JComponent c) {
+-        return sharedInstance;
++        AppContext appContext = AppContext.getAppContext();
++        MotifLabelUI motifLabelUI = 
++                (MotifLabelUI) appContext.get(MOTIF_LABEL_UI_KEY);
++        if (motifLabelUI == null) {
++            motifLabelUI = new MotifLabelUI();
++            appContext.put(MOTIF_LABEL_UI_KEY, motifLabelUI);
++        }
++        return motifLabelUI;
+     }
+ }
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java	2009-11-08 22:53:03.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.motif;
+ 
++import sun.awt.AppContext;
++
+ import javax.swing.*;
+ import javax.swing.border.*;
+ import javax.swing.plaf.basic.BasicRadioButtonUI;
+@@ -47,7 +49,7 @@
+  */
+ public class MotifRadioButtonUI extends BasicRadioButtonUI {
+ 
+-    private static final MotifRadioButtonUI motifRadioButtonUI = new MotifRadioButtonUI();
++    private static final Object MOTIF_RADIO_BUTTON_UI_KEY = new Object();
+ 
+     protected Color focusColor;
+ 
+@@ -57,6 +59,13 @@
+     //         Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent c) {
++        AppContext appContext = AppContext.getAppContext();
++        MotifRadioButtonUI motifRadioButtonUI =
++                (MotifRadioButtonUI) appContext.get(MOTIF_RADIO_BUTTON_UI_KEY);
++        if (motifRadioButtonUI == null) {
++            motifRadioButtonUI = new MotifRadioButtonUI();
++            appContext.put(MOTIF_RADIO_BUTTON_UI_KEY, motifRadioButtonUI);
++        }
+         return motifRadioButtonUI;
+     }
+ 
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java	2009-11-08 22:52:35.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.motif;
+ 
++import sun.awt.AppContext;
++
+ import java.awt.*;
+ import java.awt.event.*;
+ 
+@@ -48,7 +50,7 @@
+  */
+ public class MotifToggleButtonUI extends BasicToggleButtonUI
+ {
+-    private final static MotifToggleButtonUI motifToggleButtonUI = new MotifToggleButtonUI();
++    private static final Object MOTIF_TOGGLE_BUTTON_UI_KEY = new Object();
+ 
+     protected Color selectColor;
+ 
+@@ -58,6 +60,13 @@
+     //         Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent b) {
++        AppContext appContext = AppContext.getAppContext();
++        MotifToggleButtonUI motifToggleButtonUI =
++                (MotifToggleButtonUI) appContext.get(MOTIF_TOGGLE_BUTTON_UI_KEY);
++        if (motifToggleButtonUI == null) {
++            motifToggleButtonUI = new MotifToggleButtonUI();
++            appContext.put(MOTIF_TOGGLE_BUTTON_UI_KEY, motifToggleButtonUI);
++        }
+         return motifToggleButtonUI;
+     }
+ 
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java	2009-11-08 22:54:23.000000000 +0000
+@@ -35,6 +35,7 @@
+ import static com.sun.java.swing.plaf.windows.TMSchema.*;
+ import static com.sun.java.swing.plaf.windows.TMSchema.Part.*;
+ import static com.sun.java.swing.plaf.windows.XPStyle.Skin;
++import sun.awt.AppContext;
+ 
+ 
+ /**
+@@ -52,8 +53,6 @@
+  */
+ public class WindowsButtonUI extends BasicButtonUI
+ {
+-    private final static WindowsButtonUI windowsButtonUI = new WindowsButtonUI();
+-
+     protected int dashedRectGapX;
+     protected int dashedRectGapY;
+     protected int dashedRectGapWidth;
+@@ -63,11 +62,19 @@
+ 
+     private boolean defaults_initialized = false;
+ 
++    private static final Object WINDOWS_BUTTON_UI_KEY = new Object();
+ 
+     // ********************************
+     //          Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent c){
++        AppContext appContext = AppContext.getAppContext();
++        WindowsButtonUI windowsButtonUI =
++                (WindowsButtonUI) appContext.get(WINDOWS_BUTTON_UI_KEY);
++        if (windowsButtonUI == null) {
++            windowsButtonUI = new WindowsButtonUI();
++            appContext.put(WINDOWS_BUTTON_UI_KEY, windowsButtonUI);
++        }
+         return windowsButtonUI;
+     }
+ 
+@@ -151,7 +158,7 @@
+      * allocating them in each paint call substantially reduced the time
+      * it took paint to run.  Obviously, this method can't be re-entered.
+      */
+-    private static Rectangle viewRect = new Rectangle();
++    private Rectangle viewRect = new Rectangle();
+ 
+     public void paint(Graphics g, JComponent c) {
+         if (XPStyle.getXP() != null) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java	2009-11-08 22:53:46.000000000 +0000
+@@ -25,6 +25,8 @@
+ 
+ package com.sun.java.swing.plaf.windows;
+ 
++import sun.awt.AppContext;
++
+ import javax.swing.plaf.basic.*;
+ import javax.swing.*;
+ import javax.swing.plaf.*;
+@@ -49,7 +51,7 @@
+     // of BasicCheckBoxUI because we want to pick up all the
+     // painting changes made in MetalRadioButtonUI.
+ 
+-    private static final WindowsCheckBoxUI windowsCheckBoxUI = new WindowsCheckBoxUI();
++    private static final Object WINDOWS_CHECK_BOX_UI_KEY = new Object();
+ 
+     private final static String propertyPrefix = "CheckBox" + ".";
+ 
+@@ -59,6 +61,13 @@
+     //          Create PLAF
+     // ********************************
+     public static ComponentUI createUI(JComponent c) {
++        AppContext appContext = AppContext.getAppContext();
++        WindowsCheckBoxUI windowsCheckBoxUI =
++                (WindowsCheckBoxUI) appContext.get(WINDOWS_CHECK_BOX_UI_KEY);
++        if (windowsCheckBoxUI == null) {
++            windowsCheckBoxUI = new WindowsCheckBoxUI();
++            appContext.put(WINDOWS_CHECK_BOX_UI_KEY, windowsCheckBoxUI);
++        }
+         return windowsCheckBoxUI;
+     }
+ 
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java	2009-10-14 18:17:19.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java	2009-11-08 22:56:38.000000000 +0000
+@@ -26,6 +26,8 @@
+ package com.sun.java.swing.plaf.windows;
+ 
+ import sun.swing.SwingUtilities2;
++import sun.awt.AppContext;
++
+ import java.awt.Color;
+ import java.awt.Graphics;
+ 
+@@ -51,12 +53,19 @@
+  */
+ public class WindowsLabelUI extends BasicLabelUI {
+ 
+-    private final static WindowsLabelUI windowsLabelUI = new WindowsLabelUI();


From xerxes at zafena.se  Mon Nov  9 02:38:41 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 09 Nov 2009 11:38:41 +0100
Subject: [patch] rfc: -XX:SharkPrintAsmOf llvm2.7 api update
Message-ID: <4AF7F131.2090508@zafena.se>

In llvm2.7 svn trunk Chris Lattner added a new API on Aph's request that
would enable and disable debugging output more vigorously.
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091026/089863.html
- new api for us, yay!
The attached patch in this mail makes Shark use this new API for the 
-XX:SharkPrintAsmOf debug option.

Unfortunally there was a small namespaces bug in the implementation of
this new LLVM API and I am waiting for response from Chris reguarding
this issue:
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090682.html 
- correspondence
You have to apply the patch on llvm in this correspondence in-order to
build the new patch for icedtea6.

Should i remove the old pre LLVM2.7 support for -XX:SharkPrintAsmOf ?
Currently you need a special patched llvm version to make the option
work at all on older LLVM versions.

Cheers and have a great day!
Xerxes




-------------- next part --------------
A non-text attachment was scrubbed...
Name: 9nov-SharkPrintAsmOf-llvm2.7api.patch
Type: text/x-patch
Size: 1724 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091109/427a6d04/9nov-SharkPrintAsmOf-llvm2.7api.patch 

From gbenson at redhat.com  Mon Nov  9 03:06:24 2009
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 9 Nov 2009 11:06:24 +0000
Subject: [patch] rfc: shark llvm2.7 r84651 SharkMemoryManager fix.
In-Reply-To: <4AF5E70E.7040501@zafena.se>
References: <4AF5E70E.7040501@zafena.se>
Message-ID: <20091109110624.GC3281@redhat.com>

Xerxes R?nby wrote:
> The LLVM JITMemoryManager changed a little in r84651 and by using
> the attached patch re-enables Shark to be build-able using the
> latest LLVM svn trunk.
> http://llvm.org/viewvc/llvm-project?view=rev&revision=84651
> 
> Clear to push?

Rather than having two #ifs, how about having a #else?
Otherwise, please push :)

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Mon Nov  9 03:08:58 2009
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 9 Nov 2009 11:08:58 +0000
Subject: [patch] rfc: -XX:SharkPrintAsmOf llvm2.7 api update
In-Reply-To: <4AF7F131.2090508@zafena.se>
References: <4AF7F131.2090508@zafena.se>
Message-ID: <20091109110858.GD3281@redhat.com>

Xerxes R?nby wrote:
> In llvm2.7 svn trunk Chris Lattner added a new API on Aph's request
> that would enable and disable debugging output more vigorously.
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091026/089863.html
> - new api for us, yay!
> The attached patch in this mail makes Shark use this new API for the
> -XX:SharkPrintAsmOf debug option.
> 
> Unfortunally there was a small namespaces bug in the implementation
> of this new LLVM API and I am waiting for response from Chris
> reguarding this issue:
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090682.html 
> - correspondence
> You have to apply the patch on llvm in this correspondence in-order
> to build the new patch for icedtea6.
> 
> Should i remove the old pre LLVM2.7 support for -XX:SharkPrintAsmOf ?
> Currently you need a special patched llvm version to make the option
> work at all on older LLVM versions.

Please leave the old support in, with a #else as I mentioned in my
last mail.

Thanks for doing this!

Cheers,
Gary

-- 
http://gbenson.net/


From xerxes at zafena.se  Mon Nov  9 03:13:26 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 09 Nov 2009 12:13:26 +0100
Subject: [patch] rfc: -XX:SharkPrintAsmOf llvm2.7 api update
In-Reply-To: <4AF7F131.2090508@zafena.se>
References: <4AF7F131.2090508@zafena.se>
Message-ID: <4AF7F956.6020206@zafena.se>

Xerxes R?nby skrev:
> In llvm2.7 svn trunk Chris Lattner added a new API on Aph's request that
> would enable and disable debugging output more vigorously.
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091026/089863.html
> - new api for us, yay!
> The attached patch in this mail makes Shark use this new API for the 
> -XX:SharkPrintAsmOf debug option.
>
> Unfortunally there was a small namespaces bug in the implementation of
> this new LLVM API and I am waiting for response from Chris reguarding
> this issue:
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090682.html 
> - correspondence
> You have to apply the patch on llvm in this correspondence in-order to
> build the new patch for icedtea6.
>
> Should i remove the old pre LLVM2.7 support for -XX:SharkPrintAsmOf ?
> Currently you need a special patched llvm version to make the option
> work at all on older LLVM versions.
>
> Cheers and have a great day!
> Xerxes
>   
 2nd try i somehow attached the wrong version of the patch with some
missing curly-brackets, this should be the correct version.

Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 9nov-take2-SharkPrintAsmOf-llvm2.7api.patch
Type: text/x-patch
Size: 1744 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091109/74a66ece/9nov-take2-SharkPrintAsmOf-llvm2.7api.patch 

From xerxes at zafena.se  Mon Nov  9 03:15:01 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 09 Nov 2009 12:15:01 +0100
Subject: [patch] rfc: -XX:SharkPrintAsmOf llvm2.7 api update
In-Reply-To: <20091109110858.GD3281@redhat.com>
References: <4AF7F131.2090508@zafena.se> <20091109110858.GD3281@redhat.com>
Message-ID: <4AF7F9B5.4030803@zafena.se>

Gary Benson skrev:
> Xerxes R?nby wrote:
>   
>> In llvm2.7 svn trunk Chris Lattner added a new API on Aph's request
>> that would enable and disable debugging output more vigorously.
>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091026/089863.html
>> - new api for us, yay!
>> The attached patch in this mail makes Shark use this new API for the
>> -XX:SharkPrintAsmOf debug option.
>>
>> Unfortunally there was a small namespaces bug in the implementation
>> of this new LLVM API and I am waiting for response from Chris
>> reguarding this issue:
>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090682.html 
>> - correspondence
>> You have to apply the patch on llvm in this correspondence in-order
>> to build the new patch for icedtea6.
>>
>> Should i remove the old pre LLVM2.7 support for -XX:SharkPrintAsmOf ?
>> Currently you need a special patched llvm version to make the option
>> work at all on older LLVM versions.
>>     
>
> Please leave the old support in, with a #else as I mentioned in my
> last mail.
>
> Thanks for doing this!
>
> Cheers,
> Gary
>
>   
Ok thanks, i will add as many #else as appropriate and commit!

Cheers
Xerxes


From xranby at icedtea.classpath.org  Mon Nov  9 03:52:41 2009
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 11:52:41 +0000
Subject: /hg/icedtea6: Adjust SharkMemoryManager to support LLVM 2.7svn r...
Message-ID: <hg.00375f1c8222.1257767561.2873452341184383832@icedtea.classpath.org>

changeset 00375f1c8222 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=00375f1c8222
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Nov 09 12:55:30 2009 +0100

	Adjust SharkMemoryManager to support LLVM 2.7svn rev 84651.

	2009-11-09 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: New
	methods deallocateExceptionTable and deallocateFunctionBody
	dependent on the llvm version. Made deallocateMemForFunction
	method dependent on the llvm version.


diffstat:

3 files changed, 25 insertions(+)
ChangeLog                                               |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   12 ++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    5 +++++

diffs (57 lines):

diff -r 4073d444623d -r 00375f1c8222 ChangeLog
--- a/ChangeLog	Mon Nov 09 02:20:58 2009 +0000
+++ b/ChangeLog	Mon Nov 09 12:55:30 2009 +0100
@@ -1,3 +1,11 @@ 2009-11-08  Andrew John Hughes  <ahughes
+2009-11-09  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp:
+	New methods deallocateExceptionTable and deallocateFunctionBody
+	dependent on the llvm version.
+	Made deallocateMemForFunction method dependent on the llvm version.
+
 2009-11-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-xshm.patch: Renamed to...
diff -r 4073d444623d -r 00375f1c8222 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 09 02:20:58 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Mon Nov 09 12:55:30 2009 +0100
@@ -86,10 +86,22 @@ void SharkMemoryManager::setMemoryExecut
   mm()->setMemoryExecutable();
 }
 
+#if SHARK_LLVM_VERSION >= 27
+void SharkMemoryManager::deallocateExceptionTable(void *ptr)
+{
+  mm()->deallocateExceptionTable(ptr);
+}
+
+void SharkMemoryManager::deallocateFunctionBody(void *ptr)
+{
+  mm()->deallocateFunctionBody(ptr);
+}
+#else
 void SharkMemoryManager::deallocateMemForFunction(const Function* F)
 {
   return mm()->deallocateMemForFunction(F);
 }
+#endif
 
 #if SHARK_LLVM_VERSION >= 26
 uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment)
diff -r 4073d444623d -r 00375f1c8222 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Mon Nov 09 02:20:58 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Mon Nov 09 12:55:30 2009 +0100
@@ -79,7 +79,12 @@ class SharkMemoryManager : public llvm::
 #endif
   void setMemoryWritable();
   void setMemoryExecutable();
+#if SHARK_LLVM_VERSION >= 27
+  void deallocateExceptionTable(void *ptr);
+  void deallocateFunctionBody(void *ptr);
+#else
   void deallocateMemForFunction(const llvm::Function* F);
+#endif
 
 #if SHARK_LLVM_VERSION >= 25
   unsigned char *allocateSpace(intptr_t Size,


From xranby at icedtea.classpath.org  Mon Nov  9 04:04:16 2009
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 12:04:16 +0000
Subject: /hg/icedtea6: Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r8...
Message-ID: <hg.ff96e96a485b.1257768256.2873452341184383832@icedtea.classpath.org>

changeset ff96e96a485b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ff96e96a485b
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Nov 09 13:07:15 2009 +0100

	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.

	2009-11-09 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
	Include llvm/Support/Debug.h dependent on llvm version. Made
	Include llvm/Support/CommandLine.h dependent on llvm version.
	        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp:
	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.


diffstat:

3 files changed, 28 insertions(+)
ChangeLog                                          |    8 ++++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    4 ++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   16 ++++++++++++++++

diffs (63 lines):

diff -r 00375f1c8222 -r ff96e96a485b ChangeLog
--- a/ChangeLog	Mon Nov 09 12:55:30 2009 +0100
+++ b/ChangeLog	Mon Nov 09 13:07:15 2009 +0100
@@ -1,3 +1,11 @@ 2009-11-09  Xerxes R??nby  <xerxes at zafen
+2009-11-09  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	Include llvm/Support/Debug.h dependent on llvm version.
+	Made Include llvm/Support/CommandLine.h dependent on llvm version.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp:
+	Implement -XX:SharkPrintAsmOf using LLVM 2.7svn r85395 debug API.
+
 2009-11-09  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
diff -r 00375f1c8222 -r ff96e96a485b ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Nov 09 12:55:30 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Nov 09 13:07:15 2009 +0100
@@ -44,7 +44,11 @@
 #endif
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
+#if SHARK_LLVM_VERSION < 27
 #include <llvm/Support/CommandLine.h>
+#else
+#include <llvm/Support/Debug.h>
+#endif
 
 #include <map>
 
diff -r 00375f1c8222 -r ff96e96a485b ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Nov 09 12:55:30 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Nov 09 13:07:15 2009 +0100
@@ -132,6 +132,7 @@ void SharkCompiler::compile_method(ciEnv
 
   // Compile to native code
 #ifndef PRODUCT
+#if SHARK_LLVM_VERSION < 27
 #ifdef X86
   if (SharkPrintAsmOf != NULL) {
     std::vector<const char*> args;
@@ -144,6 +145,21 @@ void SharkCompiler::compile_method(ciEnv
     cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
   }
 #endif // X86
+#else
+  if (SharkPrintAsmOf != NULL) {
+    if (!fnmatch(SharkPrintAsmOf, name, 0)) {
+#ifdef X86
+      llvm::SetCurrentDebugType("x86-emitter");
+#else
+      llvm::SetCurrentDebugType("jit");
+#endif // X86
+      llvm::DebugFlag=true;
+    } else {
+      llvm::SetCurrentDebugType(""); 
+      llvm::DebugFlag=false;
+    }
+  }
+#endif
 #endif // !PRODUCT
   memory_manager()->set_entry_for_function(function, entry);
   module()->getFunctionList().push_back(function);


From xerxes at zafena.se  Mon Nov  9 07:02:17 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 09 Nov 2009 16:02:17 +0100
Subject: [patch] rfc: -XX:SharkPrintAsmOf llvm2.7 api update
In-Reply-To: <4AF7F9B5.4030803@zafena.se>
References: <4AF7F131.2090508@zafena.se> <20091109110858.GD3281@redhat.com>
	<4AF7F9B5.4030803@zafena.se>
Message-ID: <4AF82EF9.8070907@zafena.se>

Xerxes R?nby skrev:
> Gary Benson skrev:
>   
>> Xerxes R?nby wrote:
>>   
>>     
>>> In llvm2.7 svn trunk Chris Lattner added a new API on Aph's request
>>> that would enable and disable debugging output more vigorously.
>>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091026/089863.html
>>> - new api for us, yay!
>>> The attached patch in this mail makes Shark use this new API for the
>>> -XX:SharkPrintAsmOf debug option.
>>>
>>> Unfortunally there was a small namespaces bug in the implementation
>>> of this new LLVM API and I am waiting for response from Chris
>>> reguarding this issue:
>>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090682.html 
>>> - correspondence
>>> You have to apply the patch on llvm in this correspondence in-order
>>> to build the new patch for icedtea6.
>>>       

For your information: Patching of llvm are no longer needed to make use
of the -XX:SharkPrintAsmOf=  debug option when using llvm2.7svn rev
86544 and later with icedtea6! All fixed upstream.
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091109/090686.html

Enjoy!
Xerxes


From andrew at icedtea.classpath.org  Mon Nov  9 08:54:59 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 16:54:59 +0000
Subject: /hg/release/icedtea6-1.5: Add latest security updates.
Message-ID: <hg.dc4494777bad.1257785699.1785565629229908555@icedtea.classpath.org>

changeset dc4494777bad in /hg/release/icedtea6-1.5
details: http://icedtea.classpath.org/hg/release/icedtea6-1.5?cmd=changeset;node=dc4494777bad
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 16:58:51 2009 +0000

	Add latest security updates.

	2009-11-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add remaining security patches.
		* NEWS: Updated with security patches.
		* patches/security/icedtea-6631533.patch,
		* patches/security/icedtea-6632445.patch,
		* patches/security/icedtea-6636650.patch,
		* patches/security/icedtea-6657026.patch,
		* patches/security/icedtea-6657138.patch,
		* patches/security/icedtea-6664512.patch,
		* patches/security/icedtea-6822057.patch,
		* patches/security/icedtea-6824265.patch,
		* patches/security/icedtea-6861062.patch,
		* patches/security/icedtea-6872358.patch: New security
	patches.


diffstat:

13 files changed, 4731 insertions(+), 3 deletions(-)
ChangeLog                              |   18 
Makefile.am                            |   16 
NEWS                                   |   18 
patches/security/icedtea-6631533.patch |  184 +++
patches/security/icedtea-6632445.patch |  103 ++
patches/security/icedtea-6636650.patch |  139 ++
patches/security/icedtea-6657026.patch | 1609 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6657138.patch |  745 ++++++++++++++
patches/security/icedtea-6664512.patch | 1227 ++++++++++++++++++++++++
patches/security/icedtea-6822057.patch |   32 
patches/security/icedtea-6824265.patch |  142 ++
patches/security/icedtea-6861062.patch |  344 ++++++
patches/security/icedtea-6872358.patch |  157 +++

diffs (truncated from 4799 to 500 lines):

diff -r 662422897e63 -r dc4494777bad ChangeLog
--- a/ChangeLog	Tue Nov 03 17:44:08 2009 +0100
+++ b/ChangeLog	Mon Nov 09 16:58:51 2009 +0000
@@ -1,4 +1,22 @@ 2009-11-03 Martin Matejovic <mmatejov at re
+2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add remaining security patches.
+	* NEWS: Updated with security patches.
+	* patches/security/icedtea-6631533.patch,
+	* patches/security/icedtea-6632445.patch,
+	* patches/security/icedtea-6636650.patch,
+	* patches/security/icedtea-6657026.patch,
+	* patches/security/icedtea-6657138.patch,
+	* patches/security/icedtea-6664512.patch,
+	* patches/security/icedtea-6822057.patch,
+	* patches/security/icedtea-6824265.patch,
+	* patches/security/icedtea-6861062.patch,
+	* patches/security/icedtea-6872358.patch:
+	New security patches.
+
 2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+	
 	* patches/security/icedtea-6862968.patch
 	* patches/security/icedtea-6863503.patch
 	* patches/security/icedtea-6864911.patch
diff -r 662422897e63 -r dc4494777bad Makefile.am
--- a/Makefile.am	Tue Nov 03 17:44:08 2009 +0100
+++ b/Makefile.am	Mon Nov 09 16:58:51 2009 +0000
@@ -613,9 +613,19 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6863503.patch \
 	patches/security/icedtea-6864911.patch \
 	patches/security/icedtea-6872357.patch \
-	patches/security/icedtea-6874643.patch 
-
-f WITH_ALT_HSBUILD
+	patches/security/icedtea-6874643.patch \
+	patches/security/icedtea-6631533.patch \
+	patches/security/icedtea-6632445.patch \
+	patches/security/icedtea-6636650.patch \
+	patches/security/icedtea-6657026.patch \
+	patches/security/icedtea-6657138.patch \
+	patches/security/icedtea-6664512.patch \
+	patches/security/icedtea-6822057.patch \
+	patches/security/icedtea-6824265.patch \
+	patches/security/icedtea-6861062.patch \
+	patches/security/icedtea-6872358.patch
+
+if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/icedtea-format-warnings.patch \
 	patches/icedtea-fortify-source.patch \
diff -r 662422897e63 -r dc4494777bad NEWS
--- a/NEWS	Tue Nov 03 17:44:08 2009 +0100
+++ b/NEWS	Mon Nov 09 16:58:51 2009 +0000
@@ -1,3 +1,21 @@ New in release 1.5.2 (2009-09-04)
+New in release 1.5.3 (2009-11-09)
+- Latest security updates:
+  - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+  - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+  - (CVE-2009-3881) resurrected classloaders can still have children (6636650) 
+  - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+  - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+  - (CVE-2009-3880) UI logging information leakage (6664512)
+  - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+  - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+  - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+  - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+  - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+  - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+  - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+  - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+  - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
+
 New in release 1.5.2 (2009-09-04)
 - Timezone fix: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=377
 - Stackoverflow error fix: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=381
diff -r 662422897e63 -r dc4494777bad patches/security/icedtea-6631533.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6631533.patch	Mon Nov 09 16:58:51 2009 +0000
@@ -0,0 +1,184 @@
+--- old/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.948600000 +0400
++++ openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.153000000 +0400
+@@ -944,15 +944,15 @@
+      * and it does not permit read access to the given file.
+      */
+     public static ICC_Profile getInstance(String fileName) throws IOException {
+-    ICC_Profile thisProfile;
+-    FileInputStream fis;
++        ICC_Profile thisProfile;
++        FileInputStream fis = null;
+ 
+-        SecurityManager security = System.getSecurityManager();
+-        if (security != null) {
+-            security.checkRead(fileName);
+-        }
+ 
+-        if ((fis = openProfile(fileName)) == null) {
++        File f = getProfileFile(fileName);
++        if (f != null) {
++            fis = new FileInputStream(f);
++        }
++        if (fis == null) {
+             throw new IOException("Cannot open file " + fileName);
+         }
+ 
+@@ -1064,13 +1064,24 @@
+ 
+ 
+     void activateDeferredProfile() {
+-    byte profileData[];
+-    FileInputStream fis;
+-    String fileName = deferralInfo.filename;
++        byte profileData[];
++        FileInputStream fis;
++        final String fileName = deferralInfo.filename;
+ 
+         profileActivator = null;
+         deferralInfo = null;
+-        if ((fis = openProfile(fileName)) == null) {
++        PrivilegedAction<FileInputStream> pa = new PrivilegedAction<FileInputStream>() {
++            public FileInputStream run() {
++                File f = getStandardProfileFile(fileName);
++                if (f != null) {
++                    try {
++                        return new FileInputStream(f);
++                    } catch (FileNotFoundException e) {}
++                }
++                return null;
++            }
++        };
++        if ((fis = AccessController.doPrivileged(pa)) == null) {
+             throw new IllegalArgumentException("Cannot open file " + fileName);
+         }
+         try {
+@@ -1765,66 +1776,88 @@
+      * available, such as a profile for sRGB.  Built-in profiles use .pf as
+      * the file name extension for profiles, e.g. sRGB.pf.
+      */
+-    private static FileInputStream openProfile(final String fileName) {
+-        return (FileInputStream)java.security.AccessController.doPrivileged(
+-            new java.security.PrivilegedAction() {
+-            public Object run() {
+-                return privilegedOpenProfile(fileName);
+-            }
+-        });
+-    }
+-
+-    /*
+-     * this version is called from doPrivileged in privilegedOpenProfile.
+-     * the whole method is privileged!
+-     */
+-    private static FileInputStream privilegedOpenProfile(String fileName) {
+-        FileInputStream fis = null;
++    private static File getProfileFile(String fileName) {
+         String path, dir, fullPath;
+ 
+         File f = new File(fileName); /* try absolute file name */
+-
++        if (f.isAbsolute()) {
++            /* Rest of code has little sense for an absolute pathname,
++               so return here. */
++            return f.isFile() ? f : null;
++        }
+         if ((!f.isFile()) &&
+                 ((path = System.getProperty("java.iccprofile.path")) != null)){
+                                     /* try relative to java.iccprofile.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
++                fullPath = dir + File.separatorChar + fileName;
++                f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
+                 }
+             }
++        }
+ 
+-        if ((!f.isFile()) &&
++        if (((f == null) || (!f.isFile())) &&
+                 ((path = System.getProperty("java.class.path")) != null)) {
+                                     /* try relative to java.class.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
+-                }
+-            }
+-
+-        if (!f.isFile()) { /* try the directory of built-in profiles */
+-                dir = System.getProperty("java.home") +
+-                    File.separatorChar + "lib" + File.separatorChar + "cmm";
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
+                 fullPath = dir + File.separatorChar + fileName;
+                 f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
++                }
+             }
++        }
++        if ((f == null) || (!f.isFile())) {
++            /* try the directory of built-in profiles */
++            f = getStandardProfileFile(fileName);
++        }
++        if (f != null && f.isFile()) {
++            return f;
++        }
++        return null;
++    }
+ 
+-        if (f.isFile()) {
+-            try {
+-                fis = new FileInputStream(f);
+-            } catch (FileNotFoundException e) {
++    /**
++     * Returns a file object corresponding to a built-in profile
++     * specified by fileName.
++     * If there is no built-in profile with such name, then the method
++     * returns null.
++     */
++    private static File getStandardProfileFile(String fileName) {
++        String dir = System.getProperty("java.home") +
++            File.separatorChar + "lib" + File.separatorChar + "cmm";
++        String fullPath = dir + File.separatorChar + fileName;
++        File f = new File(fullPath);
++        return (f.isFile() && isChildOf(f, dir)) ? f : null;
++    }
++
++    /**
++     * Checks whether given file resides inside give directory.
++     */
++    private static boolean isChildOf(File f, String dirName) {
++        try {
++            File dir = new File(dirName);
++            String canonicalDirName = dir.getCanonicalPath();
++            if (!canonicalDirName.endsWith(File.separator)) {
++                canonicalDirName += File.separator;
+             }
++            String canonicalFileName = f.getCanonicalPath();
++            return canonicalFileName.startsWith(canonicalDirName);
++        } catch (IOException e) {
++            /* we do not expect the IOException here, because invocation
++             * of this function is always preceeded by isFile() call.
++             */
++            return false;
+         }
+-        return fis;
+     }
+ 
+-
+     /*
+      * Serialization support.
+      *
diff -r 662422897e63 -r dc4494777bad patches/security/icedtea-6632445.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6632445.patch	Mon Nov 09 16:58:51 2009 +0000
@@ -0,0 +1,103 @@
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:52.144000000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:51.488000000 +0400
+@@ -62,6 +62,8 @@
+ 
+ import java.io.*;
+ import java.nio.*;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.StringTokenizer;
+@@ -502,12 +504,18 @@
+             iis.reset();
+ 
+             try {
+-                if (metadata.colorSpace == PROFILE_LINKED)
++                if (metadata.colorSpace == PROFILE_LINKED &&
++                    isLinkedProfileAllowed() &&
++                    !isUncOrDevicePath(profile))
++                {
++                    String path = new String(profile, "windows-1252");
++
+                     colorSpace =
+-                        new ICC_ColorSpace(ICC_Profile.getInstance(new String(profile)));
+-                else
++                        new ICC_ColorSpace(ICC_Profile.getInstance(path));
++                } else {
+                     colorSpace =
+                         new ICC_ColorSpace(ICC_Profile.getInstance(profile));
++                }
+             } catch (Exception e) {
+                 colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+             }
+@@ -1745,4 +1753,69 @@
+         public void sequenceStarted(ImageReader src, int minIndex) {}
+         public void readAborted(ImageReader src) {}
+     }
++
++    private static Boolean isLinkedProfileDisabled = null;
++
++    private static boolean isLinkedProfileAllowed() {
++        if (isLinkedProfileDisabled == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    return Boolean.getBoolean("sun.imageio.plugins.bmp.disableLinkedProfiles");
++                }
++            };
++            isLinkedProfileDisabled = AccessController.doPrivileged(a);
++        }
++        return !isLinkedProfileDisabled;
++    }
++
++    private static Boolean isWindowsPlatform = null;
++
++    /**
++     * Verifies whether the byte array contans a unc path.
++     * Non-UNC path examples:
++     *  c:\path\to\file  - simple notation
++     *  \\?\c:\path\to\file - long notation
++     *
++     * UNC path examples:
++     *  \\server\share - a UNC path in simple notation
++     *  \\?\UNC\server\share - a UNC path in long notation
++     *  \\.\some\device - a path to device.
++     */
++    private static boolean isUncOrDevicePath(byte[] p) {
++        if (isWindowsPlatform == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    String osname = System.getProperty("os.name");
++                    return (osname != null &&
++                            osname.toLowerCase().startsWith("win"));
++                }
++            };
++            isWindowsPlatform = AccessController.doPrivileged(a);
++        }
++
++        if (!isWindowsPlatform) {
++            /* no need for the check on platforms except windows */
++            return false;
++        }
++
++        /* normalize prefix of the path */
++        if (p[0] == '/') p[0] = '\\';
++        if (p[1] == '/') p[1] = '\\';
++        if (p[3] == '/') p[3] = '\\';
++
++
++        if ((p[0] == '\\') && (p[1] == '\\')) {
++            if ((p[2] == '?') && (p[3] == '\\')) {
++                // long path: whether unc or local
++                return ((p[4] == 'U' || p[4] == 'u') &&
++                        (p[5] == 'N' || p[5] == 'n') &&
++                        (p[6] == 'C' || p[6] == 'c'));
++            } else {
++                // device path or short unc notation
++                return true;
++            }
++        } else {
++            return false;
++        }
++    }
+ }
diff -r 662422897e63 -r dc4494777bad patches/security/icedtea-6636650.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6636650.patch	Mon Nov 09 16:58:51 2009 +0000
@@ -0,0 +1,139 @@
+--- old/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:47 2009
++++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:46 2009
+@@ -147,11 +147,6 @@
+         registerNatives();
+     }
+ 
+-    // If initialization succeed this is set to true and security checks will
+-    // succeed.  Otherwise the object is not initialized and the object is
+-    // useless.
+-    private boolean initialized = false;
+-
+     // The parent class loader for delegation
+     private ClassLoader parent;
+ 
+@@ -177,6 +172,18 @@
+     // to its corresponding Package object.
+     private HashMap packages = new HashMap();
+ 
++    private static Void checkCreateClassLoader() {
++        SecurityManager security = System.getSecurityManager();
++        if (security != null) {
++            security.checkCreateClassLoader();
++        }
++        return null;
++    }
++
++    private ClassLoader(Void unused, ClassLoader parent) {
++        this.parent = parent;
++    }
++
+     /**
+      * Creates a new class loader using the specified parent class loader for
+      * delegation.
+@@ -197,12 +204,7 @@
+      * @since  1.2
+      */
+     protected ClassLoader(ClassLoader parent) {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = parent;
+-	initialized = true;
++        this(checkCreateClassLoader(), parent);
+     }
+ 
+     /**
+@@ -221,15 +223,9 @@
+      *          of a new class loader.
+      */
+     protected ClassLoader() {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = getSystemClassLoader();
+-	initialized = true;
++        this(checkCreateClassLoader(), getSystemClassLoader());
+     }
+ 
+-
+     // -- Class --
+ 
+     /**
+@@ -611,7 +607,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+ 	protectionDomain = preDefineClass(name, protectionDomain);
+ 
+ 	Class c = null;
+@@ -693,8 +688,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+-
+ 	int len = b.remaining();
+ 
+ 	// Use byte[] if not a direct ByteBufer:
+@@ -842,7 +835,6 @@
+      * @see  #defineClass(String, byte[], int, int)
+      */
+     protected final void resolveClass(Class<?> c) {
+-	check();
+ 	resolveClass0(c);
+     }
+ 
+@@ -873,7 +865,6 @@
+     protected final Class<?> findSystemClass(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	ClassLoader system = getSystemClassLoader();
+ 	if (system == null) {
+ 	    if (!checkName(name))
+@@ -886,7 +877,6 @@
+     private Class findBootstrapClass0(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	if (!checkName(name))
+ 	    throw new ClassNotFoundException(name);
+ 	return findBootstrapClass(name);
+@@ -895,13 +885,6 @@
+     private native Class findBootstrapClass(String name)
+ 	throws ClassNotFoundException;
+ 
+-    // Check to make sure the class loader has been initialized.
+-    private void check() {
+-	if (!initialized) {
+-	    throw new SecurityException("ClassLoader object not initialized");
+-	}
+-    }
+-
+     /**
+      * Returns the class with the given <a href="#name">binary name</a> if this
+      * loader has been recorded by the Java virtual machine as an initiating
+@@ -917,7 +900,6 @@
+      * @since  1.1
+      */
+     protected final Class<?> findLoadedClass(String name) {
+-	check();


From andrew at icedtea.classpath.org  Mon Nov  9 09:38:06 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 17:38:06 +0000
Subject: /hg/release/icedtea6-1.6: Add remaining security patches.
Message-ID: <hg.15ba41d0ff2e.1257788286.1785565629229908552@icedtea.classpath.org>

changeset 15ba41d0ff2e in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=15ba41d0ff2e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 17:42:27 2009 +0000

	Add remaining security patches.

	2009-11-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add remaining security patches.
		* NEWS: Updated with security patches.
		* patches/security/icedtea-6631533.patch,
		* patches/security/icedtea-6632445.patch,
		* patches/security/icedtea-6636650.patch,
		* patches/security/icedtea-6657026.patch,
		* patches/security/icedtea-6657138.patch,
		* patches/security/icedtea-6664512.patch,
		* patches/security/icedtea-6822057.patch,
		* patches/security/icedtea-6824265.patch,
		* patches/security/icedtea-6861062.patch,
		* patches/security/icedtea-6872358.patch: New security
	patches.


diffstat:

13 files changed, 4729 insertions(+)
ChangeLog                              |   18 
Makefile.am                            |   11 
NEWS                                   |   18 
patches/security/icedtea-6631533.patch |  184 +++
patches/security/icedtea-6632445.patch |  103 ++
patches/security/icedtea-6636650.patch |  139 ++
patches/security/icedtea-6657026.patch | 1609 ++++++++++++++++++++++++++++++++
patches/security/icedtea-6657138.patch |  745 ++++++++++++++
patches/security/icedtea-6664512.patch | 1227 ++++++++++++++++++++++++
patches/security/icedtea-6822057.patch |   32 
patches/security/icedtea-6824265.patch |  142 ++
patches/security/icedtea-6861062.patch |  344 ++++++
patches/security/icedtea-6872358.patch |  157 +++

diffs (truncated from 4794 to 500 lines):

diff -r 2c854193cc9d -r 15ba41d0ff2e ChangeLog
--- a/ChangeLog	Tue Nov 03 17:50:20 2009 +0100
+++ b/ChangeLog	Mon Nov 09 17:42:27 2009 +0000
@@ -1,4 +1,22 @@ 2009-11-03 Martin Matejovic <mmatejov at re
+2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add remaining security patches.
+	* NEWS: Updated with security patches.
+	* patches/security/icedtea-6631533.patch,
+	* patches/security/icedtea-6632445.patch,
+	* patches/security/icedtea-6636650.patch,
+	* patches/security/icedtea-6657026.patch,
+	* patches/security/icedtea-6657138.patch,
+	* patches/security/icedtea-6664512.patch,
+	* patches/security/icedtea-6822057.patch,
+	* patches/security/icedtea-6824265.patch,
+	* patches/security/icedtea-6861062.patch,
+	* patches/security/icedtea-6872358.patch:
+	New security patches.
+
 2009-11-03 Martin Matejovic <mmatejov at redhat.com>
+	
 	* patches/security/icedtea-6862968.patch
 	* patches/security/icedtea-6863503.patch
 	* patches/security/icedtea-6864911.patch
diff -r 2c854193cc9d -r 15ba41d0ff2e Makefile.am
--- a/Makefile.am	Tue Nov 03 17:50:20 2009 +0100
+++ b/Makefile.am	Mon Nov 09 17:42:27 2009 +0000
@@ -631,6 +631,17 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6864911.patch \
 	patches/security/icedtea-6872357.patch \
 	patches/security/icedtea-6874643.patch \
+	patches/security/icedtea-6874643.patch \
+	patches/security/icedtea-6631533.patch \
+	patches/security/icedtea-6632445.patch \
+	patches/security/icedtea-6636650.patch \
+	patches/security/icedtea-6657026.patch \
+	patches/security/icedtea-6657138.patch \
+	patches/security/icedtea-6664512.patch \
+	patches/security/icedtea-6822057.patch \
+	patches/security/icedtea-6824265.patch \
+	patches/security/icedtea-6861062.patch \
+	patches/security/icedtea-6872358.patch \
 	patches/icedtea-jar-misc.patch
 
 if WITH_ALT_HSBUILD
diff -r 2c854193cc9d -r 15ba41d0ff2e NEWS
--- a/NEWS	Tue Nov 03 17:50:20 2009 +0100
+++ b/NEWS	Mon Nov 09 17:42:27 2009 +0000
@@ -1,3 +1,21 @@ New in release 1.6.1:
+New in release 1.6.2 (2009-11-09)
+- Latest security updates:
+  - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+  - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+  - (CVE-2009-3881) resurrected classloaders can still have children (6636650) 
+  - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+  - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+  - (CVE-2009-3880) UI logging information leakage (6664512)
+  - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+  - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+  - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+  - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+  - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+  - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+  - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+  - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+  - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
+
 New in release 1.6.1:
 - Fix tarball error in 1.6
 - Improve jar performance,
diff -r 2c854193cc9d -r 15ba41d0ff2e patches/security/icedtea-6631533.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6631533.patch	Mon Nov 09 17:42:27 2009 +0000
@@ -0,0 +1,184 @@
+--- old/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.948600000 +0400
++++ openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java	2009-07-29 13:31:14.153000000 +0400
+@@ -944,15 +944,15 @@
+      * and it does not permit read access to the given file.
+      */
+     public static ICC_Profile getInstance(String fileName) throws IOException {
+-    ICC_Profile thisProfile;
+-    FileInputStream fis;
++        ICC_Profile thisProfile;
++        FileInputStream fis = null;
+ 
+-        SecurityManager security = System.getSecurityManager();
+-        if (security != null) {
+-            security.checkRead(fileName);
+-        }
+ 
+-        if ((fis = openProfile(fileName)) == null) {
++        File f = getProfileFile(fileName);
++        if (f != null) {
++            fis = new FileInputStream(f);
++        }
++        if (fis == null) {
+             throw new IOException("Cannot open file " + fileName);
+         }
+ 
+@@ -1064,13 +1064,24 @@
+ 
+ 
+     void activateDeferredProfile() {
+-    byte profileData[];
+-    FileInputStream fis;
+-    String fileName = deferralInfo.filename;
++        byte profileData[];
++        FileInputStream fis;
++        final String fileName = deferralInfo.filename;
+ 
+         profileActivator = null;
+         deferralInfo = null;
+-        if ((fis = openProfile(fileName)) == null) {
++        PrivilegedAction<FileInputStream> pa = new PrivilegedAction<FileInputStream>() {
++            public FileInputStream run() {
++                File f = getStandardProfileFile(fileName);
++                if (f != null) {
++                    try {
++                        return new FileInputStream(f);
++                    } catch (FileNotFoundException e) {}
++                }
++                return null;
++            }
++        };
++        if ((fis = AccessController.doPrivileged(pa)) == null) {
+             throw new IllegalArgumentException("Cannot open file " + fileName);
+         }
+         try {
+@@ -1765,66 +1776,88 @@
+      * available, such as a profile for sRGB.  Built-in profiles use .pf as
+      * the file name extension for profiles, e.g. sRGB.pf.
+      */
+-    private static FileInputStream openProfile(final String fileName) {
+-        return (FileInputStream)java.security.AccessController.doPrivileged(
+-            new java.security.PrivilegedAction() {
+-            public Object run() {
+-                return privilegedOpenProfile(fileName);
+-            }
+-        });
+-    }
+-
+-    /*
+-     * this version is called from doPrivileged in privilegedOpenProfile.
+-     * the whole method is privileged!
+-     */
+-    private static FileInputStream privilegedOpenProfile(String fileName) {
+-        FileInputStream fis = null;
++    private static File getProfileFile(String fileName) {
+         String path, dir, fullPath;
+ 
+         File f = new File(fileName); /* try absolute file name */
+-
++        if (f.isAbsolute()) {
++            /* Rest of code has little sense for an absolute pathname,
++               so return here. */
++            return f.isFile() ? f : null;
++        }
+         if ((!f.isFile()) &&
+                 ((path = System.getProperty("java.iccprofile.path")) != null)){
+                                     /* try relative to java.iccprofile.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
++                fullPath = dir + File.separatorChar + fileName;
++                f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
+                 }
+             }
++        }
+ 
+-        if ((!f.isFile()) &&
++        if (((f == null) || (!f.isFile())) &&
+                 ((path = System.getProperty("java.class.path")) != null)) {
+                                     /* try relative to java.class.path */
+-                StringTokenizer st =
+-                    new StringTokenizer(path, File.pathSeparator);
+-                while (st.hasMoreTokens() && (!f.isFile())) {
+-                    dir = st.nextToken();
+-                        fullPath = dir + File.separatorChar + fileName;
+-                    f = new File(fullPath);
+-                }
+-            }
+-
+-        if (!f.isFile()) { /* try the directory of built-in profiles */
+-                dir = System.getProperty("java.home") +
+-                    File.separatorChar + "lib" + File.separatorChar + "cmm";
++            StringTokenizer st =
++                new StringTokenizer(path, File.pathSeparator);
++            while (st.hasMoreTokens() && ((f == null) || (!f.isFile()))) {
++                dir = st.nextToken();
+                 fullPath = dir + File.separatorChar + fileName;
+                 f = new File(fullPath);
++                if (!isChildOf(f, dir)) {
++                    f = null;
++                }
+             }
++        }
++        if ((f == null) || (!f.isFile())) {
++            /* try the directory of built-in profiles */
++            f = getStandardProfileFile(fileName);
++        }
++        if (f != null && f.isFile()) {
++            return f;
++        }
++        return null;
++    }
+ 
+-        if (f.isFile()) {
+-            try {
+-                fis = new FileInputStream(f);
+-            } catch (FileNotFoundException e) {
++    /**
++     * Returns a file object corresponding to a built-in profile
++     * specified by fileName.
++     * If there is no built-in profile with such name, then the method
++     * returns null.
++     */
++    private static File getStandardProfileFile(String fileName) {
++        String dir = System.getProperty("java.home") +
++            File.separatorChar + "lib" + File.separatorChar + "cmm";
++        String fullPath = dir + File.separatorChar + fileName;
++        File f = new File(fullPath);
++        return (f.isFile() && isChildOf(f, dir)) ? f : null;
++    }
++
++    /**
++     * Checks whether given file resides inside give directory.
++     */
++    private static boolean isChildOf(File f, String dirName) {
++        try {
++            File dir = new File(dirName);
++            String canonicalDirName = dir.getCanonicalPath();
++            if (!canonicalDirName.endsWith(File.separator)) {
++                canonicalDirName += File.separator;
+             }
++            String canonicalFileName = f.getCanonicalPath();
++            return canonicalFileName.startsWith(canonicalDirName);
++        } catch (IOException e) {
++            /* we do not expect the IOException here, because invocation
++             * of this function is always preceeded by isFile() call.
++             */
++            return false;
+         }
+-        return fis;
+     }
+ 
+-
+     /*
+      * Serialization support.
+      *
diff -r 2c854193cc9d -r 15ba41d0ff2e patches/security/icedtea-6632445.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6632445.patch	Mon Nov 09 17:42:27 2009 +0000
@@ -0,0 +1,103 @@
+--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:52.144000000 +0400
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	2009-07-28 17:06:51.488000000 +0400
+@@ -62,6 +62,8 @@
+ 
+ import java.io.*;
+ import java.nio.*;
++import java.security.AccessController;
++import java.security.PrivilegedAction;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.StringTokenizer;
+@@ -502,12 +504,18 @@
+             iis.reset();
+ 
+             try {
+-                if (metadata.colorSpace == PROFILE_LINKED)
++                if (metadata.colorSpace == PROFILE_LINKED &&
++                    isLinkedProfileAllowed() &&
++                    !isUncOrDevicePath(profile))
++                {
++                    String path = new String(profile, "windows-1252");
++
+                     colorSpace =
+-                        new ICC_ColorSpace(ICC_Profile.getInstance(new String(profile)));
+-                else
++                        new ICC_ColorSpace(ICC_Profile.getInstance(path));
++                } else {
+                     colorSpace =
+                         new ICC_ColorSpace(ICC_Profile.getInstance(profile));
++                }
+             } catch (Exception e) {
+                 colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+             }
+@@ -1745,4 +1753,69 @@
+         public void sequenceStarted(ImageReader src, int minIndex) {}
+         public void readAborted(ImageReader src) {}
+     }
++
++    private static Boolean isLinkedProfileDisabled = null;
++
++    private static boolean isLinkedProfileAllowed() {
++        if (isLinkedProfileDisabled == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    return Boolean.getBoolean("sun.imageio.plugins.bmp.disableLinkedProfiles");
++                }
++            };
++            isLinkedProfileDisabled = AccessController.doPrivileged(a);
++        }
++        return !isLinkedProfileDisabled;
++    }
++
++    private static Boolean isWindowsPlatform = null;
++
++    /**
++     * Verifies whether the byte array contans a unc path.
++     * Non-UNC path examples:
++     *  c:\path\to\file  - simple notation
++     *  \\?\c:\path\to\file - long notation
++     *
++     * UNC path examples:
++     *  \\server\share - a UNC path in simple notation
++     *  \\?\UNC\server\share - a UNC path in long notation
++     *  \\.\some\device - a path to device.
++     */
++    private static boolean isUncOrDevicePath(byte[] p) {
++        if (isWindowsPlatform == null) {
++            PrivilegedAction<Boolean> a = new PrivilegedAction<Boolean>() {
++                public Boolean run() {
++                    String osname = System.getProperty("os.name");
++                    return (osname != null &&
++                            osname.toLowerCase().startsWith("win"));
++                }
++            };
++            isWindowsPlatform = AccessController.doPrivileged(a);
++        }
++
++        if (!isWindowsPlatform) {
++            /* no need for the check on platforms except windows */
++            return false;
++        }
++
++        /* normalize prefix of the path */
++        if (p[0] == '/') p[0] = '\\';
++        if (p[1] == '/') p[1] = '\\';
++        if (p[3] == '/') p[3] = '\\';
++
++
++        if ((p[0] == '\\') && (p[1] == '\\')) {
++            if ((p[2] == '?') && (p[3] == '\\')) {
++                // long path: whether unc or local
++                return ((p[4] == 'U' || p[4] == 'u') &&
++                        (p[5] == 'N' || p[5] == 'n') &&
++                        (p[6] == 'C' || p[6] == 'c'));
++            } else {
++                // device path or short unc notation
++                return true;
++            }
++        } else {
++            return false;
++        }
++    }
+ }
diff -r 2c854193cc9d -r 15ba41d0ff2e patches/security/icedtea-6636650.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/security/icedtea-6636650.patch	Mon Nov 09 17:42:27 2009 +0000
@@ -0,0 +1,139 @@
+--- old/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:47 2009
++++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java	Fri Jul 31 15:59:46 2009
+@@ -147,11 +147,6 @@
+         registerNatives();
+     }
+ 
+-    // If initialization succeed this is set to true and security checks will
+-    // succeed.  Otherwise the object is not initialized and the object is
+-    // useless.
+-    private boolean initialized = false;
+-
+     // The parent class loader for delegation
+     private ClassLoader parent;
+ 
+@@ -177,6 +172,18 @@
+     // to its corresponding Package object.
+     private HashMap packages = new HashMap();
+ 
++    private static Void checkCreateClassLoader() {
++        SecurityManager security = System.getSecurityManager();
++        if (security != null) {
++            security.checkCreateClassLoader();
++        }
++        return null;
++    }
++
++    private ClassLoader(Void unused, ClassLoader parent) {
++        this.parent = parent;
++    }
++
+     /**
+      * Creates a new class loader using the specified parent class loader for
+      * delegation.
+@@ -197,12 +204,7 @@
+      * @since  1.2
+      */
+     protected ClassLoader(ClassLoader parent) {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = parent;
+-	initialized = true;
++        this(checkCreateClassLoader(), parent);
+     }
+ 
+     /**
+@@ -221,15 +223,9 @@
+      *          of a new class loader.
+      */
+     protected ClassLoader() {
+-	SecurityManager security = System.getSecurityManager();
+-	if (security != null) {
+-	    security.checkCreateClassLoader();
+-	}
+-	this.parent = getSystemClassLoader();
+-	initialized = true;
++        this(checkCreateClassLoader(), getSystemClassLoader());
+     }
+ 
+-
+     // -- Class --
+ 
+     /**
+@@ -611,7 +607,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+ 	protectionDomain = preDefineClass(name, protectionDomain);
+ 
+ 	Class c = null;
+@@ -693,8 +688,6 @@
+ 					 ProtectionDomain protectionDomain)
+ 	throws ClassFormatError
+     {
+-	check();
+-
+ 	int len = b.remaining();
+ 
+ 	// Use byte[] if not a direct ByteBufer:
+@@ -842,7 +835,6 @@
+      * @see  #defineClass(String, byte[], int, int)
+      */
+     protected final void resolveClass(Class<?> c) {
+-	check();
+ 	resolveClass0(c);
+     }
+ 
+@@ -873,7 +865,6 @@
+     protected final Class<?> findSystemClass(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	ClassLoader system = getSystemClassLoader();
+ 	if (system == null) {
+ 	    if (!checkName(name))
+@@ -886,7 +877,6 @@
+     private Class findBootstrapClass0(String name)
+ 	throws ClassNotFoundException
+     {
+-	check();
+ 	if (!checkName(name))
+ 	    throw new ClassNotFoundException(name);
+ 	return findBootstrapClass(name);
+@@ -895,13 +885,6 @@
+     private native Class findBootstrapClass(String name)
+ 	throws ClassNotFoundException;
+ 
+-    // Check to make sure the class loader has been initialized.
+-    private void check() {
+-	if (!initialized) {
+-	    throw new SecurityException("ClassLoader object not initialized");
+-	}
+-    }
+-
+     /**
+      * Returns the class with the given <a href="#name">binary name</a> if this
+      * loader has been recorded by the Java virtual machine as an initiating
+@@ -917,7 +900,6 @@
+      * @since  1.1
+      */
+     protected final Class<?> findLoadedClass(String name) {
+-	check();
+ 	if (!checkName(name))
+ 	    return null;
+ 	return findLoadedClass0(name);
+@@ -938,11 +920,9 @@
+      * @since  1.1


From andrew at icedtea.classpath.org  Mon Nov  9 14:55:19 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 22:55:19 +0000
Subject: /hg/release/icedtea6-1.6: 2 new changesets
Message-ID: <hg.a2d5ec5e9724.1257807318.1785565629229908552@icedtea.classpath.org>

changeset a2d5ec5e9724 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=a2d5ec5e9724
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 22:58:39 2009 +0000

	Bump to 1.6.2, fix make dist.

	2009-11-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Drop duplicate patch line.
	Make EXTRA_DIST work out of tree.
		* configure.ac: Bump to 1.6.2


changeset aa390e8856a1 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=aa390e8856a1
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 22:59:12 2009 +0000

	Added tag icedtea6-1.6.2 for changeset a2d5ec5e9724


diffstat:

4 files changed, 11 insertions(+), 3 deletions(-)
.hgtags      |    1 +
ChangeLog    |    8 ++++++++
Makefile.am  |    3 +--
configure.ac |    2 +-

diffs (52 lines):

diff -r 15ba41d0ff2e -r aa390e8856a1 .hgtags
--- a/.hgtags	Mon Nov 09 17:42:27 2009 +0000
+++ b/.hgtags	Mon Nov 09 22:59:12 2009 +0000
@@ -28,3 +28,4 @@ d36f851f90be2ca85975c6824242874215f57d41
 d36f851f90be2ca85975c6824242874215f57d41 icedtea-1.6.1-release
 d36f851f90be2ca85975c6824242874215f57d41 icedtea-1.6.1-release
 b343e04bf38fa44f52d5327d80af60b7c0705cad icedtea-1.6.1-release
+a2d5ec5e9724007d1084981a69d23fbc2adb7179 icedtea6-1.6.2
diff -r 15ba41d0ff2e -r aa390e8856a1 ChangeLog
--- a/ChangeLog	Mon Nov 09 17:42:27 2009 +0000
+++ b/ChangeLog	Mon Nov 09 22:59:12 2009 +0000
@@ -1,3 +1,11 @@ 2009-11-09  Andrew John Hughes  <ahughes
+2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Drop duplicate patch line.
+	Make EXTRA_DIST work out of tree.
+	* configure.ac:
+	Bump to 1.6.2
+	
 2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 15ba41d0ff2e -r aa390e8856a1 Makefile.am
--- a/Makefile.am	Mon Nov 09 17:42:27 2009 +0000
+++ b/Makefile.am	Mon Nov 09 22:59:12 2009 +0000
@@ -101,7 +101,7 @@ install:
 	clean-jtreg-reports 
 
 EXTRA_DIST = rt generated \
-	patches/* \
+	$(abs_top_srcdir)/patches/* \
 	tools-copy contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
@@ -631,7 +631,6 @@ ICEDTEA_PATCHES = \
 	patches/security/icedtea-6864911.patch \
 	patches/security/icedtea-6872357.patch \
 	patches/security/icedtea-6874643.patch \
-	patches/security/icedtea-6874643.patch \
 	patches/security/icedtea-6631533.patch \
 	patches/security/icedtea-6632445.patch \
 	patches/security/icedtea-6636650.patch \
diff -r 15ba41d0ff2e -r aa390e8856a1 configure.ac
--- a/configure.ac	Mon Nov 09 17:42:27 2009 +0000
+++ b/configure.ac	Mon Nov 09 22:59:12 2009 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.6.1], [distro-pkg
-AC_INIT([icedtea6], [1.6.1], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.6.2], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 


From gnu_andrew at member.fsf.org  Mon Nov  9 15:12:05 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 9 Nov 2009 23:12:05 +0000
Subject: IcedTea6 1.5.3 & 1.6.2 Released!
Message-ID: <17c6771e0911091512v17ae19b9ge1d8c160114da4ab@mail.gmail.com>

We are pleased to announce two new security releases, IcedTea6 1.5.3 and 1.6.2.

The IcedTea project provides a harness to build the source code from
OpenJDK6 using Free Software build tools. It also includes the only
Free Java plugin and Web Start implementation, and support for
additional architectures over and above x86, x86_64 and SPARC via the
Zero assembler port.

What?s New?
??????
- Security fixes for:
??????
(CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
(CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
(CVE-2009-3881) resurrected classloaders can still have children (6636650)
(CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
(CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
(CVE-2009-3880) UI logging information leakage (6664512)
(CVE-2009-3879) GraphicsConfiguration information leak (6822057)
(CVE-2009-3884) zoneinfo file existence information leak (6824265)
(CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
(CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
(CVE-2009-3875) MessageDigest.isEqual introduces timing attack
vulnerabilities (6863503)
(CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser
denial of service (6864911)
(CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
(CVE-2009-3874) ImageI/O JPEG heap overflow (6874643)
(CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)

The tarballs and 1.6 nosrc RPM can be downloaded from:

* http://icedtea.classpath.org/download/source/icedtea6-1.5.3.tar.gz
* http://icedtea.classpath.org/download/source/icedtea6-1.6.2.tar.gz
* http://icedtea.classpath.org/download/fedora/java-1.6.0-openjdk-1.6.0.0-30.b16.fc11.nosrc.rpm

The following people helped with the 1.5 and 1.6 release series:

Lillian Angel, Gary Benson, Deepak Bhole, Andrew Haley, Andrew John
Hughes, Matthias Klose, Martin Matejovic, Ed Nevill, Mark Wielaard and
many others.

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

To get started:
$ tar xzf icedtea6-1.6.2.tar.gz
$ cd icedtea6-1.6.2

Full build requirements and instructions are in INSTALL:
$ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java
--enable-systemtap ...]
$ make

Blog: http://blog.fuseyism.com/index.php/2009/11/09/icedtea6-153-162-released/
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From andrew at icedtea.classpath.org  Mon Nov  9 15:15:35 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 09 Nov 2009 23:15:35 +0000
Subject: /hg/release/icedtea6-1.5: 2 new changesets
Message-ID: <hg.4a00d1ae3833.1257808535.1785565629229908555@icedtea.classpath.org>

changeset 4a00d1ae3833 in /hg/release/icedtea6-1.5
details: http://icedtea.classpath.org/hg/release/icedtea6-1.5?cmd=changeset;node=4a00d1ae3833
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 23:19:09 2009 +0000

	Bump to 1.5.3, fix make dist.

	2009-11-09 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Make EXTRA_DIST work out of tree.
		* configure.ac: Bump to 1.5.3.


changeset 3f74ae338023 in /hg/release/icedtea6-1.5
details: http://icedtea.classpath.org/hg/release/icedtea6-1.5?cmd=changeset;node=3f74ae338023
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 09 23:19:15 2009 +0000

	Added tag icedtea6-1.5.3 for changeset 4a00d1ae3833


diffstat:

4 files changed, 10 insertions(+), 2 deletions(-)
.hgtags      |    1 +
ChangeLog    |    7 +++++++
Makefile.am  |    2 +-
configure.ac |    2 +-

diffs (43 lines):

diff -r dc4494777bad -r 3f74ae338023 .hgtags
--- a/.hgtags	Mon Nov 09 16:58:51 2009 +0000
+++ b/.hgtags	Mon Nov 09 23:19:15 2009 +0000
@@ -17,3 +17,4 @@ ffe92bbe7e8466b323f0aedbdac4b6ecf44eafe2
 ffe92bbe7e8466b323f0aedbdac4b6ecf44eafe2 icedtea6-1.5
 3b93da7c778a0a5147db1eec28218a8df462161d icedtea6-1.5.1
 5a75245ca41a1f9885fc2853af4c6147ef6445f4 icedtea6-1.5.2
+4a00d1ae383319dad3e380e9d2e6d2ef8d1fa801 icedtea6-1.5.3
diff -r dc4494777bad -r 3f74ae338023 ChangeLog
--- a/ChangeLog	Mon Nov 09 16:58:51 2009 +0000
+++ b/ChangeLog	Mon Nov 09 23:19:15 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-09  Andrew John Hughes  <ahughes
+2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make EXTRA_DIST work out of tree.
+	* configure.ac:
+	Bump to 1.5.3.
+
 2009-11-09  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r dc4494777bad -r 3f74ae338023 Makefile.am
--- a/Makefile.am	Mon Nov 09 16:58:51 2009 +0000
+++ b/Makefile.am	Mon Nov 09 23:19:15 2009 +0000
@@ -95,7 +95,7 @@ install:
 	clean-jtreg-reports 
 
 EXTRA_DIST = rt generated \
-	patches/* \
+	$(abs_top_srcdir)/patches/* \
 	tools-copy contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
diff -r dc4494777bad -r 3f74ae338023 configure.ac
--- a/configure.ac	Mon Nov 09 16:58:51 2009 +0000
+++ b/configure.ac	Mon Nov 09 23:19:15 2009 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.5.2], [distro-pkg
-AC_INIT([icedtea6], [1.5.2], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.5.3], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 


From ekrichardson at gmail.com  Mon Nov  9 22:06:39 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Mon, 9 Nov 2009 22:06:39 -0800
Subject: OpenJDK 6 Build 17
In-Reply-To: <20091110035915.GB42934@misty.eyesbeyond.com>
References: <8fab85310911020701p7f33b0adw9d523839c028e6ef@mail.gmail.com>
	<8fab85310911060325s7733541fh333b6cc606e566f@mail.gmail.com>
	<2B932062-10BE-4ED2-97EB-7DF13148F271@ganymede.org>
	<p06240812c71a838e733f@192.168.1.103>
	<20091109160241.GA35291@misty.eyesbeyond.com>
	<408C5B25-56BC-47B4-81E6-A184E6226DAD@ganymede.org>
	<4AF87DF5.9040508@sun.com> <4AF8CA2A.3000902@intricatesoftware.com>
	<17c6771e0911091812i7750cea7x36097f667a55989@mail.gmail.com>
	<20091110035915.GB42934@misty.eyesbeyond.com>
Message-ID: <860cb0120911092206m3b33eba2k85728022791b05bb@mail.gmail.com>

FWIW, I have been following the bsd-port and icedtea lists for awhile. I
just tried compiling Icedtea on the Mac PPC with icedtea6 and icedtea (7).

I know there is no direct bsd support for icedtea6 but using a modified
Apple jdk5 for a bootstrap I am able to completely finish all the patching
and creation of the jdk6/7 bootstraps and then the make fails as follows
which is pretty much expected. I think this is actually pretty good news as
there is no jdk6 for Darwin/PPC. An upstream bsd-port for jdk6 would work
out of the box for icedtea6 with the proper MacOSX setup.

jdk/make/common/shared/Defs.gmk:157: "WARNING: Value of ARCH cannot be
empty, will use ''"
jdk/make/common/shared/Defs.gmk:157: "WARNING: Value of ARCH_DATA_MODEL
cannot be empty, will use ''"
jdk/make/common/shared/Defs.gmk:157: "WARNING: Value of PLATFORM cannot be
empty, will use ''"
jdk/make/common/shared/Defs.gmk:330: jdk/make/common/shared/Defs-.gmk: No
such file or directory
jdk/make/common/shared/Compiler.gmk:46:
jdk/make/common/shared/Compiler-.gmk: No such file or directory
make[1]: *** No rule to make target `jdk/make/common/shared/Compiler-.gmk'.
Stop.

In icedtea (7) the build fails on the first patch. This is not completely
fair as there has been a lot of changes lately so there could be a few loose
ends and just the other day it made it through many patches before stopping.
As mentioned before fixing all the icedtea patches is a pretty big chore
especially for the uninitiated like myself.

Checking patches/icedtea-version.patch
The text leading up to this was:
--------------------------
|--- openjdk/jdk/src/share/classes/sun/misc/Version.java.template~1~
2008-11-25 01:04:53.000000000 -0800
|+++ openjdk/jdk/src/share/classes/sun/misc/Version.java.template
2009-02-20 09:03:25.000000000 -0800
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
ERROR patch patches/icedtea-version.patch FAILED!
WARNING make clean-patch before retrying a fix
make: *** [stamps/patch.stamp] Error 2

I really appreciate all the work done here to make the OpenJDK more
accessible, but wish I could be more help.

Thanks,
Eric


On Mon, Nov 9, 2009 at 7:59 PM, Greg Lewis <glewis at eyesbeyond.com> wrote:

> G'day Andrew,
>
> On Tue, Nov 10, 2009 at 02:12:17AM +0000, Andrew John Hughes wrote:
> > 2009/11/10 Kurt Miller <kurt at intricatesoftware.com>:
> > > It would be fantastic if Sun would host a mercurial repository
> > > for OpenJDK6 (i.e. bsd-port6 or the like). Is there a chance that
> > > Sun could set that up for us? The lack of a central repository is
> > > one of the reasons I haven't worked on OpenBSD support for OpenJDK.
> >
> > Rather than creating a new separate tree, how about we just try and
> > get the necessary changes into OpenJDK6 directly?
> > Then that would give a good base to move forward on getting support in 7
> too.
>
> For me, the latter is the key question.  How do we move forward with
> getting BSD support (ultimately) into the current development tree so
> we have less heavy lifting to do going forward?
>
> That's what I'd really like to come out of the discussion here.  I think
> we've been pretty good at keeping the bsd-port tree of OpenJDK7 up to date
> (its currently at b75 and I'll start moving it to b76 once that tag goes
> down) but we still don't seem to be any closer to getting the changes into
> the main source tree than we were when we started.  How do we move forward
> with that?  Is Sun's preferred method for us to go through OpenJDK6?  That
> certainly doesn't seem to have been the case for Zero, which is probably
> of a similar order of disruption, but I'm open to it for the BSD patches if
> there is a solid reason for doing it that way.
>
> Certainly its starting to get a little demotivating to me personally and
> I can't help but wonder if other team members don't feel the same.
>
> Andrew, this isn't aimed at you at all, btw, you're just kinda touching
> on a bit of a sore spot :).
>
> Dalibor, who needs to be involved in such a discussion and what can I do
> to help move it forward?
>
> --
> Greg Lewis                          Email   : glewis at eyesbeyond.com
> Eyes Beyond                         Web     : http://www.eyesbeyond.com
> Information Technology              FreeBSD : glewis at FreeBSD.org
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091109/3cbe3ddb/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Tue Nov 10 02:48:08 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 10 Nov 2009 10:48:08 +0000
Subject: [Bug 402] New: mkbc.c are missing in make dist tarball for icedtea6
	1.6.0 1.6.1 and 1.6.2.
Message-ID: <E1N7oGe-0005aI-U6@icedtea.classpath.org>

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

           Summary: mkbc.c are missing in make dist tarball for icedtea6
                    1.6.0 1.6.1 and 1.6.2.
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: xerxes at zafena.se


Testcase: run make dist and then unpack the release tarball and try build it on
ARM.

Expected result: mkbc.c are present in the unpacked sources and the release
tarball builds on ARM.

Actual result: mkbc.c are missing! ARM builds fail.


-- 
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 a.radke at arcor.de  Tue Nov 10 13:25:34 2009
From: a.radke at arcor.de (Andreas Radke)
Date: Tue, 10 Nov 2009 22:25:34 +0100
Subject: npplugin build fails with recent xulrunner
In-Reply-To: <alpine.LNX.2.00.0911051106290.3451@workstation64.home>
References: <alpine.LNX.2.00.0911051106290.3451@workstation64.home>
Message-ID: <20091110222534.6bef28b7@laptop64.home>

no comment? should I file a bug for this build issue?

-Andy


From mvfranz at gmail.com  Tue Nov 10 15:24:43 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Tue, 10 Nov 2009 18:24:43 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
Message-ID: <fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>

On Sun, Nov 8, 2009 at 6:55 PM, Michael Franz <mvfranz at gmail.com> wrote:

> So, I should be able to build on Fedora 11?  I am currently getting errors
> when NOT use bsd.
>
> g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DPPC -DZERO_LIBARCH=\"ppc\"
> -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/asm
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/c1
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/ci
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/classfile
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/code
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/compiler
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/g1
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/parNew
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/parallelScavenge
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_implementation/shared
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/gc_interface
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/interpreter
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/memory
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/prims
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/runtime
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/services
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/shark
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/utilities
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/cpu/zero/vm
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/os/linux/vm
> -I/home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/os_cpu/linux_zero/vm
> -I../generated -DHOTSPOT_RELEASE_VERSION="\"17.0-b04\""
> -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"mfranz\""
> -DHOTSPOT_LIB_ARCH=\"ppc\" -DJRE_RELEASE_VERSION="\"1.7.0_0-b75\""
> -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDISTRIBUTION_ID="\"Built on Fedora
> release 11 (Leonidas)\"" -DSHARK -I/usr/lib/libffi-3.0.5/include
> -I/usr/include  -DNDEBUG  -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
> -D__STDC_CONSTANT_MACROS  -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2
> -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32  -fPIC
> -DSHARK_LLVM_VERSION=25 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT
> -fcheck-new -m32 -pipe -g -O3 -fno-strict-aliasing -D_LP64=1 -Werror
> -Wpointer-arith -Wsign-compare    -c -x c++-header -c
> ../generated/incls/_precompiled.incl -o incls/_precompiled.incl.gch
> In file included from ../generated/incls/_precompiled.incl:52:
> /home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:234:1:
> error: multi-line comment
> /home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:237:1:
> error: multi-line comment
> /home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:240:1:
> error: multi-line comment
> /home/mfranz/icedtea/icedtea/openjdk-boot/hotspot/src/share/vm/oops/klassVtable.hpp:243:1:
> error: multi-line comment
>
> I was able to get past this by upgrading to llvm 2.6 (Fedora 11 as 2.5).  I
see post referencing llvm 2.7.  Is this going to be the required version
soon?

I am building on a G4 which is 32 bits, but _LP64=1 is being defined.  This
is causing problems as jlong is being defined incorrectly (long instead of
long long).  How do I unset _LP64?

Michael
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091110/44cf953e/attachment.html 

From andrew at icedtea.classpath.org  Tue Nov 10 21:09:46 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 05:09:46 +0000
Subject: /hg/icedtea: Use a proper target for building the Java plugin so...
Message-ID: <hg.a2c6e1cbc3cf.1257916186.-6899778133799504387@icedtea.classpath.org>

changeset a2c6e1cbc3cf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a2c6e1cbc3cf
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 11 05:14:10 2009 +0000

	Use a proper target for building the Java plugin source, rather than
	copying files.

	2009-11-10 Andrew John Hughes <ahughes at redhat.com>

	 * plugin/icedtea/netscape/javascript/JSException.java,
		* plugin/icedtea/netscape/javascript/JSObject.java,
		* plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java,
		* plugin/icedtea/netscape/javascript/JSProxy.java,
		* plugin/icedtea/netscape/javascript/JSRunnable.java,
		* plugin/icedtea/netscape/javascript/JSUtil.java,
		* plugin/icedtea/sun/applet/AppletSecurityContextManager.java,
		* plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java,
		* plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
		* plugin/icedtea/sun/applet/JavaConsole.java,
		* plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java,
		* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
		* plugin/icedtea/sun/applet/PluginAppletViewer.java,
		* plugin/icedtea/sun/applet/PluginCallRequest.java,
		* plugin/icedtea/sun/applet/PluginCallRequestFactory.java,
		* plugin/icedtea/sun/applet/PluginClassLoader.java,
		* plugin/icedtea/sun/applet/PluginCookieInfoRequest.java,
		* plugin/icedtea/sun/applet/PluginCookieManager.java,
		* plugin/icedtea/sun/applet/PluginDebug.java,
		* plugin/icedtea/sun/applet/PluginException.java,
		* plugin/icedtea/sun/applet/PluginMain.java,
		* plugin/icedtea/sun/applet/PluginMessageConsumer.java,
		* plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
		* plugin/icedtea/sun/applet/PluginObjectStore.java,
		* plugin/icedtea/sun/applet/PluginProxyInfoRequest.java,
		* plugin/icedtea/sun/applet/PluginProxySelector.java,
		* plugin/icedtea/sun/applet/PluginStreamHandler.java,
		* plugin/icedtea/sun/applet/RequestQueue.java,
		* plugin/icedtea/sun/applet/TestEnv.java,
		* plugin/icedtea/sun/applet/VoidPluginCallRequest.java: Moved
	to java subdirectory.
		* Makefile.am: Add javax/swing/plaf/basic to list of copy dirs
	to work around PR42003. Set LIVECONNECT_DIR to just
	the directories, not jar syntax. Rename NPPLUGIN_DIR to
	PLUGIN_DIR and add for both plugins. Add new sources patch.
	Set ALT_LIVECONNECT_DIST to new liveconnect build directory.
	(clean-local): No need to remove rt/netscape, now part of
	clean-liveconnect.stamp (patch.stamp): Drop plugin source
	file copying. (clean-patch): Remove plugin copy deletion.
	(icedtea.stamp): Depend on liveconnect-dist.stamp, not
	liveconnect.stamp. (icedtea-debug.stamp): Likewise.
	(icedtea-boot.stamp): Likewise. (liveconnect-source-
	files.txt): New target to find liveconnect source files.
	(liveconnect.stamp): Now builds the liveconnect source code.
	(liveconnect-dist.stamp): Like netx-dist.stamp, creates
	classes.jar and src.zip for importing Liveconnect binaries
	and source into the OpenJDK build.
		* NEWS: Add list of security updates.
		* patches/icedtea-liveconnect-dist.patch: Include sun/applet
	and import sources too.
		* plugin/icedtea/java/netscape/javascript/JSException.java,
		* plugin/icedtea/java/netscape/javascript/JSObject.java,
		* plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.jav
	a,
		* plugin/icedtea/java/netscape/javascript/JSProxy.java,
		* plugin/icedtea/java/netscape/javascript/JSRunnable.java,
		* plugin/icedtea/java/netscape/javascript/JSUtil.java,
		* plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java,
		* plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java,
		* plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java,
		* plugin/icedtea/java/sun/applet/JavaConsole.java,
		* plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java,
		* plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java,
		* plugin/icedtea/java/sun/applet/PluginAppletViewer.java,
		* plugin/icedtea/java/sun/applet/PluginCallRequest.java,
		* plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java,
		* plugin/icedtea/java/sun/applet/PluginClassLoader.java,
		* plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java,
		* plugin/icedtea/java/sun/applet/PluginCookieManager.java,
		* plugin/icedtea/java/sun/applet/PluginDebug.java,
		* plugin/icedtea/java/sun/applet/PluginException.java,
		* plugin/icedtea/java/sun/applet/PluginMain.java,
		* plugin/icedtea/java/sun/applet/PluginMessageConsumer.java,
		* plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java,
		* plugin/icedtea/java/sun/applet/PluginObjectStore.java,
		* plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java,
		* plugin/icedtea/java/sun/applet/PluginProxySelector.java,
		* plugin/icedtea/java/sun/applet/PluginStreamHandler.java,
		* plugin/icedtea/java/sun/applet/RequestQueue.java,
		* plugin/icedtea/java/sun/applet/TestEnv.java,
		* plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java:
	Moved from plugin/icedtea.


diffstat:

65 files changed, 7223 insertions(+), 7078 deletions(-)
ChangeLog                                                             |   90 
Makefile.am                                                           |   85 
NEWS                                                                  |   16 
patches/icedtea-liveconnect-dist.patch                                |   27 
patches/icedtea-sources.patch                                         |   17 
plugin/icedtea/java/netscape/javascript/JSException.java              |  140 
plugin/icedtea/java/netscape/javascript/JSObject.java                 |  290 +
plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java |   47 
plugin/icedtea/java/netscape/javascript/JSProxy.java                  |   58 
plugin/icedtea/java/netscape/javascript/JSRunnable.java               |   72 
plugin/icedtea/java/netscape/javascript/JSUtil.java                   |   59 
plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java      |   71 
plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java        |   76 
plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java        |   75 
plugin/icedtea/java/sun/applet/JavaConsole.java                       |  365 +
plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java      |  241 +
plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java       | 1311 ++++++
plugin/icedtea/java/sun/applet/PluginAppletViewer.java                | 1990 ++++++++++
plugin/icedtea/java/sun/applet/PluginCallRequest.java                 |   85 
plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java          |   62 
plugin/icedtea/java/sun/applet/PluginClassLoader.java                 |   51 
plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java           |   82 
plugin/icedtea/java/sun/applet/PluginCookieManager.java               |   88 
plugin/icedtea/java/sun/applet/PluginDebug.java                       |   51 
plugin/icedtea/java/sun/applet/PluginException.java                   |   53 
plugin/icedtea/java/sun/applet/PluginMain.java                        |  319 +
plugin/icedtea/java/sun/applet/PluginMessageConsumer.java             |  119 
plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java        |  121 
plugin/icedtea/java/sun/applet/PluginObjectStore.java                 |  132 
plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java            |   85 
plugin/icedtea/java/sun/applet/PluginProxySelector.java               |  195 
plugin/icedtea/java/sun/applet/PluginStreamHandler.java               |  479 ++
plugin/icedtea/java/sun/applet/RequestQueue.java                      |   77 
plugin/icedtea/java/sun/applet/TestEnv.java                           |  172 
plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java             |   67 
plugin/icedtea/netscape/javascript/JSException.java                   |  140 
plugin/icedtea/netscape/javascript/JSObject.java                      |  290 -
plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java      |   47 
plugin/icedtea/netscape/javascript/JSProxy.java                       |   58 
plugin/icedtea/netscape/javascript/JSRunnable.java                    |   72 
plugin/icedtea/netscape/javascript/JSUtil.java                        |   59 
plugin/icedtea/sun/applet/AppletSecurityContextManager.java           |   71 
plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java             |   76 
plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java             |   75 
plugin/icedtea/sun/applet/JavaConsole.java                            |  365 -
plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java           |  241 -
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java            | 1311 ------
plugin/icedtea/sun/applet/PluginAppletViewer.java                     | 1990 ----------
plugin/icedtea/sun/applet/PluginCallRequest.java                      |   85 
plugin/icedtea/sun/applet/PluginCallRequestFactory.java               |   62 
plugin/icedtea/sun/applet/PluginClassLoader.java                      |   51 
plugin/icedtea/sun/applet/PluginCookieInfoRequest.java                |   82 
plugin/icedtea/sun/applet/PluginCookieManager.java                    |   88 
plugin/icedtea/sun/applet/PluginDebug.java                            |   51 
plugin/icedtea/sun/applet/PluginException.java                        |   53 
plugin/icedtea/sun/applet/PluginMain.java                             |  319 -
plugin/icedtea/sun/applet/PluginMessageConsumer.java                  |  119 
plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java             |  121 
plugin/icedtea/sun/applet/PluginObjectStore.java                      |  132 
plugin/icedtea/sun/applet/PluginProxyInfoRequest.java                 |   85 
plugin/icedtea/sun/applet/PluginProxySelector.java                    |  195 
plugin/icedtea/sun/applet/PluginStreamHandler.java                    |  479 --
plugin/icedtea/sun/applet/RequestQueue.java                           |   77 
plugin/icedtea/sun/applet/TestEnv.java                                |  172 
plugin/icedtea/sun/applet/VoidPluginCallRequest.java                  |   67 

diffs (truncated from 14724 to 500 lines):

diff -r 9eb43c172d5b -r a2c6e1cbc3cf ChangeLog
--- a/ChangeLog	Wed Nov 04 22:07:39 2009 +0000
+++ b/ChangeLog	Wed Nov 11 05:14:10 2009 +0000
@@ -1,3 +1,93 @@ 2009-11-04  Andrew John Hughes  <ahughes
+2009-11-10  Andrew John Hughes  <ahughes at redhat.com>
+	
+	* plugin/icedtea/netscape/javascript/JSException.java,
+	* plugin/icedtea/netscape/javascript/JSObject.java,
+	* plugin/icedtea/netscape/javascript/JSObjectCreatePermission.java,
+	* plugin/icedtea/netscape/javascript/JSProxy.java,
+	* plugin/icedtea/netscape/javascript/JSRunnable.java,
+	* plugin/icedtea/netscape/javascript/JSUtil.java,
+	* plugin/icedtea/sun/applet/AppletSecurityContextManager.java,
+	* plugin/icedtea/sun/applet/GetMemberPluginCallRequest.java,
+	* plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java,
+	* plugin/icedtea/sun/applet/JavaConsole.java,
+	* plugin/icedtea/sun/applet/PasswordAuthenticationDialog.java,
+	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java,
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java,
+	* plugin/icedtea/sun/applet/PluginCallRequest.java,
+	* plugin/icedtea/sun/applet/PluginCallRequestFactory.java,
+	* plugin/icedtea/sun/applet/PluginClassLoader.java,
+	* plugin/icedtea/sun/applet/PluginCookieInfoRequest.java,
+	* plugin/icedtea/sun/applet/PluginCookieManager.java,
+	* plugin/icedtea/sun/applet/PluginDebug.java,
+	* plugin/icedtea/sun/applet/PluginException.java,
+	* plugin/icedtea/sun/applet/PluginMain.java,
+	* plugin/icedtea/sun/applet/PluginMessageConsumer.java,
+	* plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java,
+	* plugin/icedtea/sun/applet/PluginObjectStore.java,
+	* plugin/icedtea/sun/applet/PluginProxyInfoRequest.java,
+	* plugin/icedtea/sun/applet/PluginProxySelector.java,
+	* plugin/icedtea/sun/applet/PluginStreamHandler.java,
+	* plugin/icedtea/sun/applet/RequestQueue.java,
+	* plugin/icedtea/sun/applet/TestEnv.java,
+	* plugin/icedtea/sun/applet/VoidPluginCallRequest.java:
+	Moved to java subdirectory.
+	* Makefile.am:
+	Add javax/swing/plaf/basic to list of copy dirs to
+	work around PR42003.
+	Set LIVECONNECT_DIR to just the directories, not
+	jar syntax.  Rename NPPLUGIN_DIR to PLUGIN_DIR
+	and add for both plugins.  Add new sources patch.
+	Set ALT_LIVECONNECT_DIST to new liveconnect build
+	directory.
+	(clean-local): No need to remove rt/netscape, now
+	part of clean-liveconnect.stamp
+	(patch.stamp): Drop plugin source file copying.
+	(clean-patch): Remove plugin copy deletion.
+	(icedtea.stamp): Depend on liveconnect-dist.stamp,
+	not liveconnect.stamp.
+	(icedtea-debug.stamp): Likewise.
+	(icedtea-boot.stamp): Likewise.
+	(liveconnect-source-files.txt): New target to find
+	liveconnect source files.
+	(liveconnect.stamp): Now builds the liveconnect source code.
+	(liveconnect-dist.stamp): Like netx-dist.stamp, creates
+	classes.jar and src.zip for importing Liveconnect binaries
+	and source into the OpenJDK build.
+	* NEWS: Add list of security updates.
+	* patches/icedtea-liveconnect-dist.patch:
+	Include sun/applet and import sources too.
+	* plugin/icedtea/java/netscape/javascript/JSException.java,
+	* plugin/icedtea/java/netscape/javascript/JSObject.java,
+	* plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java,
+	* plugin/icedtea/java/netscape/javascript/JSProxy.java,
+	* plugin/icedtea/java/netscape/javascript/JSRunnable.java,
+	* plugin/icedtea/java/netscape/javascript/JSUtil.java,
+	* plugin/icedtea/java/sun/applet/AppletSecurityContextManager.java,
+	* plugin/icedtea/java/sun/applet/GetMemberPluginCallRequest.java,
+	* plugin/icedtea/java/sun/applet/GetWindowPluginCallRequest.java,
+	* plugin/icedtea/java/sun/applet/JavaConsole.java,
+	* plugin/icedtea/java/sun/applet/PasswordAuthenticationDialog.java,
+	* plugin/icedtea/java/sun/applet/PluginAppletSecurityContext.java,
+	* plugin/icedtea/java/sun/applet/PluginAppletViewer.java,
+	* plugin/icedtea/java/sun/applet/PluginCallRequest.java,
+	* plugin/icedtea/java/sun/applet/PluginCallRequestFactory.java,
+	* plugin/icedtea/java/sun/applet/PluginClassLoader.java,
+	* plugin/icedtea/java/sun/applet/PluginCookieInfoRequest.java,
+	* plugin/icedtea/java/sun/applet/PluginCookieManager.java,
+	* plugin/icedtea/java/sun/applet/PluginDebug.java,
+	* plugin/icedtea/java/sun/applet/PluginException.java,
+	* plugin/icedtea/java/sun/applet/PluginMain.java,
+	* plugin/icedtea/java/sun/applet/PluginMessageConsumer.java,
+	* plugin/icedtea/java/sun/applet/PluginMessageHandlerWorker.java,
+	* plugin/icedtea/java/sun/applet/PluginObjectStore.java,
+	* plugin/icedtea/java/sun/applet/PluginProxyInfoRequest.java,
+	* plugin/icedtea/java/sun/applet/PluginProxySelector.java,
+	* plugin/icedtea/java/sun/applet/PluginStreamHandler.java,
+	* plugin/icedtea/java/sun/applet/RequestQueue.java,
+	* plugin/icedtea/java/sun/applet/TestEnv.java,
+	* plugin/icedtea/java/sun/applet/VoidPluginCallRequest.java:
+	Moved from plugin/icedtea.
+
 2009-11-04  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 9eb43c172d5b -r a2c6e1cbc3cf Makefile.am
--- a/Makefile.am	Wed Nov 04 22:07:39 2009 +0000
+++ b/Makefile.am	Wed Nov 11 05:14:10 2009 +0000
@@ -86,6 +86,7 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(JDK_SHARE)/javax/script \
 	$(JDK_SHARE)/javax/security/auth/kerberos \
 	$(JDK_SHARE)/javax/security/sasl \
+	$(JDK_SHARE)/javax/swing/plaf/basic \
 	$(JDK_SHARE)/sun/awt/ \
 	$(JDK_SHARE)/sun/rmi/rmic \
 	$(JDK_SHARE)/sun/tools/java \
@@ -185,16 +186,17 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
-NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
+LIVECONNECT_DIR = sun/applet netscape
+PLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
 JNLP_ABOUT_TARGET = extra-lib/about.jar 
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
-JNLP_ABOUT_TARGET = extra-lib/about.jar 
+LIVECONNECT_DIR = sun/applet netscape
+PLUGIN_DIR=$(abs_top_srcdir)/plugin/icedtea
+JNLP_ABOUT_TARGET = extra-lib/about.jar
 else
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
@@ -321,7 +323,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-cc-interp-backedge.patch \
 	patches/icedtea-netx.patch \
-	patches/icedtea-disable-intree-ec.patch
+	patches/icedtea-disable-intree-ec.patch \
+	patches/icedtea-sources.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -480,7 +483,7 @@ ICEDTEA_ENV = \
 	DISTRIBUTION_ID="$(DIST_ID)" \
 	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
 	ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
-	ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
+	ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \
 	DEBUG_CLASSFILES="true" \
 	DEBUG_BINARIES="true" \
 	DISABLE_INTREE_EC="true" \
@@ -707,7 +710,6 @@ clean-local: clean-jtreg clean-jtreg-rep
 	if [ -e lib ]; then \
 	  rmdir lib ; \
 	fi
-	rm -rf rt/netscape
 	rm -f jni-common.o
 if ADD_ZERO_BUILD
 	rm -rf zerovm
@@ -1423,19 +1425,6 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	fi ; \
 	mv stamps/patch.stamp.tmp stamps/patch.stamp 
 
-if ENABLE_NPPLUGIN
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
-else
-if ENABLE_PLUGIN
-	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
-	chmod -R ug+w rt 
-endif
-endif
-
 clean-patch:
 	if [ -e stamps/patch.stamp ] ; then \
 	  all_patches_ok=yes; \
@@ -1468,11 +1457,6 @@ clean-patch:
 	  fi ; \
 	  rm -f stamps/patch.stamp ; \
 	fi
-	rm -rf rt/netscape
-	for file in plugin/icedtea/sun/applet/*java ; \
-	do \
-		rm -f openjdk/jdk/src/share/classes/sun/applet/`basename $file` ; \
-	done ;
 
 stamps/versioning.stamp: stamps/patch.stamp
 	cp openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak
@@ -1694,7 +1678,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
  stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect.stamp stamps/pulse-java.stamp
+ stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/pulse-java.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -1704,9 +1688,9 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext 
 if ENABLE_NPPLUGIN
-	cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
+	cp -pPRf $(PLUGIN_DIR)/IcedTeaNPPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so \
+	cp -pPRf $(PLUGIN_DIR)/IcedTeaNPPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 if ENABLE_PLUGIN
@@ -1769,7 +1753,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
  stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
  stamps/plugin.stamp $(JNLP_ABOUT_TARGET) stamps/cacao.stamp \
- stamps/netx-dist.stamp stamps/liveconnect.stamp stamps/pulse-java.stamp
+ stamps/netx-dist.stamp stamps/liveconnect-dist.stamp stamps/pulse-java.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -1870,7 +1854,7 @@ clean-icedtea-debug-stage2:
 
 stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
  stamps/download.stamp stamps/extract.stamp stamps/overlay.stamp \
- stamps/plugs.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+ stamps/plugs.stamp stamps/netx-dist.stamp stamps/liveconnect-dist.stamp \
  stamps/patch-boot.stamp stamps/cacao.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_BOOT) \
@@ -1926,7 +1910,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	IcedTeaPluginUtils.o
 
 IcedTeaNPPlugin_objects:
-	cd $(NPPLUGIN_DIR); \
+	cd $(PLUGIN_DIR); \
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
 	fi ; \
@@ -1943,7 +1927,7 @@ IcedTeaNPPlugin_objects:
 	cd ../
 
 IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
-	cd $(NPPLUGIN_DIR); \
+	cd $(PLUGIN_DIR); \
 	$(CXX) $(CXXFLAGS) \
 	  $(NPPLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
@@ -1953,7 +1937,7 @@ IcedTeaNPPlugin.so: IcedTeaNPPlugin_obje
 	cd ../
 
 clean-IcedTeaNPPlugin:
-	cd $(NPPLUGIN_DIR); \
+	cd $(PLUGIN_DIR); \
 	rm -f *.o; \
 	rm -f IcedTeaNPPlugin.so; \
 	cd ../
@@ -1995,15 +1979,42 @@ stamps/plugin.stamp: $(ICEDTEAPLUGIN_TAR
 
 clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
 
-stamps/liveconnect.stamp: stamps/rt-class-files.stamp
+liveconnect-source-files.txt:
 	if test "x${LIVECONNECT_DIR}" != x; then \
-	  $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
+	  find $(PLUGIN_DIR)/java -name '*.java' | sort > $@ ; \
+	fi
+	touch $@
+
+stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
+	if test "x${LIVECONNECT_DIR}" != x; then \
+	  mkdir -p $(abs_top_builddir)/liveconnect ; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
+	      -d $(abs_top_builddir)/liveconnect \
+	      -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build \
+	      -sourcepath $(SOURCEPATH_DIRS) \
+	      -bootclasspath \'\' \
+	      @liveconnect-source-files.txt ; \
+	fi
+	mkdir -p stamps
+	touch $@
+
+stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp
+	if test "x${LIVECONNECT_DIR}" != x; then \
+	  (cd $(abs_top_builddir)/liveconnect ; \
+	   mkdir -p lib ; \
+	   $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar ${LIVECONNECT_DIR} ; \
+	   cp -a $(PLUGIN_DIR)/java src; \
+	   find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
+	   cd src ; \
+	   $(ZIP) -qr $(abs_top_builddir)/liveconnect/lib/src.zip ${LIVECONNECT_DIR} ) ; \
 	fi
 	mkdir -p stamps
 	touch $@
 
 clean-liveconnect:
-	rm -f lib/classes.jar
+	rm -rf $(abs_top_builddir)/liveconnect
+	rm -f stamps/liveconnect-dist.stamp
+	rm -f liveconnect-source-files.txt
 	rm -f stamps/liveconnect.stamp
 
 # NetX
@@ -2571,6 +2582,8 @@ jtreg: stamps/jtreg.stamp
 
 liveconnect: stamps/liveconnect.stamp
 
+liveconnect-dist: stamps/liveconnect-dist.stamp
+
 native-ecj: stamps/native-ecj.stamp
 
 nbplatform: stamps/nbplatform.stamp
diff -r 9eb43c172d5b -r a2c6e1cbc3cf NEWS
--- a/NEWS	Wed Nov 04 22:07:39 2009 +0000
+++ b/NEWS	Wed Nov 11 05:14:10 2009 +0000
@@ -15,6 +15,22 @@ New in release 1.12 (2009-XX-XX)
   - The Zero assembler port
   - JIBX is no longer required to build Nimbus.
   - Many bug fixes
+- Latest security updates:
+  - (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
+  - (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
+  - (CVE-2009-3881) resurrected classloaders can still have children (6636650) 
+  - (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
+  - (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
+  - (CVE-2009-3880) UI logging information leakage (6664512)
+  - (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
+  - (CVE-2009-3884) zoneinfo file existence information leak (6824265)
+  - (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
+  - (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
+  - (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
+  - (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
+  - (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
+  - (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
+  - (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
 - The NSS crypto. provider may be turned on with --enable-nss if
   the NSS libraries and headers are available via pkg-config.
 - Makefile reorganisation:
diff -r 9eb43c172d5b -r a2c6e1cbc3cf patches/icedtea-liveconnect-dist.patch
--- a/patches/icedtea-liveconnect-dist.patch	Wed Nov 04 22:07:39 2009 +0000
+++ b/patches/icedtea-liveconnect-dist.patch	Wed Nov 11 05:14:10 2009 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk.orig/jdk/make/common/i
 diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk
 --- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk	2009-05-29 16:49:35.000000000 +0100
-@@ -0,0 +1,27 @@
++++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk	2009-11-11 02:53:36.000000000 +0000
+@@ -0,0 +1,28 @@
 +#
 +# Copyright 2009 Red Hat, Inc.  All Rights Reserved.
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,13 +25,14 @@ diff -Nru openjdk.orig/jdk/make/common/i
 +
 +# The specific packages that come from or go to rt.jar and tools.jar
 +IMPORT_RT_PACKAGES += \
-+     netscape/javascript
++     netscape/javascript \
++     sun/applet
 +
 +IMPORT_TOOLS_PACKAGES +=
 +
 diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk
---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 16:48:26.000000000 +0100
-+++ openjdk/jdk/make/common/internal/ImportComponents.gmk	2009-05-29 16:50:02.000000000 +0100
+--- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk	2009-11-11 02:52:44.000000000 +0000
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk	2009-11-11 02:57:32.000000000 +0000
 @@ -49,6 +49,9 @@
  ifndef NETX_DIST
    include $(BUILDDIR)/common/internal/Defs-netx.gmk
@@ -42,7 +43,15 @@ diff -Nru openjdk.orig/jdk/make/common/i
  
  # Clean up these lists so empty lists are empty
  IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES))
-@@ -162,6 +165,7 @@
+@@ -123,6 +126,7 @@
+ $(call import-one-sources,JAXP_DIST,$1)
+ $(call import-one-sources,JAXWS_DIST,$1)
+ $(call import-one-sources,NETX_DIST,$1)
++$(call import-one-sources,LIVECONNECT_DIST,$1)
+ endef
+ 
+ # Import all component docs into directory $1 (optional)
+@@ -162,6 +166,7 @@
  $(call import-one-classes,JAXP_DIST,$1)
  $(call import-one-classes,JAXWS_DIST,$1)
  $(call import-one-classes,NETX_DIST,$1)
@@ -51,9 +60,9 @@ diff -Nru openjdk.orig/jdk/make/common/i
  
  # Clean up import files
 diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk	2009-05-29 16:48:26.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs.gmk	2009-05-29 16:49:35.000000000 +0100
-@@ -349,6 +349,11 @@
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk	2009-11-11 02:52:44.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs.gmk	2009-11-11 02:13:22.000000000 +0000
+@@ -365,6 +365,11 @@
  else
    NETX_DIST =
  endif
diff -r 9eb43c172d5b -r a2c6e1cbc3cf patches/icedtea-sources.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sources.patch	Wed Nov 11 05:14:10 2009 +0000
@@ -0,0 +1,17 @@
+diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk.orig/jdk/make/common/Release.gmk	2009-11-11 03:12:50.000000000 +0000
++++ openjdk/jdk/make/common/Release.gmk	2009-11-11 03:16:17.000000000 +0000
+@@ -313,7 +313,12 @@
+ 	org/omg				\
+ 	org/w3c/dom			\
+ 	org/xml/sax			\
+-	sunw
++	sunw				\
++	sun/applet			\
++	netscape			\
++	net				\
++	javax/jnlp
++
+ #
+ # Directories where sources may be found.  If a file with the same path
+ # name exists in more than one of these places, the one found last on this
diff -r 9eb43c172d5b -r a2c6e1cbc3cf plugin/icedtea/java/netscape/javascript/JSException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/icedtea/java/netscape/javascript/JSException.java	Wed Nov 11 05:14:10 2009 +0000
@@ -0,0 +1,140 @@
+/* -*- Mode: Java; tab-width: 8; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+package netscape.javascript;
+
+/**
+ * JSException is an exception which is thrown when JavaScript code
+ * returns an error.
+ */
+
+public
+class JSException extends RuntimeException {
+    public static final int EXCEPTION_TYPE_EMPTY = -1;
+    public static final int EXCEPTION_TYPE_VOID = 0;
+    public static final int EXCEPTION_TYPE_OBJECT = 1;
+    public static final int EXCEPTION_TYPE_FUNCTION = 2;
+    public static final int EXCEPTION_TYPE_STRING = 3;
+    public static final int EXCEPTION_TYPE_NUMBER = 4;
+    public static final int EXCEPTION_TYPE_BOOLEAN = 5;
+    public static final int EXCEPTION_TYPE_ERROR = 6;
+
+    public String filename;
+    public int lineno;
+    public String source;
+    public int tokenIndex;
+    public int wrappedExceptionType;
+    public Object wrappedException;
+
+    /**
+     * Constructs a JSException without a detail message.
+     * A detail message is a String that describes this particular exception.
+     *
+     * @deprecated Not for public use in future versions.
+     */
+    public JSException() {
+	super();
+        filename = "unknown";
+        lineno = 0;
+        source = "";
+        tokenIndex = 0;
+	wrappedExceptionType = EXCEPTION_TYPE_EMPTY;
+    }


From andrew at icedtea.classpath.org  Tue Nov 10 21:11:28 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 05:11:28 +0000
Subject: /hg/icedtea: Document icedtea-sources.patch.
Message-ID: <hg.581bf37cca26.1257916288.-6899778133799504387@icedtea.classpath.org>

changeset 581bf37cca26 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=581bf37cca26
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 11 05:15:50 2009 +0000

	Document icedtea-sources.patch.

	2009-11-10 Andrew John Hughes <ahughes at redhat.com>

	 * HACKING: Document icedtea-sources.patch.


diffstat:

2 files changed, 7 insertions(+)
ChangeLog |    6 ++++++
HACKING   |    1 +

diffs (31 lines):

diff -r a2c6e1cbc3cf -r 581bf37cca26 ChangeLog
--- a/ChangeLog	Wed Nov 11 05:14:10 2009 +0000
+++ b/ChangeLog	Wed Nov 11 05:15:50 2009 +0000
@@ -1,3 +1,7 @@ 2009-11-10  Andrew John Hughes  <ahughes
+2009-11-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* HACKING: Document icedtea-sources.patch.
+	
 2009-11-10  Andrew John Hughes  <ahughes at redhat.com>
 	
 	* plugin/icedtea/netscape/javascript/JSException.java,
@@ -56,6 +60,8 @@ 2009-11-10  Andrew John Hughes  <ahughes
 	* NEWS: Add list of security updates.
 	* patches/icedtea-liveconnect-dist.patch:
 	Include sun/applet and import sources too.
+	* patches/icedtea-sources.patch: New patch to include
+	plugin and netx sources in src.zip.
 	* plugin/icedtea/java/netscape/javascript/JSException.java,
 	* plugin/icedtea/java/netscape/javascript/JSObject.java,
 	* plugin/icedtea/java/netscape/javascript/JSObjectCreatePermission.java,
diff -r a2c6e1cbc3cf -r 581bf37cca26 HACKING
--- a/HACKING	Wed Nov 11 05:14:10 2009 +0000
+++ b/HACKING	Wed Nov 11 05:15:50 2009 +0000
@@ -116,6 +116,7 @@ The following patches are only applied t
   javax.management.AttributeValueExp (unsupported by ecj < 3.4).
 * icedtea-nss-config.patch: Add the NSS PKCS11 security provider. (PR356)
 * icedtea-nss-6763530.patch: Fix PKCS11 provider when used with newer version of NSS (>=3.12.3) (PR356, S6763530).
+* icedtea-sources.patch: Include netx and plugin sources in src.zip
 
 The following patches are only applied to the icedtea-ecj bootstrap tree:
 


From gbenson at redhat.com  Wed Nov 11 01:46:52 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 09:46:52 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
Message-ID: <20091111094651.GA3256@redhat.com>

Michael Franz wrote:
> I was able to get past this by upgrading to llvm 2.6 (Fedora 11 as
> 2.5).  I see post referencing llvm 2.7.  Is this going to be the
> required version soon?

There's no plans for that.  In the past we've generally supported as
many versions as developers cared about.

> I am building on a G4 which is 32 bits, but _LP64=1 is being
> defined.  This is causing problems as jlong is being defined
> incorrectly (long instead of long long).  How do I unset _LP64?

What does 'uname -m' say on your machine?

Cheers,
Gary

-- 
http://gbenson.net/


From Tomas.Hurka at Sun.COM  Wed Nov 11 01:50:41 2009
From: Tomas.Hurka at Sun.COM (Tomas Hurka)
Date: Wed, 11 Nov 2009 10:50:41 +0100
Subject: VisualVM 1.2.1 and IcedTea6
Message-ID: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>

Hi All,
attached is a patch to include the latest version (1.2.1) of VisualVM  
in IcedTea6. Can somebody commit these changes for me?

Thanks,
--
Tomas Hurka   <mailto:tomas.hurka at sun.com>
NetBeans Profiler http://profiler.netbeans.org
VisualVM http://visualvm.dev.java.net
Software Engineer, Developer Platforms Group
Sun Microsystems, Praha Czech Republic


-------------- next part --------------
A non-text attachment was scrubbed...
Name: visualvm_121.patch
Type: application/octet-stream
Size: 1912 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/4927a33d/visualvm_121.patch 
-------------- next part --------------



From gbenson at icedtea.classpath.org  Wed Nov 11 02:25:48 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 10:25:48 +0000
Subject: /hg/icedtea6: 2009-11-11  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.b078cdccad9c.1257935148.2873452341184383832@icedtea.classpath.org>

changeset b078cdccad9c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b078cdccad9c
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 10:30:19 2009 +0000

	2009-11-11 Gary Benson <gbenson at redhat.com>

	 * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
	(ZeroEntry::entry_point): Inlined. (ZeroEntry::invoke):
	Likewise. (ZeroEntry::invoke_osr): Likewise.


diffstat:

2 files changed, 10 insertions(+), 3 deletions(-)
ChangeLog                                    |    7 +++++++
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp |    6 +++---

diffs (39 lines):

diff -r ff96e96a485b -r b078cdccad9c ChangeLog
--- a/ChangeLog	Mon Nov 09 13:07:15 2009 +0100
+++ b/ChangeLog	Wed Nov 11 10:30:19 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-09  Xerxes R??nby  <xerxes at zafen
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp 
+	(ZeroEntry::entry_point): Inlined.
+	(ZeroEntry::invoke): Likewise.
+	(ZeroEntry::invoke_osr): Likewise.
+
 2009-11-09  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
diff -r ff96e96a485b -r b078cdccad9c ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Mon Nov 09 13:07:15 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Wed Nov 11 10:30:19 2009 +0000
@@ -33,7 +33,7 @@ class ZeroEntry {
   address _entry_point;
 
  public:
-  address entry_point() const {
+  inline address entry_point() const {
     return _entry_point;
   }
   void set_entry_point(address entry_point) {
@@ -50,10 +50,10 @@ class ZeroEntry {
                                TRAPS);
 
  public:
-  void invoke(methodOop method, TRAPS) const {
+  inline void invoke(methodOop method, TRAPS) const {
     ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
   }
-  void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
+  inline void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
     ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
   }
 


From gbenson at icedtea.classpath.org  Wed Nov 11 02:29:32 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 10:29:32 +0000
Subject: /hg/icedtea6: 2009-11-11  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.3adabf9ea7ef.1257935372.2873452341184383832@icedtea.classpath.org>

changeset 3adabf9ea7ef in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3adabf9ea7ef
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 10:34:05 2009 +0000

	2009-11-11 Gary Benson <gbenson at redhat.com>

	 * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
	(frame::is_fake_stub_frame): Removed.
	(frame::sender_for_fake_stub_frame): Likewise.
	(frame::sender_for_nonentry_frame): New method.
		* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
	(frame::is_fake_stub_frame): Removed.
	(frame::sender_for_fake_stub_frame): Likewise.
	(frame::sender_for_nonentry_frame): New method.
	(frame::sender): Refactored.


diffstat:

3 files changed, 16 insertions(+), 28 deletions(-)
ChangeLog                                    |   12 +++++++++++
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp |   27 ++------------------------
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp |    5 ----

diffs (85 lines):

diff -r b078cdccad9c -r 3adabf9ea7ef ChangeLog
--- a/ChangeLog	Wed Nov 11 10:30:19 2009 +0000
+++ b/ChangeLog	Wed Nov 11 10:34:05 2009 +0000
@@ -1,3 +1,15 @@ 2009-11-11  Gary Benson  <gbenson at redhat
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
+	(frame::is_fake_stub_frame): Removed.
+	(frame::sender_for_fake_stub_frame): Likewise.
+	(frame::sender_for_nonentry_frame): New method.
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+	(frame::is_fake_stub_frame): Removed.
+	(frame::sender_for_fake_stub_frame): Likewise.
+	(frame::sender_for_nonentry_frame): New method.
+	(frame::sender): Refactored.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp 
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Nov 11 10:34:05 2009 +0000
@@ -34,10 +34,6 @@ void RegisterMap::check_location_valid()
 
 bool frame::is_interpreted_frame() const {
   return zeroframe()->is_interpreter_frame();
-}
-
-bool frame::is_fake_stub_frame() const {
-  return zeroframe()->is_fake_stub_frame();
 }
 
 frame frame::sender_for_entry_frame(RegisterMap *map) const {
@@ -50,15 +46,7 @@ frame frame::sender_for_entry_frame(Regi
   return frame(sender_sp(), sp() + 1);
 }
 
-frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_compiled_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_fake_stub_frame(RegisterMap *map) const {
+frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
   return frame(sender_sp(), sp() + 1);
 }
 
@@ -69,17 +57,8 @@ frame frame::sender(RegisterMap* map) co
 
   if (is_entry_frame())
     return sender_for_entry_frame(map);
-
-  if (is_interpreted_frame())
-    return sender_for_interpreter_frame(map);
-
-  if (is_compiled_frame())
-    return sender_for_compiled_frame(map);
-
-  if (is_fake_stub_frame())
-    return sender_for_fake_stub_frame(map);
-
-  ShouldNotReachHere();
+  else
+    return sender_for_nonentry_frame(map);
 }
 
 #ifdef CC_INTERP
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Wed Nov 11 10:34:05 2009 +0000
@@ -65,10 +65,7 @@
   }
 
  public:
-  bool is_fake_stub_frame() const;
-
- public:
-  frame sender_for_fake_stub_frame(RegisterMap* map) const;
+  frame sender_for_nonentry_frame(RegisterMap* map) const;
 
  public:
   void zero_print_on_error(int           index,


From mvfranz at gmail.com  Wed Nov 11 05:46:36 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Wed, 11 Nov 2009 08:46:36 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <20091111094651.GA3256@redhat.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
Message-ID: <fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>

On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com> wrote:

> Michael Franz wrote:
> > I was able to get past this by upgrading to llvm 2.6 (Fedora 11 as
> > 2.5).  I see post referencing llvm 2.7.  Is this going to be the
> > required version soon?
>
> There's no plans for that.  In the past we've generally supported as
> many versions as developers cared about.
>
> > I am building on a G4 which is 32 bits, but _LP64=1 is being
> > defined.  This is causing problems as jlong is being defined
> > incorrectly (long instead of long long).  How do I unset _LP64?
>
> What does 'uname -m' say on your machine?
>
> uname -m
ppc

I was able to get the build to progress by setting ARCH_DATA_MODEL=32 before
calling make.  I did this since there didn't seem to be a case where the
ARCH was equal to ppc and it then defaults to 64.

Michael
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/2ba720c1/attachment.html 

From gbenson at redhat.com  Wed Nov 11 05:55:01 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 13:55:01 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
Message-ID: <20091111135501.GC3256@redhat.com>

Michael Franz wrote:
> On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com> wrote:
> > Michael Franz wrote:
> > > I was able to get past this by upgrading to llvm 2.6 (Fedora 11 as
> > > 2.5).  I see post referencing llvm 2.7.  Is this going to be the
> > > required version soon?
> >
> > There's no plans for that.  In the past we've generally supported as
> > many versions as developers cared about.
> >
> > > I am building on a G4 which is 32 bits, but _LP64=1 is being
> > > defined.  This is causing problems as jlong is being defined
> > > incorrectly (long instead of long long).  How do I unset _LP64?
> >
> > What does 'uname -m' say on your machine?
> >
> > uname -m
> 
> ppc
> 
> I was able to get the build to progress by setting ARCH_DATA_MODEL=32
> before calling make.  I did this since there didn't seem to be a case
> where the ARCH was equal to ppc and it then defaults to 64.

Interesting.  Is this with IcedTea7?

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Wed Nov 11 05:56:58 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 13:56:58 +0000
Subject: Zero tweak
Message-ID: <20091111135658.GD3256@redhat.com>

Hi all,

This commit inlines a couple of methods in Zero.  I had thought that
declaring methods in the header file caused them to be automatically
inlined, but apparently that isn't the case.  There are probably more
methods that could benefit from this; I only noticed these because
you end up with two frames for every Java call in gdb.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r ff96e96a485b -r b078cdccad9c ChangeLog
--- a/ChangeLog	Mon Nov 09 13:07:15 2009 +0100
+++ b/ChangeLog	Wed Nov 11 10:30:19 2009 +0000
@@ -1,3 +1,10 @@
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp 
+	(ZeroEntry::entry_point): Inlined.
+	(ZeroEntry::invoke): Likewise.
+	(ZeroEntry::invoke_osr): Likewise.
+
 2009-11-09  Xerxes R?nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
diff -r ff96e96a485b -r b078cdccad9c ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Mon Nov 09 13:07:15 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Wed Nov 11 10:30:19 2009 +0000
@@ -33,7 +33,7 @@
   address _entry_point;
 
  public:
-  address entry_point() const {
+  inline address entry_point() const {
     return _entry_point;
   }
   void set_entry_point(address entry_point) {
@@ -50,10 +50,10 @@
                                TRAPS);
 
  public:
-  void invoke(methodOop method, TRAPS) const {
+  inline void invoke(methodOop method, TRAPS) const {
     ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
   }
-  void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
+  inline void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
     ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
   }
 

From gbenson at redhat.com  Wed Nov 11 06:00:55 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 14:00:55 +0000
Subject: Zero stack walker tweak
Message-ID: <20091111140054.GE3256@redhat.com>

Hi all,

This commit combines the handling of most of the different types of
frame you get with Zero and Shark.  The old method mirrors how it's
done for the architecture-specific HotSpot ports, but it's unnecessary
with Zero.  I balked at adding yet another unnecessary special case to
handle Shark-compiled JNI method wrappers...

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r b078cdccad9c -r 3adabf9ea7ef ChangeLog
--- a/ChangeLog	Wed Nov 11 10:30:19 2009 +0000
+++ b/ChangeLog	Wed Nov 11 10:34:05 2009 +0000
@@ -1,3 +1,15 @@
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
+	(frame::is_fake_stub_frame): Removed.
+	(frame::sender_for_fake_stub_frame): Likewise.
+	(frame::sender_for_nonentry_frame): New method.
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+	(frame::is_fake_stub_frame): Removed.
+	(frame::sender_for_fake_stub_frame): Likewise.
+	(frame::sender_for_nonentry_frame): New method.
+	(frame::sender): Refactored.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp 
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Nov 11 10:34:05 2009 +0000
@@ -36,10 +36,6 @@
   return zeroframe()->is_interpreter_frame();
 }
 
-bool frame::is_fake_stub_frame() const {
-  return zeroframe()->is_fake_stub_frame();
-}
-
 frame frame::sender_for_entry_frame(RegisterMap *map) const {
   assert(map != NULL, "map must be set");
   assert(!entry_frame_is_first(), "next Java fp must be non zero");
@@ -50,15 +46,7 @@
   return frame(sender_sp(), sp() + 1);
 }
 
-frame frame::sender_for_interpreter_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_compiled_frame(RegisterMap *map) const {
-  return frame(sender_sp(), sp() + 1);
-}
-
-frame frame::sender_for_fake_stub_frame(RegisterMap *map) const {
+frame frame::sender_for_nonentry_frame(RegisterMap *map) const {
   return frame(sender_sp(), sp() + 1);
 }
 
@@ -69,17 +57,8 @@
 
   if (is_entry_frame())
     return sender_for_entry_frame(map);
-
-  if (is_interpreted_frame())
-    return sender_for_interpreter_frame(map);
-
-  if (is_compiled_frame())
-    return sender_for_compiled_frame(map);
-
-  if (is_fake_stub_frame())
-    return sender_for_fake_stub_frame(map);
-
-  ShouldNotReachHere();
+  else
+    return sender_for_nonentry_frame(map);
 }
 
 #ifdef CC_INTERP
diff -r b078cdccad9c -r 3adabf9ea7ef ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Wed Nov 11 10:30:19 2009 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.hpp	Wed Nov 11 10:34:05 2009 +0000
@@ -65,10 +65,7 @@
   }
 
  public:
-  bool is_fake_stub_frame() const;
-
- public:
-  frame sender_for_fake_stub_frame(RegisterMap* map) const;
+  frame sender_for_nonentry_frame(RegisterMap* map) const;
 
  public:
   void zero_print_on_error(int           index,

From gbenson at redhat.com  Wed Nov 11 06:03:45 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 14:03:45 +0000
Subject: Shark tweak
Message-ID: <20091111140345.GF3256@redhat.com>

Hi all,

SharkType had two methods for referring to objects which represent
an oop in the JVM: oop_type and jobject_type.  HotSpot has C types
called oop and jobject, and I thought they were synonymous, but
they aren't; everything in Shark is an oop and not a jobject.  This
commit removes all references to jobject from Shark for clarity.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ChangeLog
--- a/ChangeLog	Wed Nov 11 10:34:05 2009 +0000
+++ b/ChangeLog	Wed Nov 11 13:52:48 2009 +0000
@@ -1,3 +1,32 @@
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp
+	(SharkType::jobject_type): Removed.
+
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(LLVMValue::null): Use SharkType::oop_type() instead of
+	SharkType::jobject_type().
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::CreateInlineOop): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
+	(SharkIntrinsics::do_Object_getClass): Likewise.
+	(SharkIntrinsics::do_Thread_currentThread): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::pending_exception_address): Likewise.
+	(SharkTopLevelBlock::get_vm_result): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::call_register_finalizer): Likewise.
+	(SharkTopLevelBlock::get_virtual_callee): Likewise.
+	(SharkTopLevelBlock::get_interface_callee): Likewise.
+	(SharkTopLevelBlock::do_full_instance_check): Likewise.
+	(SharkTopLevelBlock::do_new): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkType.cpp
+	(SharkType::initialize): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp
+	(SharkValue::create_jobject): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp
+	(SharkNormalValue::is_jobject): Likewise.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -55,7 +55,7 @@
   }
   static llvm::ConstantPointerNull* null()
   {
-    return llvm::ConstantPointerNull::get(SharkType::jobject_type());
+    return llvm::ConstantPointerNull::get(SharkType::oop_type());
   }
 
  public:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -577,7 +577,7 @@
   return CreateLoad(
     CreateIntToPtr(
       code_buffer_address(code_buffer()->inline_oop(object)),
-      PointerType::getUnqual(SharkType::jobject_type())),
+      PointerType::getUnqual(SharkType::oop_type())),
     name);
 }
 
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -212,7 +212,7 @@
   Value *klass = builder()->CreateValueOfStructEntry(
     state()->pop()->jobject_value(),
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
 
   Value *klass_part = builder()->CreateAddressOfStructEntry(
@@ -246,7 +246,7 @@
     SharkValue::create_jobject(
       builder()->CreateValueOfStructEntry(
         thread(), JavaThread::threadObj_offset(),
-        SharkType::jobject_type(),
+        SharkType::oop_type(),
         "threadObj"),
       true));
 }
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -580,7 +580,7 @@
   Value *klass = builder()->CreateValueOfStructEntry(
     receiver,
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
   
   Value *klass_part = builder()->CreateAddressOfStructEntry(
@@ -956,7 +956,7 @@
   Value *klass = builder()->CreateValueOfStructEntry(
     receiver->jobject_value(),
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
 
   return builder()->CreateLoad(
@@ -981,7 +981,7 @@
   // Locate the receiver's itable
   Value *object_klass = builder()->CreateValueOfStructEntry(
     receiver->jobject_value(), in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "object_klass");
 
   Value *vtable_start = builder()->CreateAdd(
@@ -1028,7 +1028,7 @@
   Value *itable_iklass = builder()->CreateValueOfStructEntry(
     itable_entry,
     in_ByteSize(itableOffsetEntry::interface_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "itable_iklass");
 
   builder()->CreateCondBr(
@@ -1328,7 +1328,7 @@
   // Get the class of the object being tested
   Value *object_klass = builder()->CreateValueOfStructEntry(
     object, in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "object_klass");
 
   // Perform the check
@@ -1486,7 +1486,7 @@
 
       builder()->SetInsertPoint(got_tlab);
       tlab_object = builder()->CreateIntToPtr(
-        old_top, SharkType::jobject_type(), "tlab_object");
+        old_top, SharkType::oop_type(), "tlab_object");
 
       builder()->CreateStore(new_top, top_addr);
       builder()->CreateBr(initialize);
@@ -1519,7 +1519,7 @@
 
     builder()->SetInsertPoint(got_heap);
     heap_object = builder()->CreateIntToPtr(
-      old_top, SharkType::jobject_type(), "heap_object");
+      old_top, SharkType::oop_type(), "heap_object");
 
     Value *check = builder()->CreateCmpxchgPtr(new_top, top_addr, old_top);
     builder()->CreateCondBr(
@@ -1530,7 +1530,7 @@
     builder()->SetInsertPoint(initialize);
     if (tlab_object) {
       PHINode *phi = builder()->CreatePHI(
-        SharkType::jobject_type(), "fast_object");
+        SharkType::oop_type(), "fast_object");
       phi->addIncoming(tlab_object, got_tlab);
       phi->addIncoming(heap_object, got_heap);
       fast_object = phi;
@@ -1553,7 +1553,7 @@
 
     Value *klass_addr = builder()->CreateAddressOfStructEntry(
       fast_object, in_ByteSize(oopDesc::klass_offset_in_bytes()),
-      PointerType::getUnqual(SharkType::jobject_type()),
+      PointerType::getUnqual(SharkType::oop_type()),
       "klass_addr");
 
     // Set the mark
@@ -1590,7 +1590,7 @@
     builder()->SetInsertPoint(push_object);
   }
   if (fast_object) {
-    PHINode *phi = builder()->CreatePHI(SharkType::jobject_type(), "object");
+    PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), "object");
     phi->addIncoming(fast_object, got_fast);
     phi->addIncoming(slow_object, got_slow);
     object = phi;
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -245,7 +245,7 @@
   {
     return builder()->CreateAddressOfStructEntry(
       thread(), Thread::pending_exception_offset(),
-      llvm::PointerType::getUnqual(SharkType::jobject_type()),
+      llvm::PointerType::getUnqual(SharkType::oop_type()),
       "pending_exception_addr");
   }
   llvm::LoadInst* get_pending_exception() const
@@ -349,7 +349,7 @@
   {
     llvm::Value *addr = builder()->CreateAddressOfStructEntry(
       thread(), JavaThread::vm_result_offset(),
-      llvm::PointerType::getUnqual(SharkType::jobject_type()),
+      llvm::PointerType::getUnqual(SharkType::oop_type()),
       "vm_result_addr");
     llvm::LoadInst *result = builder()->CreateLoad(addr, "vm_result");
     builder()->CreateStore(LLVMValue::null(), addr);
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkType.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -168,8 +168,8 @@
 
     case T_OBJECT:
     case T_ARRAY:
-      _to_stackType_tab[i] = jobject_type();
-      _to_arrayType_tab[i] = jobject_type();
+      _to_stackType_tab[i] = oop_type();
+      _to_arrayType_tab[i] = oop_type();
       break;
 
     case T_ADDRESS:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkType.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,10 +161,6 @@
     return llvm::Type::DoubleTy;
 #endif
   }
-  static const llvm::PointerType* jobject_type()
-  {
-    return oop_type();
-  }
 
   // Java types as they appear on the stack and in fields
  private:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkValue.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -151,7 +151,7 @@
 }
 bool SharkNormalValue::is_jobject() const
 {
-  return llvm_value()->getType() == SharkType::jobject_type();
+  return llvm_value()->getType() == SharkType::oop_type();
 }
 bool SharkNormalValue::is_jarray() const
 {
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -118,7 +118,7 @@
   }
   static SharkValue* create_jobject(llvm::Value* value, bool zero_checked)
   {
-    assert(value->getType() == SharkType::jobject_type(), "should be");
+    assert(value->getType() == SharkType::oop_type(), "should be");
     return create_generic(ciType::make(T_OBJECT), value, zero_checked);
   }
 

From mvfranz at gmail.com  Wed Nov 11 06:03:53 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Wed, 11 Nov 2009 09:03:53 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <20091111135501.GC3256@redhat.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
Message-ID: <fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>

On Wed, Nov 11, 2009 at 8:55 AM, Gary Benson <gbenson at redhat.com> wrote:

> Michael Franz wrote:
> > On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com> wrote:
> > > Michael Franz wrote:
> > > > I was able to get past this by upgrading to llvm 2.6 (Fedora 11 as
> > > > 2.5).  I see post referencing llvm 2.7.  Is this going to be the
> > > > required version soon?
> > >
> > > There's no plans for that.  In the past we've generally supported as
> > > many versions as developers cared about.
> > >
> > > > I am building on a G4 which is 32 bits, but _LP64=1 is being
> > > > defined.  This is causing problems as jlong is being defined
> > > > incorrectly (long instead of long long).  How do I unset _LP64?
> > >
> > > What does 'uname -m' say on your machine?
> > >
> > > uname -m
> >
> > ppc
> >
> > I was able to get the build to progress by setting ARCH_DATA_MODEL=32
> > before calling make.  I did this since there didn't seem to be a case
> > where the ARCH was equal to ppc and it then defaults to 64.
>
> Interesting.  Is this with IcedTea7?
>
> Yes,  It is current TIP as of a few days ago.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/9a531ed8/attachment.html 

From gbenson at redhat.com  Wed Nov 11 06:09:40 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 14:09:40 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
Message-ID: <20091111140940.GG3256@redhat.com>

Michael Franz wrote:
> On Wed, Nov 11, 2009 at 8:55 AM, Gary Benson <gbenson at redhat.com> wrote:
> > Michael Franz wrote:
> > > On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com> wrote:
> > > > Michael Franz wrote:
> > > > > I am building on a G4 which is 32 bits, but _LP64=1 is being
> > > > > defined.  This is causing problems as jlong is being defined
> > > > > incorrectly (long instead of long long).  How do I unset
> > > > > _LP64?
> > > >
> > > > What does 'uname -m' say on your machine?
> > > >
> > > > uname -m
> > >
> > > ppc
> > >
> > > I was able to get the build to progress by setting
> > > ARCH_DATA_MODEL=32 before calling make.  I did this since there
> > > didn't seem to be a case where the ARCH was equal to ppc and it
> > > then defaults to 64.
> >
> > Interesting.  Is this with IcedTea7?
> >
> > Yes,  It is current TIP as of a few days ago.

Ah, it looks like it hasn't been updated with the different
environment variables that the upstreamed Zero requires.
I'll fix it...

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at icedtea.classpath.org  Wed Nov 11 06:07:12 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 14:07:12 +0000
Subject: /hg/icedtea6: 2009-11-11  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.79079fb4d3b4.1257948431.2873452341184383832@icedtea.classpath.org>

changeset 79079fb4d3b4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=79079fb4d3b4
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 13:52:48 2009 +0000

	2009-11-11 Gary Benson <gbenson at redhat.com>

	 * ports/hotspot/src/share/vm/shark/sharkType.hpp
	(SharkType::jobject_type): Removed.

	 * ports/hotspot/src/share/vm/shark/llvmValue.hpp
	(LLVMValue::null): Use SharkType::oop_type() instead of
	SharkType::jobject_type().
		* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::CreateInlineOop): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
	(SharkIntrinsics::do_Object_getClass): Likewise.
	(SharkIntrinsics::do_Thread_currentThread): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
	(SharkTopLevelBlock::pending_exception_address): Likewise.
	(SharkTopLevelBlock::get_vm_result): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
	(SharkTopLevelBlock::call_register_finalizer): Likewise.
	(SharkTopLevelBlock::get_virtual_callee): Likewise.
	(SharkTopLevelBlock::get_interface_callee): Likewise.
	(SharkTopLevelBlock::do_full_instance_check): Likewise.
	(SharkTopLevelBlock::do_new): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkType.cpp
	(SharkType::initialize): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkValue.hpp
	(SharkValue::create_jobject): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkValue.cpp
	(SharkNormalValue::is_jobject): Likewise.


diffstat:

10 files changed, 50 insertions(+), 25 deletions(-)
ChangeLog                                               |   29 +++++++++++++++
ports/hotspot/src/share/vm/shark/llvmValue.hpp          |    2 -
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp       |    2 -
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp    |    4 +-
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |   20 +++++-----
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |    4 +-
ports/hotspot/src/share/vm/shark/sharkType.cpp          |    4 +-
ports/hotspot/src/share/vm/shark/sharkType.hpp          |    6 ---
ports/hotspot/src/share/vm/shark/sharkValue.cpp         |    2 -
ports/hotspot/src/share/vm/shark/sharkValue.hpp         |    2 -

diffs (255 lines):

diff -r 3adabf9ea7ef -r 79079fb4d3b4 ChangeLog
--- a/ChangeLog	Wed Nov 11 10:34:05 2009 +0000
+++ b/ChangeLog	Wed Nov 11 13:52:48 2009 +0000
@@ -1,3 +1,32 @@ 2009-11-11  Gary Benson  <gbenson at redhat
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp
+	(SharkType::jobject_type): Removed.
+
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(LLVMValue::null): Use SharkType::oop_type() instead of
+	SharkType::jobject_type().
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::CreateInlineOop): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
+	(SharkIntrinsics::do_Object_getClass): Likewise.
+	(SharkIntrinsics::do_Thread_currentThread): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::pending_exception_address): Likewise.
+	(SharkTopLevelBlock::get_vm_result): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::call_register_finalizer): Likewise.
+	(SharkTopLevelBlock::get_virtual_callee): Likewise.
+	(SharkTopLevelBlock::get_interface_callee): Likewise.
+	(SharkTopLevelBlock::do_full_instance_check): Likewise.
+	(SharkTopLevelBlock::do_new): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkType.cpp
+	(SharkType::initialize): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp
+	(SharkValue::create_jobject): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp
+	(SharkNormalValue::is_jobject): Likewise.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -55,7 +55,7 @@ class LLVMValue : public AllStatic {
   }
   static llvm::ConstantPointerNull* null()
   {
-    return llvm::ConstantPointerNull::get(SharkType::jobject_type());
+    return llvm::ConstantPointerNull::get(SharkType::oop_type());
   }
 
  public:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -577,7 +577,7 @@ Value* SharkBuilder::CreateInlineOop(ciO
   return CreateLoad(
     CreateIntToPtr(
       code_buffer_address(code_buffer()->inline_oop(object)),
-      PointerType::getUnqual(SharkType::jobject_type())),
+      PointerType::getUnqual(SharkType::oop_type())),
     name);
 }
 
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -212,7 +212,7 @@ void SharkIntrinsics::do_Object_getClass
   Value *klass = builder()->CreateValueOfStructEntry(
     state()->pop()->jobject_value(),
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
 
   Value *klass_part = builder()->CreateAddressOfStructEntry(
@@ -246,7 +246,7 @@ void SharkIntrinsics::do_Thread_currentT
     SharkValue::create_jobject(
       builder()->CreateValueOfStructEntry(
         thread(), JavaThread::threadObj_offset(),
-        SharkType::jobject_type(),
+        SharkType::oop_type(),
         "threadObj"),
       true));
 }
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -580,7 +580,7 @@ void SharkTopLevelBlock::call_register_f
   Value *klass = builder()->CreateValueOfStructEntry(
     receiver,
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
   
   Value *klass_part = builder()->CreateAddressOfStructEntry(
@@ -956,7 +956,7 @@ Value *SharkTopLevelBlock::get_virtual_c
   Value *klass = builder()->CreateValueOfStructEntry(
     receiver->jobject_value(),
     in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "klass");
 
   return builder()->CreateLoad(
@@ -981,7 +981,7 @@ Value* SharkTopLevelBlock::get_interface
   // Locate the receiver's itable
   Value *object_klass = builder()->CreateValueOfStructEntry(
     receiver->jobject_value(), in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "object_klass");
 
   Value *vtable_start = builder()->CreateAdd(
@@ -1028,7 +1028,7 @@ Value* SharkTopLevelBlock::get_interface
   Value *itable_iklass = builder()->CreateValueOfStructEntry(
     itable_entry,
     in_ByteSize(itableOffsetEntry::interface_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "itable_iklass");
 
   builder()->CreateCondBr(
@@ -1328,7 +1328,7 @@ void SharkTopLevelBlock::do_full_instanc
   // Get the class of the object being tested
   Value *object_klass = builder()->CreateValueOfStructEntry(
     object, in_ByteSize(oopDesc::klass_offset_in_bytes()),
-    SharkType::jobject_type(),
+    SharkType::oop_type(),
     "object_klass");
 
   // Perform the check
@@ -1486,7 +1486,7 @@ void SharkTopLevelBlock::do_new()
 
       builder()->SetInsertPoint(got_tlab);
       tlab_object = builder()->CreateIntToPtr(
-        old_top, SharkType::jobject_type(), "tlab_object");
+        old_top, SharkType::oop_type(), "tlab_object");
 
       builder()->CreateStore(new_top, top_addr);
       builder()->CreateBr(initialize);
@@ -1519,7 +1519,7 @@ void SharkTopLevelBlock::do_new()
 
     builder()->SetInsertPoint(got_heap);
     heap_object = builder()->CreateIntToPtr(
-      old_top, SharkType::jobject_type(), "heap_object");
+      old_top, SharkType::oop_type(), "heap_object");
 
     Value *check = builder()->CreateCmpxchgPtr(new_top, top_addr, old_top);
     builder()->CreateCondBr(
@@ -1530,7 +1530,7 @@ void SharkTopLevelBlock::do_new()
     builder()->SetInsertPoint(initialize);
     if (tlab_object) {
       PHINode *phi = builder()->CreatePHI(
-        SharkType::jobject_type(), "fast_object");
+        SharkType::oop_type(), "fast_object");
       phi->addIncoming(tlab_object, got_tlab);
       phi->addIncoming(heap_object, got_heap);
       fast_object = phi;
@@ -1553,7 +1553,7 @@ void SharkTopLevelBlock::do_new()
 
     Value *klass_addr = builder()->CreateAddressOfStructEntry(
       fast_object, in_ByteSize(oopDesc::klass_offset_in_bytes()),
-      PointerType::getUnqual(SharkType::jobject_type()),
+      PointerType::getUnqual(SharkType::oop_type()),
       "klass_addr");
 
     // Set the mark
@@ -1590,7 +1590,7 @@ void SharkTopLevelBlock::do_new()
     builder()->SetInsertPoint(push_object);
   }
   if (fast_object) {
-    PHINode *phi = builder()->CreatePHI(SharkType::jobject_type(), "object");
+    PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), "object");
     phi->addIncoming(fast_object, got_fast);
     phi->addIncoming(slow_object, got_slow);
     object = phi;
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -245,7 +245,7 @@ class SharkTopLevelBlock : public SharkB
   {
     return builder()->CreateAddressOfStructEntry(
       thread(), Thread::pending_exception_offset(),
-      llvm::PointerType::getUnqual(SharkType::jobject_type()),
+      llvm::PointerType::getUnqual(SharkType::oop_type()),
       "pending_exception_addr");
   }
   llvm::LoadInst* get_pending_exception() const
@@ -349,7 +349,7 @@ class SharkTopLevelBlock : public SharkB
   {
     llvm::Value *addr = builder()->CreateAddressOfStructEntry(
       thread(), JavaThread::vm_result_offset(),
-      llvm::PointerType::getUnqual(SharkType::jobject_type()),
+      llvm::PointerType::getUnqual(SharkType::oop_type()),
       "vm_result_addr");
     llvm::LoadInst *result = builder()->CreateLoad(addr, "vm_result");
     builder()->CreateStore(LLVMValue::null(), addr);
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkType.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -168,8 +168,8 @@ void SharkType::initialize()
 
     case T_OBJECT:
     case T_ARRAY:
-      _to_stackType_tab[i] = jobject_type();
-      _to_arrayType_tab[i] = jobject_type();
+      _to_stackType_tab[i] = oop_type();
+      _to_arrayType_tab[i] = oop_type();
       break;
 
     case T_ADDRESS:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkType.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,10 +161,6 @@ class SharkType : public AllStatic {
     return llvm::Type::DoubleTy;
 #endif
   }
-  static const llvm::PointerType* jobject_type()
-  {
-    return oop_type();
-  }
 
   // Java types as they appear on the stack and in fields
  private:
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkValue.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 13:52:48 2009 +0000
@@ -151,7 +151,7 @@ bool SharkNormalValue::is_jdouble() cons
 }
 bool SharkNormalValue::is_jobject() const
 {
-  return llvm_value()->getType() == SharkType::jobject_type();
+  return llvm_value()->getType() == SharkType::oop_type();
 }
 bool SharkNormalValue::is_jarray() const
 {
diff -r 3adabf9ea7ef -r 79079fb4d3b4 ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Wed Nov 11 10:34:05 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Wed Nov 11 13:52:48 2009 +0000
@@ -118,7 +118,7 @@ class SharkValue : public ResourceObj {
   }
   static SharkValue* create_jobject(llvm::Value* value, bool zero_checked)
   {
-    assert(value->getType() == SharkType::jobject_type(), "should be");
+    assert(value->getType() == SharkType::oop_type(), "should be");
     return create_generic(ciType::make(T_OBJECT), value, zero_checked);
   }
 


From gbenson at icedtea.classpath.org  Wed Nov 11 07:59:44 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 15:59:44 +0000
Subject: /hg/icedtea6: 2009-11-11  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.b3d03017bdef.1257955184.2873452341184383832@icedtea.classpath.org>

changeset b3d03017bdef in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b3d03017bdef
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 10:50:38 2009 -0500

	2009-11-11 Gary Benson <gbenson at redhat.com>

	 PR icedtea/324:
		* ports/hotspot/src/share/vm/shark/sharkValue.cpp
	(SharkNormalValue::jarray_value): Work around the above.


diffstat:

2 files changed, 9 insertions(+), 1 deletion(-)
ChangeLog                                       |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkValue.cpp |    4 +++-

diffs (27 lines):

diff -r 79079fb4d3b4 -r b3d03017bdef ChangeLog
--- a/ChangeLog	Wed Nov 11 13:52:48 2009 +0000
+++ b/ChangeLog	Wed Nov 11 10:50:38 2009 -0500
@@ -1,3 +1,9 @@ 2009-11-11  Gary Benson  <gbenson at redhat
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/324:
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp
+	(SharkNormalValue::jarray_value): Work around the above.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkType.hpp
diff -r 79079fb4d3b4 -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkValue.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 13:52:48 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 10:50:38 2009 -0500
@@ -220,7 +220,9 @@ Value* SharkNormalValue::jobject_value()
 }
 Value* SharkNormalValue::jarray_value() const
 {
-  assert(is_jarray(), "should be");
+  // XXX assert(is_jarray(), "should be");
+  // XXX http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=324
+  assert(is_jobject(), "should be");
   return llvm_value();
 }
 int SharkAddressValue::address_value() const


From gbenson at icedtea.classpath.org  Wed Nov 11 08:02:14 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 16:02:14 +0000
Subject: /hg/icedtea6: 2009-11-11  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.1ff24bb0fdf2.1257955334.2873452341184383832@icedtea.classpath.org>

changeset 1ff24bb0fdf2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1ff24bb0fdf2
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 16:06:45 2009 +0000

	2009-11-11 Gary Benson <gbenson at redhat.com>

	 * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
	(CppInterpreter::native_entry): Add invocation counting for
	non-synchronized native methods.

	 * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
	(SharedRuntime::generate_native_wrapper): Implemented.

	 * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
	(SharkFrame): Made friendly with SharkStack. Snubbed
	SharkFunction.

	 * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
	(SharkBuilder::SharkBuilder): Removed module argument.
	(SharkBuilder::_module): Removed. (SharkBuilder::module):
	Likewise.
	(SharkBuilder::check_special_condition_for_native_trans): New
	method. (SharkBuilder::CreateInlineOop): New method with
	jobject argument.
		* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::SharkBuilder): Removed module argument, and changed
	to use Shark context instead of global context.
	(SharkBuilder::make_type): Updated for new SharkType.
	(SharkBuilder::make_function): Use SharkContext for resolution.
	(SharkBuilder::check_special_condition_for_native_trans): New
	method. (SharkBuilder::CreateDump): Removed support for LLVM
	< 2.6. (SharkBuilder::CreateBlock): Likewise.
	(SharkBuilder::CreateInlineOop): Changed object argument type.

	 * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
	(SharkDecacher::oopmap_slot_munge): Defer to SharkStack method.
	(SharkDecacher::slot2reg): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
	(SharkDecacher::start_frame): Use new SharkStack code.
	(SharkDecacher::start_stack): Likewise.
	(SharkDecacher::process_pc_slot): Likewise.
	(SharkOSREntryCacher::process_monitor): Likewise.
	(SharkDecacher::write_value_to_frame): Likewise.
	(SharkCacher::read_value_from_frame): Likewise.

	 * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
	(SharkCodeBuffer::SharkCodeBuffer): Wrap a MacroAssembler
	instead of creating one along with a CodeBuffer.
	(SharkCodeBuffer::_cb): Removed. (SharkCodeBuffer::_cb):
	Likewise. (SharkCodeBuffer::inline_oop): Changed object
	argument type.

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
	(SharkCompiler::supports_native): Return true instead of false.
	(SharkCompiler::generate_native_wrapper): New method.
	(SharkCompiler::_module): Removed. (SharkCompiler::module):
	Likewise. (SharkCompiler::_normal_context): New field.
	(SharkCompiler::_native_context): Likewise.
	(SharkCompiler::_execution_engine_lock): Likewise.
	(SharkCompiler::context): New method.
	(SharkCompiler::execution_engine_lock): Likewise.
	(SharkCompiler::memory_manager): Added assertion.
	(SharkCompiler::execution_engine): Likewise.
	(SharkCompiler::compiler): New method.
	(SharkCompiler::generate_native_code): Likewise.
	(SharkCompiler::free_queued_methods): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Create the lock and the two
	contexts. Removed support for LLVM < 2.6.
	(SharkCompiler::compile_method): Create the HotSpot code buffer
	and macro assembler, and defer native code generation to new
	method SharkCompiler::generate_native_code().
	(SharkCompiler::generate_native_wrapper): New method.
	(SharkCompiler::generate_native_code): Likewise.
	(SharkCompiler::free_compiled_method): New implementation.
	(SharkCompiler::free_queued_methods): New method.

	 * ports/hotspot/src/share/vm/shark/sharkEntry.hpp
	(SharkEntry::_context): New field. (SharkEntry::context):
	New method. (SharkEntry::set_context): Likewise.

	 * ports/hotspot/src/share/vm/shark/sharkFunction.hpp
	(SharkFunction::build): Removed compiler argument.
	(SharkFunction::SharkFunction): Likewise.
	(SharkFunction::_stack): New field. (SharkFunction::stack):
	New method. (SharkFunction::CreateBlock): Removed support
	for LLVM < 2.6. (SharkFunction::_zero_stack_base): Removed.
	(SharkFunction::_zero_stack_pointer_addr): Likewise.
	(SharkFunction::_zero_frame_pointer_addr): Likewise.
	(SharkFunction::zero_stack_base): Likewise.
	(SharkFunction::zero_stack_pointer_addr): Likewise.
	(SharkFunction::zero_frame_pointer_addr): Likewise.
	(SharkFunction::CreateInitZeroStack): Likewise.
	(SharkFunction::CreateLoadZeroStackPointer): Likewise.
	(SharkFunction::CreateStoreZeroStackPointer): Likewise.
	(SharkFunction::CreateLoadZeroFramePointer): Likewise.
	(SharkFunction::CreateStoreZeroFramePointer): Likewise.
	(SharkFunction::CreateStackOverflowCheck): Likewise.
	(SharkFunction::CreatePushFrame): Likewise.
	(SharkFunction::CreatePopFrame): Likewise.
	(SharkFunction::_frame): Likewise.
	(SharkFunction::CreateAddressOfFrameEntry): Likewise.
	(SharkFunction::CreateBuildFrame): Likewise.
	(SharkFunction::_extended_frame_size): Likewise.
	(SharkFunction::_stack_slots_offset): Likewise.
	(SharkFunction::_monitors_slots_offset): Likewise.
	(SharkFunction::_oop_tmp_slot_offset): Likewise.
	(SharkFunction::_method_slot_offset): Likewise.
	(SharkFunction::_pc_slot_offset): Likewise.
	(SharkFunction::_locals_slots_offset): Likewise.
	(SharkFunction::extended_frame_size): Likewise.
	(SharkFunction::oopmap_frame_size): Likewise.
	(SharkFunction::stack_slots_offset): Likewise.
	(SharkFunction::monitors_slots_offset): Likewise.
	(SharkFunction::oop_tmp_slot_offset): Likewise.
	(SharkFunction::method_slot_offset): Likewise.
	(SharkFunction::pc_slot_offset): Likewise.
	(SharkFunction::locals_slots_offset): Likewise.
	(SharkFunction::monitor_offset): Likewise.
	(SharkFunction::monitor_object_offset): Likewise.
	(SharkFunction::monitor_header_offset): Likewise.
	(SharkFunction::monitor_addr): Likewise.
	(SharkFunction::monitor_object_addr): Likewise.
	(SharkFunction::monitor_header_addr): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
	(SharkFunction::initialize): Defer stack frame creation to new
	SharkStack code. (SharkFunction::CreateInitZeroStack):
	Removed. (SharkFunction::CreateStackOverflowCheck):
	Likewise. (SharkFunction::CreatePushFrame): Likewise.
	(SharkFunction::CreatePopFrame): Likewise.
	(SharkFunction::CreateBuildFrame): Likewise.
	(SharkFunction::CreateAddressOfFrameEntry): Likewise.

	 * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
	(SharkCompileInvariants::SharkCompileInvariants): Removed
	compiler argument.
	(SharkTargetInvariants::SharkTargetInvariants): Likewise.
	(SharkCompileInvariants::_compiler): Removed.
	(SharkCompileInvariants::env): Added assertion.

	 * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
	(SharkStateScanner::SharkStateScanner): Updated.
	(SharkStateScanner::_function): Removed.
	(SharkStateScanner::function): Likewise.
	(SharkStateScanner::_stack): New field.
	(SharkStateScanner::stack): New method.
		* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
	(SharkStateScanner::scan): Use new SharkStack code.

	 * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
	(SharkTopLevelBlock::stack): New method.
	(SharkTopLevelBlock::set_last_Java_frame): Removed.
	(SharkTopLevelBlock::reset_last_Java_frame): Likewise.
	(SharkTopLevelBlock::call_vm): Use new SharkStack code.
		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
	(SharkTopLevelBlock::handle_return): Likewise.
	(SharkTopLevelBlock::do_multianewarray): Likewise.
	(SharkTopLevelBlock::acquire_lock): Likewise.
	(SharkTopLevelBlock::release_lock): Likewise.

	 * ports/hotspot/src/share/vm/shark/sharkType.hpp:
	Defer everything to new SharkContext code.
		* ports/hotspot/src/share/vm/shark/sharkType.cpp: Removed.

	 * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
	Removed support for LLVM < 2.6.
		* ports/hotspot/src/share/vm/shark/llvmValue.hpp
	(LLVMValue::jfloat_constant): Likewise.
	(LLVMValue::jdouble_constant): Likewise.
	(LLVMValue::bit_constant): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
	(SharkBlock::parse_bytecode): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
		* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.

	 * ports/hotspot/src/share/vm/shark/sharkContext.hpp: New
	file.
		* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
		* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
		* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
		* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
		* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.

	 * ports/hotspot/src/share/vm/includeDB_shark: Updated.


diffstat:

32 files changed, 2162 insertions(+), 801 deletions(-)
ChangeLog                                               |  183 +++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp   |   14 
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp    |    7 
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp       |    4 
ports/hotspot/src/share/vm/includeDB_shark              |   58 ++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp        |    4 
ports/hotspot/src/share/vm/shark/llvmValue.hpp          |   18 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp         |   32 -
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp       |   48 --
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp       |   29 -
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp  |   24 -
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp  |    8 
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp    |   20 
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp      |  274 ++++++-----
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp      |   70 ++
ports/hotspot/src/share/vm/shark/sharkContext.cpp       |  185 +++++++
ports/hotspot/src/share/vm/shark/sharkContext.hpp       |  208 ++++++++
ports/hotspot/src/share/vm/shark/sharkEntry.hpp         |   11 
ports/hotspot/src/share/vm/shark/sharkFunction.cpp      |  155 ------
ports/hotspot/src/share/vm/shark/sharkFunction.hpp      |  178 -------
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp    |   35 -
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |    8 
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    5 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |  352 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp |  204 ++++++++
ports/hotspot/src/share/vm/shark/sharkStack.cpp         |  239 ++++++++++
ports/hotspot/src/share/vm/shark/sharkStack.hpp         |  292 ++++++++++++
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp  |   14 
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp  |    8 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |   18 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |   31 -
ports/hotspot/src/share/vm/shark/sharkType.hpp          |  227 +++------

diffs (truncated from 3780 to 500 lines):

diff -r b3d03017bdef -r 1ff24bb0fdf2 ChangeLog
--- a/ChangeLog	Wed Nov 11 10:50:38 2009 -0500
+++ b/ChangeLog	Wed Nov 11 16:06:45 2009 +0000
@@ -1,3 +1,186 @@ 2009-11-11  Gary Benson  <gbenson at redhat
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::native_entry): Add invocation counting for
+	non-synchronized native methods.
+
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+	(SharedRuntime::generate_native_wrapper): Implemented.
+
+	* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
+	(SharkFrame): Made friendly with SharkStack.  Snubbed
+	SharkFunction.
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+	(SharkBuilder::SharkBuilder): Removed module argument.
+	(SharkBuilder::_module): Removed.
+	(SharkBuilder::module): Likewise.
+	(SharkBuilder::check_special_condition_for_native_trans): New method.
+	(SharkBuilder::CreateInlineOop): New method with jobject argument.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::SharkBuilder): Removed module argument, and changed
+	to use Shark context instead of global context.
+	(SharkBuilder::make_type): Updated for new SharkType.
+	(SharkBuilder::make_function): Use SharkContext for resolution.
+	(SharkBuilder::check_special_condition_for_native_trans): New method.
+	(SharkBuilder::CreateDump): Removed support for LLVM < 2.6.
+	(SharkBuilder::CreateBlock): Likewise.
+	(SharkBuilder::CreateInlineOop): Changed object argument type.
+
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+	(SharkDecacher::oopmap_slot_munge): Defer to SharkStack method.
+	(SharkDecacher::slot2reg): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+	(SharkDecacher::start_frame): Use new SharkStack code.
+	(SharkDecacher::start_stack): Likewise.
+	(SharkDecacher::process_pc_slot): Likewise.
+	(SharkOSREntryCacher::process_monitor): Likewise.
+	(SharkDecacher::write_value_to_frame): Likewise.
+	(SharkCacher::read_value_from_frame): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
+	(SharkCodeBuffer::SharkCodeBuffer): Wrap a MacroAssembler
+	instead of creating one along with a CodeBuffer.
+	(SharkCodeBuffer::_cb): Removed.
+	(SharkCodeBuffer::_cb): Likewise.
+	(SharkCodeBuffer::inline_oop): Changed object argument type.
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+	(SharkCompiler::supports_native): Return true instead of false.
+	(SharkCompiler::generate_native_wrapper): New method.
+	(SharkCompiler::_module): Removed.
+	(SharkCompiler::module): Likewise.
+	(SharkCompiler::_normal_context): New field.
+	(SharkCompiler::_native_context): Likewise.
+	(SharkCompiler::_execution_engine_lock): Likewise.
+	(SharkCompiler::context): New method.
+	(SharkCompiler::execution_engine_lock): Likewise.
+	(SharkCompiler::memory_manager): Added assertion.
+	(SharkCompiler::execution_engine): Likewise.
+	(SharkCompiler::compiler): New method.
+	(SharkCompiler::generate_native_code): Likewise.
+	(SharkCompiler::free_queued_methods): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Create the lock and the two
+	contexts.  Removed support for LLVM < 2.6.
+	(SharkCompiler::compile_method): Create the HotSpot code buffer
+	and macro assembler, and defer native code generation to new
+	method SharkCompiler::generate_native_code().
+	(SharkCompiler::generate_native_wrapper): New method.
+	(SharkCompiler::generate_native_code): Likewise.
+	(SharkCompiler::free_compiled_method): New implementation.
+	(SharkCompiler::free_queued_methods): New method.
+
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+	(SharkEntry::_context): New field.
+	(SharkEntry::context): New method.
+	(SharkEntry::set_context): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+	(SharkFunction::build): Removed compiler argument.
+	(SharkFunction::SharkFunction): Likewise.
+	(SharkFunction::_stack): New field.
+	(SharkFunction::stack): New method.
+	(SharkFunction::CreateBlock): Removed support for LLVM < 2.6.
+	(SharkFunction::_zero_stack_base): Removed.
+	(SharkFunction::_zero_stack_pointer_addr): Likewise.
+	(SharkFunction::_zero_frame_pointer_addr): Likewise.
+	(SharkFunction::zero_stack_base): Likewise.
+	(SharkFunction::zero_stack_pointer_addr): Likewise.
+	(SharkFunction::zero_frame_pointer_addr): Likewise.
+	(SharkFunction::CreateInitZeroStack): Likewise.
+	(SharkFunction::CreateLoadZeroStackPointer): Likewise.
+	(SharkFunction::CreateStoreZeroStackPointer): Likewise.
+	(SharkFunction::CreateLoadZeroFramePointer): Likewise.
+	(SharkFunction::CreateStoreZeroFramePointer): Likewise.
+	(SharkFunction::CreateStackOverflowCheck): Likewise.
+	(SharkFunction::CreatePushFrame): Likewise.
+	(SharkFunction::CreatePopFrame): Likewise.
+	(SharkFunction::_frame): Likewise.
+	(SharkFunction::CreateAddressOfFrameEntry): Likewise.
+	(SharkFunction::CreateBuildFrame): Likewise.
+	(SharkFunction::_extended_frame_size): Likewise.
+	(SharkFunction::_stack_slots_offset): Likewise.
+	(SharkFunction::_monitors_slots_offset): Likewise.
+	(SharkFunction::_oop_tmp_slot_offset): Likewise.
+	(SharkFunction::_method_slot_offset): Likewise.
+	(SharkFunction::_pc_slot_offset): Likewise.
+	(SharkFunction::_locals_slots_offset): Likewise.
+	(SharkFunction::extended_frame_size): Likewise.
+	(SharkFunction::oopmap_frame_size): Likewise.
+	(SharkFunction::stack_slots_offset): Likewise.
+	(SharkFunction::monitors_slots_offset): Likewise.
+	(SharkFunction::oop_tmp_slot_offset): Likewise.
+	(SharkFunction::method_slot_offset): Likewise.
+	(SharkFunction::pc_slot_offset): Likewise.
+	(SharkFunction::locals_slots_offset): Likewise.
+	(SharkFunction::monitor_offset): Likewise.
+	(SharkFunction::monitor_object_offset): Likewise.
+	(SharkFunction::monitor_header_offset): Likewise.
+	(SharkFunction::monitor_addr): Likewise.
+	(SharkFunction::monitor_object_addr): Likewise.
+	(SharkFunction::monitor_header_addr): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::initialize): Defer stack frame creation to new
+	SharkStack code.
+	(SharkFunction::CreateInitZeroStack): Removed.
+	(SharkFunction::CreateStackOverflowCheck): Likewise.
+	(SharkFunction::CreatePushFrame): Likewise.
+	(SharkFunction::CreatePopFrame): Likewise.
+	(SharkFunction::CreateBuildFrame): Likewise.
+	(SharkFunction::CreateAddressOfFrameEntry): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
+	(SharkCompileInvariants::SharkCompileInvariants): Removed
+	compiler argument. 
+	(SharkTargetInvariants::SharkTargetInvariants): Likewise.
+	(SharkCompileInvariants::_compiler): Removed.
+	(SharkCompileInvariants::env): Added assertion.
+
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
+	(SharkStateScanner::SharkStateScanner): Updated.
+	(SharkStateScanner::_function): Removed.
+	(SharkStateScanner::function): Likewise.
+	(SharkStateScanner::_stack): New field.
+	(SharkStateScanner::stack): New method.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
+	(SharkStateScanner::scan): Use new SharkStack code.
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::stack): New method.
+	(SharkTopLevelBlock::set_last_Java_frame): Removed.
+	(SharkTopLevelBlock::reset_last_Java_frame): Likewise.
+	(SharkTopLevelBlock::call_vm): Use new SharkStack code.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::handle_return): Likewise.
+	(SharkTopLevelBlock::do_multianewarray): Likewise.
+	(SharkTopLevelBlock::acquire_lock): Likewise.
+	(SharkTopLevelBlock::release_lock): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp:
+	Defer everything to new SharkContext code.
+	* ports/hotspot/src/share/vm/shark/sharkType.cpp: Removed.
+	
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Removed support for LLVM < 2.6.
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(LLVMValue::jfloat_constant): Likewise.
+	(LLVMValue::jdouble_constant): Likewise.
+	(LLVMValue::bit_constant): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse_bytecode): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: New file.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+
+	* ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/324:
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Nov 11 16:06:45 2009 +0000
@@ -202,6 +202,20 @@ void CppInterpreter::native_entry(method
   if (stack_overflow_imminent(thread)) {
     CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
     goto unwind_and_return;
+  }
+
+  // Update the invocation counter
+  if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
+    thread->set_do_not_unlock();
+    InvocationCounter *counter = method->invocation_counter();
+    counter->increment();
+    if (counter->reached_InvocationLimit()) {
+      CALL_VM_NOCHECK(
+        InterpreterRuntime::frequency_counter_overflow(thread, NULL));
+      if (HAS_PENDING_EXCEPTION)
+        goto unwind_and_return;
+    }
+    thread->clr_do_not_unlock();
   }
 
   // Lock if necessary
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 11 16:06:45 2009 +0000
@@ -61,7 +61,14 @@ nmethod *SharedRuntime::generate_native_
                                                 BasicType *in_sig_bt,
                                                 VMRegPair *in_regs,
                                                 BasicType ret_type) {
+#ifdef SHARK
+  return SharkCompiler::compiler()->generate_native_wrapper(masm,
+                                                            method,
+                                                            in_sig_bt,
+                                                            ret_type);
+#else
   ShouldNotCallThis();
+#endif // SHARK
 }
 
 int Deoptimization::last_frame_adjust(int callee_parameters,
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp	Wed Nov 11 16:06:45 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
 // |  ...               |
 
 class SharkFrame : public ZeroFrame {
-  friend class SharkFunction;
+  friend class SharkStack;
 
  private:
   SharkFrame() : ZeroFrame() {
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Wed Nov 11 16:06:45 2009 +0000
@@ -48,6 +48,8 @@ ciTypeFlow.hpp                          
 ciTypeFlow.hpp                          ciKlass.hpp
 ciTypeFlow.hpp                          ciMethodBlocks.hpp
 
+cppInterpreter_<arch>.cpp               shark_globals.hpp
+
 compileBroker.cpp                       sharkCompiler.hpp
 
 globals.hpp                             shark_globals_<arch>.hpp
@@ -55,9 +57,13 @@ globals.cpp                             
 globals.cpp                             shark_globals.hpp
 
 llvmValue.hpp                           llvmHeaders.hpp
+llvmValue.hpp                           sharkContext.hpp
 llvmValue.hpp                           sharkType.hpp
 
 nmethod.cpp                             sharkCompiler.hpp
+
+sharedRuntime_<arch>.cpp                compileBroker.hpp
+sharedRuntime_<arch>.cpp                sharkCompiler.hpp
 
 shark_globals.cpp                       shark_globals.hpp
 
@@ -95,7 +101,7 @@ sharkBuilder.cpp                        
 sharkBuilder.cpp                        resourceArea.hpp
 sharkBuilder.cpp                        llvmHeaders.hpp
 sharkBuilder.cpp                        sharkBuilder.hpp
-sharkBuilder.cpp                        sharkCompiler.hpp
+sharkBuilder.cpp                        sharkContext.hpp
 sharkBuilder.cpp                        sharkRuntime.hpp
 sharkBuilder.cpp                        synchronizer.hpp
 sharkBuilder.cpp                        thread.hpp
@@ -108,7 +114,6 @@ sharkBuilder.hpp                        
 sharkBuilder.hpp                        llvmValue.hpp
 sharkBuilder.hpp                        sizes.hpp
 sharkBuilder.hpp                        sharkCodeBuffer.hpp
-sharkBuilder.hpp                        sharkCompiler.hpp
 sharkBuilder.hpp                        sharkType.hpp
 sharkBuilder.hpp                        sharkValue.hpp
 sharkBuilder.hpp                        sharkEntry.hpp
@@ -145,16 +150,29 @@ sharkCompiler.cpp                       
 sharkCompiler.cpp                       sharkBuilder.hpp
 sharkCompiler.cpp                       sharkCodeBuffer.hpp
 sharkCompiler.cpp                       sharkCompiler.hpp
+sharkCompiler.cpp                       sharkContext.hpp
 sharkCompiler.cpp                       sharkEntry.hpp
 sharkCompiler.cpp                       sharkFunction.hpp
 sharkCompiler.cpp                       sharkMemoryManager.hpp
+sharkCompiler.cpp                       sharkNativeWrapper.hpp
 
 sharkCompiler.hpp                       abstractCompiler.hpp
 sharkCompiler.hpp                       ciEnv.hpp
 sharkCompiler.hpp                       ciMethod.hpp
+sharkCompiler.hpp                       compileBroker.hpp
 sharkCompiler.hpp                       llvmHeaders.hpp
 sharkCompiler.hpp                       sharkMemoryManager.hpp
 
+sharkContext.cpp                        arrayOop.hpp
+sharkContext.cpp                        globalDefinitions.hpp
+sharkContext.cpp                        llvmHeaders.hpp
+sharkContext.cpp                        oop.hpp
+sharkContext.cpp                        sharkContext.hpp
+
+sharkContext.hpp                        llvmHeaders.hpp
+sharkContext.hpp                        sharkCompiler.hpp
+
+sharkConstant.cpp                       ciInstance.hpp
 sharkConstant.cpp                       ciStreams.hpp
 sharkConstant.cpp                       sharkBuilder.hpp
 sharkConstant.cpp                       sharkConstant.hpp
@@ -186,7 +204,9 @@ sharkFunction.hpp                       
 sharkFunction.hpp                       llvmHeaders.hpp
 sharkFunction.hpp                       llvmValue.hpp
 sharkFunction.hpp                       sharkBuilder.hpp
+sharkFunction.hpp                       sharkContext.hpp
 sharkFunction.hpp                       sharkInvariants.hpp
+sharkFunction.hpp                       sharkStack.hpp
 
 sharkInliner.cpp                        allocation.hpp
 sharkInliner.cpp                        bytecodes.hpp
@@ -229,8 +249,6 @@ sharkInvariants.hpp                     
 sharkInvariants.hpp                     dependencies.hpp
 sharkInvariants.hpp                     llvmHeaders.hpp
 sharkInvariants.hpp                     sharkBuilder.hpp
-sharkInvariants.hpp                     sharkCompiler.hpp
-sharkInvariants.hpp                     sharkMemoryManager.hpp
 
 sharkMemoryManager.hpp                  llvmHeaders.hpp
 sharkMemoryManager.hpp                  sharkEntry.hpp
@@ -238,6 +256,17 @@ sharkMemoryManager.cpp                  
 sharkMemoryManager.cpp                  llvmHeaders.hpp
 sharkMemoryManager.cpp                  sharkEntry.hpp
 sharkMemoryManager.cpp                  sharkMemoryManager.hpp
+
+sharkNativeWrapper.cpp                  llvmHeaders.hpp
+sharkNativeWrapper.cpp                  sharkNativeWrapper.hpp
+sharkNativeWrapper.cpp                  sharkType.hpp
+
+sharkNativeWrapper.hpp                  handles.hpp
+sharkNativeWrapper.hpp                  llvmHeaders.hpp
+sharkNativeWrapper.hpp                  sharkBuilder.hpp
+sharkNativeWrapper.hpp                  sharkContext.hpp
+sharkNativeWrapper.hpp                  sharkInvariants.hpp
+sharkNativeWrapper.hpp                  sharkStack.hpp
 
 sharkRuntime.cpp                        biasedLocking.hpp
 sharkRuntime.cpp                        deoptimization.hpp
@@ -248,8 +277,19 @@ sharkRuntime.cpp                        
 
 sharkRuntime.hpp                        allocation.hpp
 sharkRuntime.hpp                        llvmHeaders.hpp
+sharkRuntime.hpp                        llvmValue.hpp
 sharkRuntime.hpp                        klassOop.hpp
 sharkRuntime.hpp                        thread.hpp
+
+sharkStack.cpp                          llvmHeaders.hpp
+sharkStack.cpp                          sharkFunction.hpp
+sharkStack.cpp                          sharkNativeWrapper.hpp
+sharkStack.cpp                          sharkStack.hpp
+sharkStack.cpp                          sharkType.hpp
+
+sharkStack.hpp                          llvmHeaders.hpp
+sharkStack.hpp                          sharkInvariants.hpp
+sharkStack.hpp                          sharkType.hpp
 
 sharkState.cpp                          allocation.hpp
 sharkState.cpp                          ciType.hpp
@@ -279,6 +319,8 @@ sharkTopLevelBlock.cpp                  
 sharkTopLevelBlock.cpp                  allocation.hpp
 sharkTopLevelBlock.cpp                  bytecodes.hpp
 sharkTopLevelBlock.cpp                  ciField.hpp
+sharkTopLevelBlock.cpp                  ciInstance.hpp
+sharkTopLevelBlock.cpp                  ciObjArrayKlass.hpp
 sharkTopLevelBlock.cpp                  ciStreams.hpp
 sharkTopLevelBlock.cpp                  ciType.hpp
 sharkTopLevelBlock.cpp                  ciTypeFlow.hpp
@@ -307,17 +349,11 @@ sharkTopLevelBlock.hpp                  
 sharkTopLevelBlock.hpp                  sharkState.hpp
 sharkTopLevelBlock.hpp                  sharkValue.hpp
 
-sharkType.cpp                           arrayOop.hpp
-sharkType.cpp                           globalDefinitions.hpp
-sharkType.cpp                           llvmHeaders.hpp
-sharkType.cpp                           oop.hpp
-sharkType.cpp                           sharkEntry.hpp
-sharkType.cpp                           sharkType.hpp
-
 sharkType.hpp                           allocation.hpp
 sharkType.hpp                           ciType.hpp
 sharkType.hpp                           globalDefinitions.hpp
 sharkType.hpp                           llvmHeaders.hpp
+sharkType.hpp                           sharkContext.hpp
 
 sharkValue.cpp                          ciType.hpp
 sharkValue.cpp                          llvmHeaders.hpp
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Nov 11 16:06:45 2009 +0000
@@ -32,16 +32,12 @@
 #include <llvm/DerivedTypes.h>
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
 #include <llvm/Instructions.h>
-#if SHARK_LLVM_VERSION >= 26
 #include <llvm/LLVMContext.h>
-#endif
 #include <llvm/Module.h>
 #include <llvm/ModuleProvider.h>
 #include <llvm/Support/IRBuilder.h>
-#if SHARK_LLVM_VERSION >= 26
 #include <llvm/System/Threading.h>
 #include <llvm/Target/TargetSelect.h>
-#endif
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
 #if SHARK_LLVM_VERSION < 27
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 16:06:45 2009 +0000
@@ -39,19 +39,11 @@ class LLVMValue : public AllStatic {
   }
   static llvm::ConstantFP* jfloat_constant(jfloat value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantFP::get(llvm::getGlobalContext(), llvm::APFloat(value));
-#else
-    return llvm::ConstantFP::get(SharkType::jfloat_type(), value);
-#endif
+    return llvm::ConstantFP::get(SharkContext::current(), llvm::APFloat(value));
   }
   static llvm::ConstantFP* jdouble_constant(jdouble value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantFP::get(llvm::getGlobalContext(), llvm::APFloat(value));
-#else
-    return llvm::ConstantFP::get(SharkType::jdouble_type(), value);
-#endif
+    return llvm::ConstantFP::get(SharkContext::current(), llvm::APFloat(value));
   }
   static llvm::ConstantPointerNull* null()
   {
@@ -61,11 +53,7 @@ class LLVMValue : public AllStatic {
  public:
   static llvm::ConstantInt* bit_constant(int value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantInt::get(llvm::Type::getInt1Ty(llvm::getGlobalContext()), value, false);
-#else
-    return llvm::ConstantInt::get(llvm::Type::Int1Ty, value, false);
-#endif
+    return llvm::ConstantInt::get(SharkType::bit_type(), value, false);
   }
   static llvm::ConstantInt* intptr_constant(intptr_t value)
   {
diff -r b3d03017bdef -r 1ff24bb0fdf2 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Wed Nov 11 16:06:45 2009 +0000
@@ -532,31 +532,19 @@ void SharkBlock::parse_bytecode(int star
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFAdd(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateAdd(a->jfloat_value(), b->jfloat_value())));
-#endif
       break;
     case Bytecodes::_fsub:
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFSub(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateSub(a->jfloat_value(), b->jfloat_value())));
-#endif
       break;
     case Bytecodes::_fmul:
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFMul(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateMul(a->jfloat_value(), b->jfloat_value())));
-#endif


From gbenson at icedtea.classpath.org  Wed Nov 11 08:04:15 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 11 Nov 2009 16:04:15 +0000
Subject: /hg/icedtea6: Missed from previous commit
Message-ID: <hg.b412bab45028.1257955455.2873452341184383832@icedtea.classpath.org>

changeset b412bab45028 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b412bab45028
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 11 16:08:49 2009 +0000

	Missed from previous commit


diffstat:

1 file changed, 180 deletions(-)
ports/hotspot/src/share/vm/shark/sharkType.cpp |  180 ------------------------

diffs (184 lines):

diff -r 1ff24bb0fdf2 -r b412bab45028 ports/hotspot/src/share/vm/shark/sharkType.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 16:06:45 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-#include "incls/_precompiled.incl"
-#include "incls/_sharkType.cpp.incl"
-
-using namespace llvm;
-
-const PointerType*  SharkType::_cpCacheEntry_type;
-const FunctionType* SharkType::_entry_point_type;
-const FunctionType* SharkType::_osr_entry_point_type;
-const PointerType*  SharkType::_itableOffsetEntry_type;
-const PointerType*  SharkType::_klass_type;
-const PointerType*  SharkType::_methodOop_type;
-const ArrayType*    SharkType::_monitor_type;
-const PointerType*  SharkType::_oop_type;
-const PointerType*  SharkType::_thread_type;
-const PointerType*  SharkType::_zeroStack_type;
-
-const Type* SharkType::_to_stackType_tab[T_CONFLICT + 1];
-const Type* SharkType::_to_arrayType_tab[T_CONFLICT + 1];
-
-void SharkType::initialize()
-{
-  // VM types
-  _cpCacheEntry_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(ConstantPoolCacheEntry)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(ConstantPoolCacheEntry)));
-#endif
-
-  _itableOffsetEntry_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), itableOffsetEntry::size() * wordSize));
-#else
-    ArrayType::get(Type::Int8Ty, itableOffsetEntry::size() * wordSize));
-#endif
-
-  _klass_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(Klass)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(Klass)));
-#endif
-
-  _methodOop_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(methodOopDesc)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(methodOopDesc)));
-#endif
-
-  _monitor_type = ArrayType::get(
-#if SHARK_LLVM_VERSION >= 26
-      Type::getInt8Ty(getGlobalContext()),
-#else
-      Type::Int8Ty,
-#endif
-      frame::interpreter_frame_monitor_size() * wordSize);
-
-  _oop_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(oopDesc)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(oopDesc)));
-#endif
-
-  _thread_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(JavaThread)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(JavaThread)));
-#endif
-
-  _zeroStack_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(ZeroStack)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(ZeroStack)));
-#endif
-
-  std::vector<const Type*> params;
-  params.push_back(methodOop_type());
-  params.push_back(intptr_type());
-  params.push_back(thread_type());
-#if SHARK_LLVM_VERSION >= 26
-  _entry_point_type = FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false);
-#else
-  _entry_point_type = FunctionType::get(Type::VoidTy, params, false);
-#endif
-
-  params.clear();
-  params.push_back(methodOop_type());
-  params.push_back(PointerType::getUnqual(jbyte_type()));
-  params.push_back(intptr_type());
-  params.push_back(thread_type());
-#if SHARK_LLVM_VERSION >= 26
-  _osr_entry_point_type = FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false);
-#else
-  _osr_entry_point_type = FunctionType::get(Type::VoidTy, params, false);
-#endif
-
-  // Java types a) on the stack and in fields, and b) in arrays
-  for (int i = 0; i < T_CONFLICT + 1; i++) {
-    switch (i) {
-    case T_BOOLEAN:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jboolean_type();
-      break;
-      
-    case T_BYTE:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jbyte_type();
-      break;
-
-    case T_CHAR:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jchar_type();
-      break;
-
-    case T_SHORT:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jshort_type();
-      break;
-
-    case T_INT:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jint_type();
-      break;
-
-    case T_LONG:
-      _to_stackType_tab[i] = jlong_type();
-      _to_arrayType_tab[i] = jlong_type();
-      break;
-
-    case T_FLOAT:
-      _to_stackType_tab[i] = jfloat_type();
-      _to_arrayType_tab[i] = jfloat_type();
-      break;
-
-    case T_DOUBLE:
-      _to_stackType_tab[i] = jdouble_type();
-      _to_arrayType_tab[i] = jdouble_type();
-      break;
-
-    case T_OBJECT:
-    case T_ARRAY:
-      _to_stackType_tab[i] = oop_type();
-      _to_arrayType_tab[i] = oop_type();
-      break;
-
-    case T_ADDRESS:
-      _to_stackType_tab[i] = intptr_type();
-      break;
-    }
-  }
-}


From gbenson at redhat.com  Wed Nov 11 08:20:54 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 16:20:54 +0000
Subject: Workaround for PR icedtea/324
Message-ID: <20091111162054.GI3256@redhat.com>

Hi all,

This commit works around $SUBJECT.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 79079fb4d3b4 -r b3d03017bdef ChangeLog
--- a/ChangeLog	Wed Nov 11 13:52:48 2009 +0000
+++ b/ChangeLog	Wed Nov 11 10:50:38 2009 -0500
@@ -1,3 +1,9 @@
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/324:
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp
+	(SharkNormalValue::jarray_value): Work around the above.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkType.hpp
diff -r 79079fb4d3b4 -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkValue.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 13:52:48 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.cpp	Wed Nov 11 10:50:38 2009 -0500
@@ -220,7 +220,9 @@
 }
 Value* SharkNormalValue::jarray_value() const
 {
-  assert(is_jarray(), "should be");
+  // XXX assert(is_jarray(), "should be");
+  // XXX http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=324
+  assert(is_jobject(), "should be");
   return llvm_value();
 }
 int SharkAddressValue::address_value() const

From gnu_andrew at member.fsf.org  Wed Nov 11 08:23:00 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 11 Nov 2009 16:23:00 +0000
Subject: Workaround for PR icedtea/324
In-Reply-To: <20091111162054.GI3256@redhat.com>
References: <20091111162054.GI3256@redhat.com>
Message-ID: <17c6771e0911110823h4ceb5b43v1c465f3dcb29a8ec@mail.gmail.com>

2009/11/11 Gary Benson <gbenson at redhat.com>:
> Hi all,
>
> This commit works around $SUBJECT.
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

Haha, I like the brevity ;)
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gbenson at redhat.com  Wed Nov 11 08:29:17 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 16:29:17 +0000
Subject: Workaround for PR icedtea/324
In-Reply-To: <17c6771e0911110823h4ceb5b43v1c465f3dcb29a8ec@mail.gmail.com>
References: <20091111162054.GI3256@redhat.com>
	<17c6771e0911110823h4ceb5b43v1c465f3dcb29a8ec@mail.gmail.com>
Message-ID: <20091111162917.GK3256@redhat.com>

Andrew John Hughes wrote:
> 2009/11/11 Gary Benson <gbenson at redhat.com>:
> > This commit works around $SUBJECT.
> 
> Haha, I like the brevity ;)

I've written a lot of emails today ;)

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Wed Nov 11 08:38:39 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 16:38:39 +0000
Subject: Native method wrapper generation
Message-ID: <20091111163839.GL3256@redhat.com>

Hi all,

This commit adds native wrapper generation to Shark.  It also removes
support for LLVM < 2.6, because the new code requires it.  I'll write
this up in more detail tomorrow with some benchmarks.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r b3d03017bdef ChangeLog
--- a/ChangeLog	Wed Nov 11 10:50:38 2009 -0500
+++ b/ChangeLog	Wed Nov 11 16:21:16 2009 +0000
@@ -1,3 +1,186 @@
+2009-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::native_entry): Add invocation counting for
+	non-synchronized native methods.
+
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+	(SharedRuntime::generate_native_wrapper): Implemented.
+
+	* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
+	(SharkFrame): Made friendly with SharkStack.  Snubbed
+	SharkFunction.
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+	(SharkBuilder::SharkBuilder): Removed module argument.
+	(SharkBuilder::_module): Removed.
+	(SharkBuilder::module): Likewise.
+	(SharkBuilder::check_special_condition_for_native_trans): New method.
+	(SharkBuilder::CreateInlineOop): New method with jobject argument.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::SharkBuilder): Removed module argument, and changed
+	to use Shark context instead of global context.
+	(SharkBuilder::make_type): Updated for new SharkType.
+	(SharkBuilder::make_function): Use SharkContext for resolution.
+	(SharkBuilder::check_special_condition_for_native_trans): New method.
+	(SharkBuilder::CreateDump): Removed support for LLVM < 2.6.
+	(SharkBuilder::CreateBlock): Likewise.
+	(SharkBuilder::CreateInlineOop): Changed object argument type.
+
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+	(SharkDecacher::oopmap_slot_munge): Defer to SharkStack method.
+	(SharkDecacher::slot2reg): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+	(SharkDecacher::start_frame): Use new SharkStack code.
+	(SharkDecacher::start_stack): Likewise.
+	(SharkDecacher::process_pc_slot): Likewise.
+	(SharkOSREntryCacher::process_monitor): Likewise.
+	(SharkDecacher::write_value_to_frame): Likewise.
+	(SharkCacher::read_value_from_frame): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
+	(SharkCodeBuffer::SharkCodeBuffer): Wrap a MacroAssembler
+	instead of creating one along with a CodeBuffer.
+	(SharkCodeBuffer::_cb): Removed.
+	(SharkCodeBuffer::_cb): Likewise.
+	(SharkCodeBuffer::inline_oop): Changed object argument type.
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
+	(SharkCompiler::supports_native): Return true instead of false.
+	(SharkCompiler::generate_native_wrapper): New method.
+	(SharkCompiler::_module): Removed.
+	(SharkCompiler::module): Likewise.
+	(SharkCompiler::_normal_context): New field.
+	(SharkCompiler::_native_context): Likewise.
+	(SharkCompiler::_execution_engine_lock): Likewise.
+	(SharkCompiler::context): New method.
+	(SharkCompiler::execution_engine_lock): Likewise.
+	(SharkCompiler::memory_manager): Added assertion.
+	(SharkCompiler::execution_engine): Likewise.
+	(SharkCompiler::compiler): New method.
+	(SharkCompiler::generate_native_code): Likewise.
+	(SharkCompiler::free_queued_methods): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Create the lock and the two
+	contexts.  Removed support for LLVM < 2.6.
+	(SharkCompiler::compile_method): Create the HotSpot code buffer
+	and macro assembler, and defer native code generation to new
+	method SharkCompiler::generate_native_code().
+	(SharkCompiler::generate_native_wrapper): New method.
+	(SharkCompiler::generate_native_code): Likewise.
+	(SharkCompiler::free_compiled_method): New implementation.
+	(SharkCompiler::free_queued_methods): New method.
+
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp
+	(SharkEntry::_context): New field.
+	(SharkEntry::context): New method.
+	(SharkEntry::set_context): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+	(SharkFunction::build): Removed compiler argument.
+	(SharkFunction::SharkFunction): Likewise.
+	(SharkFunction::_stack): New field.
+	(SharkFunction::stack): New method.
+	(SharkFunction::CreateBlock): Removed support for LLVM < 2.6.
+	(SharkFunction::_zero_stack_base): Removed.
+	(SharkFunction::_zero_stack_pointer_addr): Likewise.
+	(SharkFunction::_zero_frame_pointer_addr): Likewise.
+	(SharkFunction::zero_stack_base): Likewise.
+	(SharkFunction::zero_stack_pointer_addr): Likewise.
+	(SharkFunction::zero_frame_pointer_addr): Likewise.
+	(SharkFunction::CreateInitZeroStack): Likewise.
+	(SharkFunction::CreateLoadZeroStackPointer): Likewise.
+	(SharkFunction::CreateStoreZeroStackPointer): Likewise.
+	(SharkFunction::CreateLoadZeroFramePointer): Likewise.
+	(SharkFunction::CreateStoreZeroFramePointer): Likewise.
+	(SharkFunction::CreateStackOverflowCheck): Likewise.
+	(SharkFunction::CreatePushFrame): Likewise.
+	(SharkFunction::CreatePopFrame): Likewise.
+	(SharkFunction::_frame): Likewise.
+	(SharkFunction::CreateAddressOfFrameEntry): Likewise.
+	(SharkFunction::CreateBuildFrame): Likewise.
+	(SharkFunction::_extended_frame_size): Likewise.
+	(SharkFunction::_stack_slots_offset): Likewise.
+	(SharkFunction::_monitors_slots_offset): Likewise.
+	(SharkFunction::_oop_tmp_slot_offset): Likewise.
+	(SharkFunction::_method_slot_offset): Likewise.
+	(SharkFunction::_pc_slot_offset): Likewise.
+	(SharkFunction::_locals_slots_offset): Likewise.
+	(SharkFunction::extended_frame_size): Likewise.
+	(SharkFunction::oopmap_frame_size): Likewise.
+	(SharkFunction::stack_slots_offset): Likewise.
+	(SharkFunction::monitors_slots_offset): Likewise.
+	(SharkFunction::oop_tmp_slot_offset): Likewise.
+	(SharkFunction::method_slot_offset): Likewise.
+	(SharkFunction::pc_slot_offset): Likewise.
+	(SharkFunction::locals_slots_offset): Likewise.
+	(SharkFunction::monitor_offset): Likewise.
+	(SharkFunction::monitor_object_offset): Likewise.
+	(SharkFunction::monitor_header_offset): Likewise.
+	(SharkFunction::monitor_addr): Likewise.
+	(SharkFunction::monitor_object_addr): Likewise.
+	(SharkFunction::monitor_header_addr): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::initialize): Defer stack frame creation to new
+	SharkStack code.
+	(SharkFunction::CreateInitZeroStack): Removed.
+	(SharkFunction::CreateStackOverflowCheck): Likewise.
+	(SharkFunction::CreatePushFrame): Likewise.
+	(SharkFunction::CreatePopFrame): Likewise.
+	(SharkFunction::CreateBuildFrame): Likewise.
+	(SharkFunction::CreateAddressOfFrameEntry): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
+	(SharkCompileInvariants::SharkCompileInvariants): Removed
+	compiler argument. 
+	(SharkTargetInvariants::SharkTargetInvariants): Likewise.
+	(SharkCompileInvariants::_compiler): Removed.
+	(SharkCompileInvariants::env): Added assertion.
+
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
+	(SharkStateScanner::SharkStateScanner): Updated.
+	(SharkStateScanner::_function): Removed.
+	(SharkStateScanner::function): Likewise.
+	(SharkStateScanner::_stack): New field.
+	(SharkStateScanner::stack): New method.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
+	(SharkStateScanner::scan): Use new SharkStack code.
+
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
+	(SharkTopLevelBlock::stack): New method.
+	(SharkTopLevelBlock::set_last_Java_frame): Removed.
+	(SharkTopLevelBlock::reset_last_Java_frame): Likewise.
+	(SharkTopLevelBlock::call_vm): Use new SharkStack code.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::handle_return): Likewise.
+	(SharkTopLevelBlock::do_multianewarray): Likewise.
+	(SharkTopLevelBlock::acquire_lock): Likewise.
+	(SharkTopLevelBlock::release_lock): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp:
+	Defer everything to new SharkContext code.
+	* ports/hotspot/src/share/vm/shark/sharkType.cpp: Removed.
+	
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Removed support for LLVM < 2.6.
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
+	(LLVMValue::jfloat_constant): Likewise.
+	(LLVMValue::jdouble_constant): Likewise.
+	(LLVMValue::bit_constant): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse_bytecode): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: New file.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+
+	* ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/324:
diff -r b3d03017bdef ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -204,6 +204,20 @@
     goto unwind_and_return;
   }
 
+  // Update the invocation counter
+  if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) {
+    thread->set_do_not_unlock();
+    InvocationCounter *counter = method->invocation_counter();
+    counter->increment();
+    if (counter->reached_InvocationLimit()) {
+      CALL_VM_NOCHECK(
+        InterpreterRuntime::frequency_counter_overflow(thread, NULL));
+      if (HAS_PENDING_EXCEPTION)
+        goto unwind_and_return;
+    }
+    thread->clr_do_not_unlock();
+  }
+
   // Lock if necessary
   BasicObjectLock *monitor;
   monitor = NULL;
diff -r b3d03017bdef ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -61,7 +61,14 @@
                                                 BasicType *in_sig_bt,
                                                 VMRegPair *in_regs,
                                                 BasicType ret_type) {
+#ifdef SHARK
+  return SharkCompiler::compiler()->generate_native_wrapper(masm,
+                                                            method,
+                                                            in_sig_bt,
+                                                            ret_type);
+#else
   ShouldNotCallThis();
+#endif // SHARK
 }
 
 int Deoptimization::last_frame_adjust(int callee_parameters,
diff -r b3d03017bdef ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
 // |  ...               |
 
 class SharkFrame : public ZeroFrame {
-  friend class SharkFunction;
+  friend class SharkStack;
 
  private:
   SharkFrame() : ZeroFrame() {
diff -r b3d03017bdef ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Wed Nov 11 16:21:16 2009 +0000
@@ -48,6 +48,8 @@
 ciTypeFlow.hpp                          ciKlass.hpp
 ciTypeFlow.hpp                          ciMethodBlocks.hpp
 
+cppInterpreter_<arch>.cpp               shark_globals.hpp
+
 compileBroker.cpp                       sharkCompiler.hpp
 
 globals.hpp                             shark_globals_<arch>.hpp
@@ -55,10 +57,14 @@
 globals.cpp                             shark_globals.hpp
 
 llvmValue.hpp                           llvmHeaders.hpp
+llvmValue.hpp                           sharkContext.hpp
 llvmValue.hpp                           sharkType.hpp
 
 nmethod.cpp                             sharkCompiler.hpp
 
+sharedRuntime_<arch>.cpp                compileBroker.hpp
+sharedRuntime_<arch>.cpp                sharkCompiler.hpp
+
 shark_globals.cpp                       shark_globals.hpp
 
 shark_globals.hpp                       shark_globals_<arch>.hpp
@@ -95,7 +101,7 @@
 sharkBuilder.cpp                        resourceArea.hpp
 sharkBuilder.cpp                        llvmHeaders.hpp
 sharkBuilder.cpp                        sharkBuilder.hpp
-sharkBuilder.cpp                        sharkCompiler.hpp
+sharkBuilder.cpp                        sharkContext.hpp
 sharkBuilder.cpp                        sharkRuntime.hpp
 sharkBuilder.cpp                        synchronizer.hpp
 sharkBuilder.cpp                        thread.hpp
@@ -108,7 +114,6 @@
 sharkBuilder.hpp                        llvmValue.hpp
 sharkBuilder.hpp                        sizes.hpp
 sharkBuilder.hpp                        sharkCodeBuffer.hpp
-sharkBuilder.hpp                        sharkCompiler.hpp
 sharkBuilder.hpp                        sharkType.hpp
 sharkBuilder.hpp                        sharkValue.hpp
 sharkBuilder.hpp                        sharkEntry.hpp
@@ -145,16 +150,29 @@
 sharkCompiler.cpp                       sharkBuilder.hpp
 sharkCompiler.cpp                       sharkCodeBuffer.hpp
 sharkCompiler.cpp                       sharkCompiler.hpp
+sharkCompiler.cpp                       sharkContext.hpp
 sharkCompiler.cpp                       sharkEntry.hpp
 sharkCompiler.cpp                       sharkFunction.hpp
 sharkCompiler.cpp                       sharkMemoryManager.hpp
+sharkCompiler.cpp                       sharkNativeWrapper.hpp
 
 sharkCompiler.hpp                       abstractCompiler.hpp
 sharkCompiler.hpp                       ciEnv.hpp
 sharkCompiler.hpp                       ciMethod.hpp
+sharkCompiler.hpp                       compileBroker.hpp
 sharkCompiler.hpp                       llvmHeaders.hpp
 sharkCompiler.hpp                       sharkMemoryManager.hpp
 
+sharkContext.cpp                        arrayOop.hpp
+sharkContext.cpp                        globalDefinitions.hpp
+sharkContext.cpp                        llvmHeaders.hpp
+sharkContext.cpp                        oop.hpp
+sharkContext.cpp                        sharkContext.hpp
+
+sharkContext.hpp                        llvmHeaders.hpp
+sharkContext.hpp                        sharkCompiler.hpp
+
+sharkConstant.cpp                       ciInstance.hpp
 sharkConstant.cpp                       ciStreams.hpp
 sharkConstant.cpp                       sharkBuilder.hpp
 sharkConstant.cpp                       sharkConstant.hpp
@@ -186,7 +204,9 @@
 sharkFunction.hpp                       llvmHeaders.hpp
 sharkFunction.hpp                       llvmValue.hpp
 sharkFunction.hpp                       sharkBuilder.hpp
+sharkFunction.hpp                       sharkContext.hpp
 sharkFunction.hpp                       sharkInvariants.hpp
+sharkFunction.hpp                       sharkStack.hpp
 
 sharkInliner.cpp                        allocation.hpp
 sharkInliner.cpp                        bytecodes.hpp
@@ -229,8 +249,6 @@
 sharkInvariants.hpp                     dependencies.hpp
 sharkInvariants.hpp                     llvmHeaders.hpp
 sharkInvariants.hpp                     sharkBuilder.hpp
-sharkInvariants.hpp                     sharkCompiler.hpp
-sharkInvariants.hpp                     sharkMemoryManager.hpp
 
 sharkMemoryManager.hpp                  llvmHeaders.hpp
 sharkMemoryManager.hpp                  sharkEntry.hpp
@@ -239,6 +257,17 @@
 sharkMemoryManager.cpp                  sharkEntry.hpp
 sharkMemoryManager.cpp                  sharkMemoryManager.hpp
 
+sharkNativeWrapper.cpp                  llvmHeaders.hpp
+sharkNativeWrapper.cpp                  sharkNativeWrapper.hpp
+sharkNativeWrapper.cpp                  sharkType.hpp
+
+sharkNativeWrapper.hpp                  handles.hpp
+sharkNativeWrapper.hpp                  llvmHeaders.hpp
+sharkNativeWrapper.hpp                  sharkBuilder.hpp
+sharkNativeWrapper.hpp                  sharkContext.hpp
+sharkNativeWrapper.hpp                  sharkInvariants.hpp
+sharkNativeWrapper.hpp                  sharkStack.hpp
+
 sharkRuntime.cpp                        biasedLocking.hpp
 sharkRuntime.cpp                        deoptimization.hpp
 sharkRuntime.cpp                        llvmHeaders.hpp
@@ -248,9 +277,20 @@
 
 sharkRuntime.hpp                        allocation.hpp
 sharkRuntime.hpp                        llvmHeaders.hpp
+sharkRuntime.hpp                        llvmValue.hpp
 sharkRuntime.hpp                        klassOop.hpp
 sharkRuntime.hpp                        thread.hpp
 
+sharkStack.cpp                          llvmHeaders.hpp
+sharkStack.cpp                          sharkFunction.hpp
+sharkStack.cpp                          sharkNativeWrapper.hpp
+sharkStack.cpp                          sharkStack.hpp
+sharkStack.cpp                          sharkType.hpp
+
+sharkStack.hpp                          llvmHeaders.hpp
+sharkStack.hpp                          sharkInvariants.hpp
+sharkStack.hpp                          sharkType.hpp
+
 sharkState.cpp                          allocation.hpp
 sharkState.cpp                          ciType.hpp
 sharkState.cpp                          ciTypeFlow.hpp
@@ -279,6 +319,8 @@
 sharkTopLevelBlock.cpp                  allocation.hpp
 sharkTopLevelBlock.cpp                  bytecodes.hpp
 sharkTopLevelBlock.cpp                  ciField.hpp
+sharkTopLevelBlock.cpp                  ciInstance.hpp
+sharkTopLevelBlock.cpp                  ciObjArrayKlass.hpp
 sharkTopLevelBlock.cpp                  ciStreams.hpp
 sharkTopLevelBlock.cpp                  ciType.hpp
 sharkTopLevelBlock.cpp                  ciTypeFlow.hpp
@@ -307,17 +349,11 @@
 sharkTopLevelBlock.hpp                  sharkState.hpp
 sharkTopLevelBlock.hpp                  sharkValue.hpp
 
-sharkType.cpp                           arrayOop.hpp
-sharkType.cpp                           globalDefinitions.hpp
-sharkType.cpp                           llvmHeaders.hpp
-sharkType.cpp                           oop.hpp
-sharkType.cpp                           sharkEntry.hpp
-sharkType.cpp                           sharkType.hpp
-
 sharkType.hpp                           allocation.hpp
 sharkType.hpp                           ciType.hpp
 sharkType.hpp                           globalDefinitions.hpp
 sharkType.hpp                           llvmHeaders.hpp
+sharkType.hpp                           sharkContext.hpp
 
 sharkValue.cpp                          ciType.hpp
 sharkValue.cpp                          llvmHeaders.hpp
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -32,16 +32,12 @@
 #include <llvm/DerivedTypes.h>
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
 #include <llvm/Instructions.h>
-#if SHARK_LLVM_VERSION >= 26
 #include <llvm/LLVMContext.h>
-#endif
 #include <llvm/Module.h>
 #include <llvm/ModuleProvider.h>
 #include <llvm/Support/IRBuilder.h>
-#if SHARK_LLVM_VERSION >= 26
 #include <llvm/System/Threading.h>
 #include <llvm/Target/TargetSelect.h>
-#endif
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
 #if SHARK_LLVM_VERSION < 27
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmValue.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -39,19 +39,11 @@
   }
   static llvm::ConstantFP* jfloat_constant(jfloat value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantFP::get(llvm::getGlobalContext(), llvm::APFloat(value));
-#else
-    return llvm::ConstantFP::get(SharkType::jfloat_type(), value);
-#endif
+    return llvm::ConstantFP::get(SharkContext::current(), llvm::APFloat(value));
   }
   static llvm::ConstantFP* jdouble_constant(jdouble value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantFP::get(llvm::getGlobalContext(), llvm::APFloat(value));
-#else
-    return llvm::ConstantFP::get(SharkType::jdouble_type(), value);
-#endif
+    return llvm::ConstantFP::get(SharkContext::current(), llvm::APFloat(value));
   }
   static llvm::ConstantPointerNull* null()
   {
@@ -61,11 +53,7 @@
  public:
   static llvm::ConstantInt* bit_constant(int value)
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::ConstantInt::get(llvm::Type::getInt1Ty(llvm::getGlobalContext()), value, false);
-#else
-    return llvm::ConstantInt::get(llvm::Type::Int1Ty, value, false);
-#endif
+    return llvm::ConstantInt::get(SharkType::bit_type(), value, false);
   }
   static llvm::ConstantInt* intptr_constant(intptr_t value)
   {
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -532,31 +532,19 @@
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFAdd(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateAdd(a->jfloat_value(), b->jfloat_value())));
-#endif
       break;
     case Bytecodes::_fsub:
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFSub(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateSub(a->jfloat_value(), b->jfloat_value())));
-#endif
       break;
     case Bytecodes::_fmul:
       b = pop();
       a = pop();
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFMul(a->jfloat_value(), b->jfloat_value())));
-#else
-        builder()->CreateMul(a->jfloat_value(), b->jfloat_value())));
-#endif
       break;
     case Bytecodes::_fdiv:
       b = pop();
@@ -573,42 +561,26 @@
     case Bytecodes::_fneg:
       a = pop();      
       push(SharkValue::create_jfloat(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFNeg(a->jfloat_value())));
-#else
-        builder()->CreateNeg(a->jfloat_value())));
-#endif
       break;
 
     case Bytecodes::_dadd:
       b = pop();
       a = pop();
       push(SharkValue::create_jdouble(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFAdd(a->jdouble_value(), b->jdouble_value())));
-#else
-        builder()->CreateAdd(a->jdouble_value(), b->jdouble_value())));
-#endif
       break;
     case Bytecodes::_dsub:
       b = pop();
       a = pop();
       push(SharkValue::create_jdouble(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFSub(a->jdouble_value(), b->jdouble_value())));
-#else
-        builder()->CreateSub(a->jdouble_value(), b->jdouble_value())));
-#endif
       break;
     case Bytecodes::_dmul:
       b = pop();
       a = pop();
       push(SharkValue::create_jdouble(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFMul(a->jdouble_value(), b->jdouble_value())));
-#else
-        builder()->CreateMul(a->jdouble_value(), b->jdouble_value())));
-#endif
       break;
     case Bytecodes::_ddiv:
       b = pop();
@@ -625,11 +597,7 @@
     case Bytecodes::_dneg:
       a = pop();      
       push(SharkValue::create_jdouble(
-#if SHARK_LLVM_VERSION >= 26
         builder()->CreateFNeg(a->jdouble_value())));
-#else
-        builder()->CreateNeg(a->jdouble_value())));
-#endif
       break;
 
     case Bytecodes::_iinc:
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -28,16 +28,8 @@
 
 using namespace llvm;
 
-SharkBuilder::SharkBuilder(Module* module, SharkCodeBuffer* code_buffer)
-#if SHARK_LLVM_VERSION >= 26
-  // LLVM 2.6 requires a LLVMContext during IRBuilder construction.
-  // getGlobalConext() returns one that can be used as long as the shark
-  // compiler are single-threaded.
-  : IRBuilder<>(getGlobalContext()),
-#else
-  : IRBuilder<>(),
-#endif // SHARK_LLVM_VERSION >= 26
-    _module(module),
+SharkBuilder::SharkBuilder(SharkCodeBuffer* code_buffer)
+  : IRBuilder<>(SharkContext::current()),
     _code_buffer(code_buffer)
 {
 }
@@ -155,17 +147,9 @@
     // Miscellaneous
   case 'v':
     assert(void_ok, "should be");
-#if SHARK_LLVM_VERSION >= 26
-    return Type::getVoidTy(getGlobalContext());
-#else
-    return Type::VoidTy;
-#endif
+    return SharkType::void_type();
   case '1':
-#if SHARK_LLVM_VERSION >= 26
-    return Type::getInt1Ty(getGlobalContext());
-#else
-    return Type::Int1Ty;
-#endif
+    return SharkType::bit_type();
 
   default:
     ShouldNotReachHere();
@@ -196,7 +180,7 @@
                                    const char* params,
                                    const char* ret)
 {
-  return module()->getOrInsertFunction(name, make_ftype(params, ret));
+  return SharkContext::current().get_external(name, make_ftype(params, ret));
 }
 
 // Create an object representing an external function by inlining a
@@ -372,6 +356,15 @@
   return make_function((address) SharkRuntime::uncommon_trap, "Ti", "v");
 }
 
+// Native-Java transition.
+
+Value* SharkBuilder::check_special_condition_for_native_trans()
+{
+  return make_function(
+    (address) JavaThread::check_special_condition_for_native_trans,
+    "T", "v");
+}
+
 // Low-level non-VM calls
 
 // The ARM-specific code here is to work around unimplemented
@@ -520,11 +513,7 @@
   const char *name;
   if (value->hasName())
     // XXX this leaks, but it's only debug code
-#if SHARK_LLVM_VERSION >= 26
     name = strdup(value->getName().str().c_str());
-#else
-    name = strdup(value->getName().c_str());
-#endif
   else
     name = "unnamed_value";
 
@@ -572,7 +561,7 @@
     LLVMValue::intptr_constant(offset));
 }
 
-Value* SharkBuilder::CreateInlineOop(ciObject* object, const char* name)
+Value* SharkBuilder::CreateInlineOop(jobject object, const char* name)
 {
   return CreateLoad(
     CreateIntToPtr(
@@ -607,9 +596,6 @@
 
 BasicBlock* SharkBuilder::CreateBlock(BasicBlock* ip, const char* name) const
 {
-#if SHARK_LLVM_VERSION >= 26
-  return BasicBlock::Create(getGlobalContext(), name, GetInsertBlock()->getParent(), ip);
-#else
-  return BasicBlock::Create(name, GetInsertBlock()->getParent(), ip);
-#endif
+  return BasicBlock::Create(
+    SharkContext::current(), name, GetInsertBlock()->getParent(), ip);
 }  
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -27,18 +27,12 @@
   friend class SharkCompileInvariants;
 
  public:
-  SharkBuilder(llvm::Module* module, SharkCodeBuffer* code_buffer);
+  SharkBuilder(SharkCodeBuffer* code_buffer);
 
-  // The LLVM module and Shark code buffer we are building into.
+  // The code buffer we are building into.
  private:
-  llvm::Module*    _module;
   SharkCodeBuffer* _code_buffer;
 
- private:
-  llvm::Module* module() const
-  {
-    return _module;
-  }
  protected:
   SharkCodeBuffer* code_buffer() const
   {
@@ -138,7 +132,14 @@
  public:
   llvm::Value* uncommon_trap();
 
-  // Intrinsics and external functions, part 4: Low-level non-VM calls.
+  // Intrinsics and external functions, part 4: Native-Java transition.
+  //   This is a special case in that it is invoked during a thread
+  //   state transition.  The stack must be set up for walking, and it
+  //   may throw exceptions, but the state is _thread_in_native_trans.
+ public:
+  llvm::Value* check_special_condition_for_native_trans();
+
+  // Intrinsics and external functions, part 5: Low-level non-VM calls.
   //   These have the same caveats as the high-level non-VM calls
   //   above.  They are not accessed directly; rather, you should
   //   access them via the various Create* methods below.
@@ -184,7 +185,11 @@
   // Helpers for accessing the code buffer.
  public:
   llvm::Value* code_buffer_address(int offset);
-  llvm::Value* CreateInlineOop(ciObject* object, const char* name = "");
+  llvm::Value* CreateInlineOop(jobject object, const char* name = "");
+  llvm::Value* CreateInlineOop(ciObject* object, const char* name = "")
+  {
+    return CreateInlineOop(object->encoding(), name);
+  }
 
   // Helpers for creating basic blocks.
   // NB don't use unless SharkFunction::CreateBlock is unavailable.
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -33,7 +33,7 @@
   // Start recording the debug information
   _pc_offset = code_buffer()->create_unique_offset();
   _oopmap = new OopMap(
-    oopmap_slot_munge(function()->oopmap_frame_size()),
+    oopmap_slot_munge(stack()->oopmap_frame_size()),
     oopmap_slot_munge(arg_size()));
   debug_info()->add_safepoint(pc_offset(), oopmap());
 }
@@ -44,10 +44,10 @@
   _exparray = new GrowableArray<ScopeValue*>(stack_depth);
 
   // Set the stack pointer
-  function()->CreateStoreZeroStackPointer(
+  stack()->CreateStoreStackPointer(
     builder()->CreatePtrToInt(
-      function()->CreateAddressOfFrameEntry(
-        function()->stack_slots_offset() + max_stack() - stack_depth),
+      stack()->slot_addr(
+        stack()->stack_slots_offset() + max_stack() - stack_depth),
       SharkType::intptr_type()));
 }
 
@@ -120,7 +120,7 @@
   // Record the PC
   builder()->CreateStore(
     builder()->code_buffer_address(pc_offset()),
-    function()->CreateAddressOfFrameEntry(offset));
+    stack()->slot_addr(offset));
 }
   
 void SharkDecacher::start_locals()
@@ -194,13 +194,11 @@
   builder()->CreateStore(
     builder()->CreateLoad(
       CreateAddressOfOSRBufEntry(src_offset, SharkType::intptr_type())),
-    function()->CreateAddressOfFrameEntry(
-      box_offset, SharkType::intptr_type()));
+    stack()->slot_addr(box_offset, SharkType::intptr_type()));
   builder()->CreateStore(
     builder()->CreateLoad(
       CreateAddressOfOSRBufEntry(src_offset + 1, SharkType::oop_type())),
-    function()->CreateAddressOfFrameEntry(
-      obj_offset, SharkType::oop_type()));
+    stack()->slot_addr(obj_offset, SharkType::oop_type()));
 }
 
 void SharkCacher::process_oop_tmp_slot(Value** value, int offset)
@@ -270,12 +268,10 @@
                                          Value*      value,
                                          int         offset)
 {
-  builder()->CreateStore(
-    value, function()->CreateAddressOfFrameEntry(offset, type));
+  builder()->CreateStore(value, stack()->slot_addr(offset, type));
 }
 
 Value* SharkCacher::read_value_from_frame(const Type* type, int offset)
 {
-  return builder()->CreateLoad(
-    function()->CreateAddressOfFrameEntry(offset, type));
+  return builder()->CreateLoad(stack()->slot_addr(offset, type));
 }
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -116,13 +116,13 @@
 
   // oopmap and debuginfo helpers
  private:
-  static int oopmap_slot_munge(int x)
+  static int oopmap_slot_munge(int offset)
   {
-    return x << (LogBytesPerWord - LogBytesPerInt);
+    return SharkStack::oopmap_slot_munge(offset);
   }
   static VMReg slot2reg(int offset)
   {
-    return VMRegImpl::stack2reg(oopmap_slot_munge(offset));
+    return SharkStack::slot2reg(offset);
   }
   static Location slot2loc(int offset, Location::Type type)
   {
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -25,25 +25,13 @@
 
 class SharkCodeBuffer : public StackObj {
  public:
-  SharkCodeBuffer(OopRecorder* oop_recorder)
-    : _cb("Shark", 256 * K, 64 * K),
-      _masm(new MacroAssembler(&_cb)),
-      _base_pc(NULL)
-  {
-    cb()->initialize_oop_recorder(oop_recorder);
-  }
+  SharkCodeBuffer(MacroAssembler* masm)
+    : _masm(masm), _base_pc(NULL) {}
 
  private:
-  CodeBuffer      _cb;
   MacroAssembler* _masm;
   llvm::Value*    _base_pc;
 
- public:
-  CodeBuffer* cb()
-  {
-    return &_cb;
-  }
-
  private:
   MacroAssembler* masm() const
   {
@@ -84,11 +72,11 @@
 
   // Inline an oop into the buffer and return its offset.
  public:
-  int inline_oop(ciObject* object) const
+  int inline_oop(jobject object) const
   {
     masm()->align(BytesPerWord);
     int offset = masm()->offset();
-    masm()->store_oop(object->encoding());
+    masm()->store_oop(object);
     return offset;
   }
 };
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -33,52 +33,32 @@
 SharkCompiler::SharkCompiler()
   : AbstractCompiler()
 {
-#if SHARK_LLVM_VERSION >= 26
-  // Make LLVM safe for multithreading.  We only make LLVM calls from
-  // the compiler thread, but if LLVM leaves stubs to be rewritten on
-  // execution then it's possible for Java threads to be making LLVM
-  // calls at the same time we are.
+  // Create the lock to protect the memory manager and execution engine
+  _execution_engine_lock = new Monitor(Mutex::leaf, "SharkExecutionEngineLock");
+  MutexLocker locker(execution_engine_lock());
+
+  // Make LLVM safe for multithreading
   if (!llvm_start_multithreaded()) 
-    warning("llvm_start_multithreaded() failed");
-#endif
+    fatal("llvm_start_multithreaded() failed");
 
-  // Create a module to build our functions into
-#if SHARK_LLVM_VERSION >= 26
-  // LLVM 2.6 and later requires passing a LLVMContext during module
-  // creation. The LLVM API getGlobalContext() returns a LLVMContext that
-  // can be used safely as long as the shark compiler stays single threaded
-  // and only uses one module.
-  _module = new Module("shark", getGlobalContext());
-#else
-  _module = new Module("shark");
-#endif
+  // Initialize the native target
+  InitializeNativeTarget();
 
-#if SHARK_LLVM_VERSION >= 26
-  // If we have a native target, initialize it to ensure it is linked in and
-  // usable by the JIT.
-  InitializeNativeTarget();
-#endif
-  
+  // Create the two contexts which we'll use
+  _normal_context = new SharkContext("normal");
+  _native_context = new SharkContext("native");
+
+  // Create the memory manager
+  _memory_manager = new SharkMemoryManager();
+
   // Create the JIT
-  ModuleProvider *module_provider = new ExistingModuleProvider(module());
-  _memory_manager = new SharkMemoryManager();
   _execution_engine = ExecutionEngine::createJIT(
-#if SHARK_LLVM_VERSION >= 26
-   /*
-    * LLVM 26 introduced a more fine-grained control to set the optimization
-    * level when creating the LLVM JIT.
-    * The optimization level are now specified with a enum instead of a bool.
-    * CodeGenOpt::None = bool true; a fast JIT with reduced optimization.
-    * CodeGenOpt::Default = bool false; a non-fast JIT with optimization.
-    * CodeGenOpt::Aggressive = a new non-fast JIT with best optimization.
-    */
-    module_provider, NULL, memory_manager(), CodeGenOpt::Default);
-#else
-    module_provider, NULL, memory_manager(), false);
-#endif
+    _normal_context->module_provider(),
+    NULL, memory_manager(), CodeGenOpt::Default);
+  execution_engine()->addModuleProvider(
+    _native_context->module_provider());
 
-  // Initialize Shark components that need it
-  SharkType::initialize();
+  // All done
   mark_initialized();
 }
 
@@ -90,9 +70,9 @@
 void SharkCompiler::compile_method(ciEnv* env, ciMethod* target, int entry_bci)
 {
   assert(is_initialized(), "should be");
-
   ResourceMark rm;
-  const char *name = methodname(target);
+  const char *name = methodname(
+    target->holder()->name()->as_utf8(), target->name()->as_utf8());
 
   // Do the typeflow analysis
   ciTypeFlow *flow;
@@ -116,62 +96,26 @@
   env->set_dependencies(new Dependencies(env));
 
   // Create the code buffer and builder
-  SharkCodeBuffer cb(env->oop_recorder());
-  SharkBuilder builder(module(), &cb);
+  CodeBuffer hscb("Shark", 256 * K, 64 * K);
+  hscb.initialize_oop_recorder(env->oop_recorder());
+  MacroAssembler *masm = new MacroAssembler(&hscb);
+  SharkCodeBuffer cb(masm);
+  SharkBuilder builder(&cb);
 
   // Emit the entry point
   SharkEntry *entry = (SharkEntry *) cb.malloc(sizeof(SharkEntry));
   
   // Build the LLVM IR for the method
-  Function *function = SharkFunction::build(this, env, &builder, flow, name);
-  if (SharkPrintBitcodeOf != NULL) {
-    if (!fnmatch(SharkPrintBitcodeOf, name, 0))
-      function->dump();
+  Function *function = SharkFunction::build(env, &builder, flow, name);
+
+  // Generate native code.  It's unpleasant that we have to drop into
+  // the VM to do this -- it blocks safepoints -- but I can't see any
+  // other way to handle the locking.
+  {
+    ThreadInVMfromNative tiv(JavaThread::current());
+    generate_native_code(entry, function, name);
   }
-  entry->set_function(function);
 
-  // Compile to native code
-#ifndef PRODUCT
-#if SHARK_LLVM_VERSION < 27
-#ifdef X86
-  if (SharkPrintAsmOf != NULL) {
-    std::vector<const char*> args;
-    args.push_back(""); // program name
-    if (!fnmatch(SharkPrintAsmOf, name, 0))
-      args.push_back("-debug-only=x86-emitter");
-    else
-      args.push_back("-debug-only=none");
-    args.push_back(0);  // terminator
-    cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
-  }
-#endif // X86
-#else
-  if (SharkPrintAsmOf != NULL) {
-    if (!fnmatch(SharkPrintAsmOf, name, 0)) {
-#ifdef X86
-      llvm::SetCurrentDebugType("x86-emitter");
-#else
-      llvm::SetCurrentDebugType("jit");
-#endif // X86
-      llvm::DebugFlag=true;
-    } else {
-      llvm::SetCurrentDebugType(""); 
-      llvm::DebugFlag=false;
-    }
-  }
-#endif
-#endif // !PRODUCT
-  memory_manager()->set_entry_for_function(function, entry);
-  module()->getFunctionList().push_back(function);
-  entry->set_entry_point(
-    (address) execution_engine()->getPointerToFunction(function));
-  address code_start = entry->code_start();
-  address code_limit = entry->code_limit();
-
-  // Register generated code for profiling, etc
-  if (JvmtiExport::should_post_dynamic_code_generated())
-    JvmtiExport::post_dynamic_code_generated(name, code_start, code_limit);
-  
   // Install the method into the VM
   CodeOffsets offsets;
   offsets.set_value(CodeOffsets::Deopt, 0);
@@ -186,7 +130,7 @@
                        entry_bci,
                        &offsets,
                        0,
-                       cb.cb(),
+                       &hscb,
                        0,
                        &oopmaps,
                        &handler_table,
@@ -195,8 +139,96 @@
                        env->comp_level(),
                        false,
                        false);
+}
 
-  // Print statistics, if requested
+nmethod* SharkCompiler::generate_native_wrapper(MacroAssembler* masm,
+                                                methodHandle    target,
+                                                BasicType*      arg_types,
+                                                BasicType       return_type)
+{
+  assert(is_initialized(), "should be");
+  ResourceMark rm;
+  const char *name = methodname(
+    target->klass_name()->as_utf8(), target->name()->as_utf8());
+
+  // Create the code buffer and builder
+  SharkCodeBuffer cb(masm);
+  SharkBuilder builder(&cb);
+
+  // Emit the entry point
+  SharkEntry *entry = (SharkEntry *) cb.malloc(sizeof(SharkEntry));
+
+  // Build the LLVM IR for the method
+  SharkNativeWrapper *wrapper = SharkNativeWrapper::build(
+    &builder, target, name, arg_types, return_type);
+
+  // Generate native code
+  generate_native_code(entry, wrapper->function(), name);
+
+  // Return the nmethod for installation in the VM
+  return nmethod::new_native_nmethod(target,
+                                     masm->code(),
+                                     0,
+                                     0,
+                                     wrapper->frame_size(),
+                                     wrapper->receiver_offset(),
+                                     wrapper->lock_offset(),
+                                     wrapper->oop_maps());
+}
+
+void SharkCompiler::generate_native_code(SharkEntry* entry,
+                                         Function*   function,
+                                         const char* name)
+{
+  // Print the LLVM bitcode, if requested
+  if (SharkPrintBitcodeOf != NULL) {
+    if (!fnmatch(SharkPrintBitcodeOf, name, 0))
+      function->dump();
+  }
+
+  // Compile to native code
+  address code = NULL;
+  context()->add_function(function);
+  {
+    MutexLocker locker(execution_engine_lock());
+    free_queued_methods();
+
+    if (SharkPrintAsmOf != NULL) {
+#if SHARK_LLVM_VERSION >= 27
+      if (!fnmatch(SharkPrintAsmOf, name, 0)) {
+        llvm::SetCurrentDebugType(X86_ONLY("x86-emitter") NOT_X86("jit"));
+        llvm::DebugFlag = true;
+      }
+      else {
+        llvm::SetCurrentDebugType(""); 
+        llvm::DebugFlag = false;
+      }
+#else
+      // NB you need to patch LLVM with http://tinyurl.com/yf3baln for this
+      std::vector<const char*> args;
+      args.push_back(""); // program name
+      if (!fnmatch(SharkPrintAsmOf, name, 0))
+        args.push_back("-debug-only=x86-emitter");
+      else
+        args.push_back("-debug-only=none");
+      args.push_back(0);  // terminator
+      cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
+#endif // SHARK_LLVM_VERSION
+    }
+    memory_manager()->set_entry_for_function(function, entry);
+    code = (address) execution_engine()->getPointerToFunction(function);
+  }
+  entry->set_entry_point(code);
+  entry->set_function(function);
+  entry->set_context(context());
+  address code_start = entry->code_start();
+  address code_limit = entry->code_limit();
+
+  // Register generated code for profiling, etc
+  if (JvmtiExport::should_post_dynamic_code_generated())
+    JvmtiExport::post_dynamic_code_generated(name, code_start, code_limit);
+
+  // Print debug information, if requested
   if (SharkTraceInstalls) {
     tty->print_cr(
       " [%p-%p): %s (%d bytes code)",
@@ -206,21 +238,39 @@
 
 void SharkCompiler::free_compiled_method(address code)
 {
-  Function *function = ((SharkEntry *) code)->function();
-  execution_engine()->freeMachineCodeForFunction(function);
-  function->eraseFromParent();
+  // This method may only be called when the VM is at a safepoint.
+  // All _thread_in_vm threads will be waiting for the safepoint to
+  // finish with the exception of the VM thread, so we can consider
+  // ourself the owner of the execution engine lock even though we
+  // can't actually acquire it at this time.
+  assert(Thread::current()->is_VM_thread(), "must be called by VM thread");
+  assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint");
+
+  SharkEntry *entry = (SharkEntry *) code;
+  entry->context()->push_to_free_queue(entry->function());
 }
 
-const char* SharkCompiler::methodname(const ciMethod* target)
+void SharkCompiler::free_queued_methods()
 {
-  const char *klassname = target->holder()->name()->as_utf8();
-  const char *methodname = target->name()->as_utf8();
+  // The free queue is protected by the execution engine lock
+  assert(execution_engine_lock()->owned_by_self(), "should be");
 
-  char *buf = NEW_RESOURCE_ARRAY(
-    char, strlen(klassname) + 2 + strlen(methodname) + 1);
+  while (true) {
+    Function *function = context()->pop_from_free_queue();
+    if (function == NULL)
+      break;
+
+    execution_engine()->freeMachineCodeForFunction(function);
+    function->eraseFromParent();  
+  }
+}
+
+const char* SharkCompiler::methodname(const char* klass, const char* method)
+{
+  char *buf = NEW_RESOURCE_ARRAY(char, strlen(klass) + 2 + strlen(method) + 1);
 
   char *dst = buf;
-  for (const char *c = klassname; *c; c++) {
+  for (const char *c = klass; *c; c++) {
     if (*c == '/')
       *(dst++) = '.';
     else
@@ -228,7 +278,7 @@
   }
   *(dst++) = ':';
   *(dst++) = ':';
-  for (const char *c = methodname; *c; c++) {
+  for (const char *c = method; *c; c++) {
     *(dst++) = *c;
   }
   *(dst++) = '\0';
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkCompiler.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -23,6 +23,8 @@
  *
  */
 
+class SharkContext;
+
 class SharkCompiler : public AbstractCompiler {
  public:
   // Creation
@@ -32,7 +34,7 @@
   const char *name()     { return "shark"; }
 
   // Missing feature tests
-  bool supports_native() { return false; }
+  bool supports_native() { return true; }
   bool supports_osr()    { return true; }
 
   // Customization
@@ -42,33 +44,81 @@
   // Initialization
   void initialize();
 
-  // Compilation entry point for methods
+  // Compile a normal (bytecode) method and install it in the VM
   void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
 
-  // Free compiled methods
+  // Generate a wrapper for a native (JNI) method
+  nmethod* generate_native_wrapper(MacroAssembler* masm,
+                                   methodHandle    target,
+                                   BasicType*      arg_types,
+                                   BasicType       return_type);
+
+  // Free compiled methods (and native wrappers)
   void free_compiled_method(address code);
 
-  // LLVM interface
+  // Each thread generating IR needs its own context.  The normal
+  // context is used for bytecode methods, and is protected from
+  // multiple simultaneous accesses by being restricted to the
+  // compiler thread.  The native context is used for JNI methods,
+  // and is protected from multiple simultaneous accesses by the
+  // adapter handler library lock.
  private:
-  llvm::Module*          _module;
+  SharkContext* _normal_context;
+  SharkContext* _native_context;
+
+ public:
+  SharkContext* context() const
+  {
+    if (JavaThread::current()->is_Compiler_thread()) {
+      return _normal_context;
+    }
+    else {
+      assert(AdapterHandlerLibrary_lock->owned_by_self(), "should be");
+      return _native_context;
+    }
+  }
+
+  // The LLVM execution engine is the JIT we use to generate native
+  // code.  It is thread safe, but we need to protect it with a lock
+  // of our own because otherwise LLVM's lock and HotSpot's locks
+  // interleave and deadlock.  The SharkMemoryManager is not thread
+  // safe, and is protected by the same lock as the execution engine.
+ private:
+  Monitor*               _execution_engine_lock;
   SharkMemoryManager*    _memory_manager;
   llvm::ExecutionEngine* _execution_engine;
 
- public:
-  llvm::Module* module() const
+ private:
+  Monitor* execution_engine_lock() const
   {
-    return _module;
+    return _execution_engine_lock;
   }
   SharkMemoryManager* memory_manager() const
   {
+    assert(execution_engine_lock()->owned_by_self(), "should be");
     return _memory_manager;
   }
   llvm::ExecutionEngine* execution_engine() const
   {
+    assert(execution_engine_lock()->owned_by_self(), "should be");
     return _execution_engine;
   }
 
-  // Helper
+  // Global access
+ public:
+  static SharkCompiler* compiler()
+  {
+    AbstractCompiler *compiler =
+      CompileBroker::compiler(CompLevel_fast_compile);
+    assert(compiler->is_shark() && compiler->is_initialized(), "should be");
+    return (SharkCompiler *) compiler;
+  }
+
+  // Helpers
  private:
-  static const char* methodname(const ciMethod* target);
+  static const char* methodname(const char* klass, const char* method);
+  void generate_native_code(SharkEntry*     entry,
+                            llvm::Function* function,
+                            const char*     name);
+  void free_queued_methods();
 };
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkContext.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,185 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_sharkContext.cpp.incl"
+
+using namespace llvm;
+
+SharkContext::SharkContext(const char* name)
+  : LLVMContext(),
+    _free_queue(NULL)
+{
+  // Create a module to build our functions into
+  _module = new Module(name, *this);
+
+  // Create basic types
+  _void_type    = Type::getVoidTy(*this);
+  _bit_type     = Type::getInt1Ty(*this);
+  _jbyte_type   = Type::getInt8Ty(*this);
+  _jshort_type  = Type::getInt16Ty(*this);
+  _jint_type    = Type::getInt32Ty(*this);
+  _jlong_type   = Type::getInt64Ty(*this);
+  _jfloat_type  = Type::getFloatTy(*this);
+  _jdouble_type = Type::getDoubleTy(*this);
+
+  // Create compound types
+  _itableOffsetEntry_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), itableOffsetEntry::size() * wordSize));
+
+  _klass_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(Klass)));
+
+  _jniEnv_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(JNIEnv)));
+
+  _jniHandleBlock_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(JNIHandleBlock)));
+
+  _methodOop_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(methodOopDesc)));
+
+  _monitor_type = ArrayType::get(
+    jbyte_type(), frame::interpreter_frame_monitor_size() * wordSize);
+
+  _oop_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(oopDesc)));
+
+  _thread_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(JavaThread)));
+
+  _zeroStack_type = PointerType::getUnqual(
+    ArrayType::get(jbyte_type(), sizeof(ZeroStack)));
+
+  std::vector<const Type*> params;
+  params.push_back(methodOop_type());
+  params.push_back(intptr_type());
+  params.push_back(thread_type());
+  _entry_point_type = FunctionType::get(void_type(), params, false);
+
+  params.clear();
+  params.push_back(methodOop_type());
+  params.push_back(PointerType::getUnqual(jbyte_type()));
+  params.push_back(intptr_type());
+  params.push_back(thread_type());
+  _osr_entry_point_type = FunctionType::get(void_type(), params, false);
+
+  // Create mappings
+  for (int i = 0; i < T_CONFLICT; i++) {
+    switch (i) {
+    case T_BOOLEAN:
+      _to_stackType[i] = jint_type();
+      _to_arrayType[i] = jbyte_type();
+      break;
+      
+    case T_BYTE:
+      _to_stackType[i] = jint_type();
+      _to_arrayType[i] = jbyte_type();
+      break;
+
+    case T_CHAR:
+      _to_stackType[i] = jint_type();
+      _to_arrayType[i] = jshort_type();
+      break;
+
+    case T_SHORT:
+      _to_stackType[i] = jint_type();
+      _to_arrayType[i] = jshort_type();
+      break;
+
+    case T_INT:
+      _to_stackType[i] = jint_type();
+      _to_arrayType[i] = jint_type();
+      break;
+
+    case T_LONG:
+      _to_stackType[i] = jlong_type();
+      _to_arrayType[i] = jlong_type();
+      break;
+
+    case T_FLOAT:
+      _to_stackType[i] = jfloat_type();
+      _to_arrayType[i] = jfloat_type();
+      break;
+
+    case T_DOUBLE:
+      _to_stackType[i] = jdouble_type();
+      _to_arrayType[i] = jdouble_type();
+      break;
+
+    case T_OBJECT:
+    case T_ARRAY:
+      _to_stackType[i] = oop_type();
+      _to_arrayType[i] = oop_type();
+      break;
+
+    case T_ADDRESS:
+      _to_stackType[i] = intptr_type();
+      _to_arrayType[i] = NULL;
+      break;
+
+    default:
+      _to_stackType[i] = NULL;
+      _to_arrayType[i] = NULL;
+    }
+  }
+}
+
+class SharkFreeQueueItem : public CHeapObj {
+ public:
+  SharkFreeQueueItem(llvm::Function* function, SharkFreeQueueItem *next)
+    : _function(function), _next(next) {}
+
+ private:
+  llvm::Function*     _function;
+  SharkFreeQueueItem* _next;
+
+ public:
+  llvm::Function* function() const
+  {
+    return _function;
+  }
+  SharkFreeQueueItem* next() const
+  {
+    return _next;
+  }
+};
+
+void SharkContext::push_to_free_queue(Function* function)
+{
+  _free_queue = new SharkFreeQueueItem(function, _free_queue);
+}
+
+Function* SharkContext::pop_from_free_queue()
+{
+  if (_free_queue == NULL)
+    return NULL;
+
+  SharkFreeQueueItem *item = _free_queue;
+  Function *function = item->function();
+  _free_queue = item->next();
+  delete item;
+  return function;
+}
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,208 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// The LLVMContext class allows multiple instances of LLVM to operate
+// independently of each other in a multithreaded context.  We extend
+// this here to store things in Shark that are LLVMContext-specific.
+
+class SharkFreeQueueItem;
+
+class SharkContext : public llvm::LLVMContext {
+ public:
+  SharkContext(const char* name);
+
+ private:
+  llvm::Module* _module;
+
+ private:
+  llvm::Module* module() const
+  {
+    return _module;
+  }
+
+  // Get this thread's SharkContext
+ public:
+  static SharkContext& current()
+  {
+    return *SharkCompiler::compiler()->context();
+  }
+
+  // Module accessors
+ public:
+  llvm::ModuleProvider* module_provider() const
+  {
+    return new llvm::ExistingModuleProvider(module());
+  }
+  void add_function(llvm::Function* function) const
+  {
+    module()->getFunctionList().push_back(function);
+  }
+  llvm::Constant* get_external(const char* name, const llvm::FunctionType* sig)
+  {
+    return module()->getOrInsertFunction(name, sig);
+  }
+
+  // Basic types
+ private:
+  const llvm::Type*        _void_type;
+  const llvm::IntegerType* _bit_type;
+  const llvm::IntegerType* _jbyte_type;
+  const llvm::IntegerType* _jshort_type;
+  const llvm::IntegerType* _jint_type;
+  const llvm::IntegerType* _jlong_type;
+  const llvm::Type*        _jfloat_type;
+  const llvm::Type*        _jdouble_type;
+
+ public:
+  const llvm::Type* void_type() const
+  {
+    return _void_type;
+  }
+  const llvm::IntegerType* bit_type() const
+  {
+    return _bit_type;
+  }
+  const llvm::IntegerType* jbyte_type() const
+  {
+    return _jbyte_type;
+  }
+  const llvm::IntegerType* jshort_type() const
+  {
+    return _jshort_type;
+  }
+  const llvm::IntegerType* jint_type() const
+  {
+    return _jint_type;
+  }
+  const llvm::IntegerType* jlong_type() const
+  {
+    return _jlong_type;
+  }
+  const llvm::Type* jfloat_type() const
+  {
+    return _jfloat_type;
+  }
+  const llvm::Type* jdouble_type() const
+  {
+    return _jdouble_type;
+  }
+  const llvm::IntegerType* intptr_type() const
+  {
+    return LP64_ONLY(jlong_type()) NOT_LP64(jint_type());
+  }
+
+  // Compound types
+ private:
+  const llvm::PointerType*  _itableOffsetEntry_type;
+  const llvm::PointerType*  _jniEnv_type;
+  const llvm::PointerType*  _jniHandleBlock_type;
+  const llvm::PointerType*  _klass_type;
+  const llvm::PointerType*  _methodOop_type;
+  const llvm::ArrayType*    _monitor_type;
+  const llvm::PointerType*  _oop_type;
+  const llvm::PointerType*  _thread_type;
+  const llvm::PointerType*  _zeroStack_type;
+  const llvm::FunctionType* _entry_point_type;
+  const llvm::FunctionType* _osr_entry_point_type;
+
+ public:
+  const llvm::PointerType* itableOffsetEntry_type() const
+  {
+    return _itableOffsetEntry_type;
+  }
+  const llvm::PointerType* jniEnv_type() const
+  {
+    return _jniEnv_type;
+  }
+  const llvm::PointerType* jniHandleBlock_type() const
+  {
+    return _jniHandleBlock_type;
+  }
+  const llvm::PointerType* klass_type() const
+  {
+    return _klass_type;
+  }
+  const llvm::PointerType* methodOop_type() const
+  {
+    return _methodOop_type;
+  }
+  const llvm::ArrayType* monitor_type() const
+  {
+    return _monitor_type;
+  }
+  const llvm::PointerType* oop_type() const
+  {
+    return _oop_type;
+  }
+  const llvm::PointerType* thread_type() const
+  {
+    return _thread_type;
+  }
+  const llvm::PointerType* zeroStack_type() const
+  {
+    return _zeroStack_type;
+  }
+  const llvm::FunctionType* entry_point_type() const
+  {
+    return _entry_point_type;
+  }
+  const llvm::FunctionType* osr_entry_point_type() const
+  {
+    return _osr_entry_point_type;
+  }
+
+  // Mappings
+ private:
+  const llvm::Type* _to_stackType[T_CONFLICT];
+  const llvm::Type* _to_arrayType[T_CONFLICT];
+
+ private:
+  const llvm::Type* map_type(const llvm::Type* const* table,
+                             BasicType                type) const
+  {
+    assert(type >= 0 && type < T_CONFLICT, "unhandled type");
+    const llvm::Type* result = table[type];
+    assert(type != NULL, "unhandled type");
+    return result;
+  }
+  
+ public:
+  const llvm::Type* to_stackType(BasicType type) const
+  {
+    return map_type(_to_stackType, type);
+  }
+  const llvm::Type* to_arrayType(BasicType type) const
+  {
+    return map_type(_to_arrayType, type);
+  }
+
+  // Functions queued for freeing
+ private:
+  SharkFreeQueueItem* _free_queue;
+
+ public:
+  void push_to_free_queue(llvm::Function* function);
+  llvm::Function* pop_from_free_queue();
+};
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkEntry.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkEntry.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -23,9 +23,12 @@
  *
  */
 
+class SharkContext;
+
 class SharkEntry : public ZeroEntry {
  private:
   address         _code_limit;
+  SharkContext*   _context;
   llvm::Function* _function;
 
  public:
@@ -37,6 +40,10 @@
   {
     return _code_limit;
   }
+  SharkContext* context() const
+  {
+    return _context;
+  }
   llvm::Function* function() const
   {
     return _function;
@@ -47,6 +54,10 @@
   {
     _code_limit = code_limit;
   }
+  void set_context(SharkContext* context)
+  {
+    _context = context;
+  }
   void set_function(llvm::Function* function)
   {
     _function = function;
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -77,17 +77,10 @@
       block(i)->initialize();
   }
 
-  // Create the method preamble
+  // Create and push our stack frame
   set_block_insertion_point(&function()->front());
   builder()->SetInsertPoint(CreateBlock());
-  CreateInitZeroStack();
-  CreatePushFrame(CreateBuildFrame());
-  NOT_PRODUCT(builder()->CreateStore(
-    method,
-    CreateAddressOfFrameEntry(
-      method_slot_offset(),
-      SharkType::methodOop_type(),
-      "method_slot")));
+  _stack = SharkStack::CreateBuildAndPushFrame(this, method);
 
   // Create the entry state
   SharkState *entry_state;
@@ -132,150 +125,6 @@
   do_deferred_zero_checks();
 }
 
-void SharkFunction::CreateInitZeroStack()
-{
-  Value *zero_stack = builder()->CreateAddressOfStructEntry(
-    thread(), JavaThread::zero_stack_offset(),
-    SharkType::zeroStack_type(),
-    "zero_stack");
-
-  _zero_stack_base = builder()->CreateValueOfStructEntry(
-    zero_stack, ZeroStack::base_offset(),
-    SharkType::intptr_type(),
-    "zero_stack_base");
-
-  _zero_stack_pointer_addr = builder()->CreateAddressOfStructEntry(
-    zero_stack, ZeroStack::sp_offset(),
-    PointerType::getUnqual(SharkType::intptr_type()),
-    "zero_stack_pointer_addr");
-
-  _zero_frame_pointer_addr = builder()->CreateAddressOfStructEntry(
-    thread(), JavaThread::top_zero_frame_offset(),
-    PointerType::getUnqual(SharkType::intptr_type()),
-    "zero_frame_pointer_addr");
-}
-
-void SharkFunction::CreateStackOverflowCheck(Value *sp)
-{
-  BasicBlock *overflow = CreateBlock("stack_overflow");
-  BasicBlock *no_overflow = CreateBlock("no_overflow");
-  
-  builder()->CreateCondBr(
-    builder()->CreateICmpULT(sp, zero_stack_base()),
-    overflow, no_overflow);
-
-  builder()->SetInsertPoint(overflow);
-  builder()->CreateUnimplemented(__FILE__, __LINE__);
-  builder()->CreateUnreachable();
-
-  builder()->SetInsertPoint(no_overflow);  
-}
-
-void SharkFunction::CreatePushFrame(Value *fp)
-{
-  builder()->CreateStore(CreateLoadZeroFramePointer(), fp);
-  CreateStoreZeroFramePointer(
-    builder()->CreatePtrToInt(fp, SharkType::intptr_type()));
-}
-
-Value* SharkFunction::CreatePopFrame(int result_slots)
-{
-  assert(result_slots >= 0 && result_slots <= 2, "should be");
-
-  int locals_to_pop = max_locals() - result_slots;
-
-  Value *fp = CreateLoadZeroFramePointer();
-  Value *sp = builder()->CreateAdd(
-    fp,
-    LLVMValue::intptr_constant((1 + locals_to_pop) * wordSize));
-
-  CreateStoreZeroStackPointer(sp);
-  CreateStoreZeroFramePointer(
-    builder()->CreateLoad(
-      builder()->CreateIntToPtr(
-        fp, PointerType::getUnqual(SharkType::intptr_type()))));
-
-  return sp;
-}
-
-Value* SharkFunction::CreateBuildFrame()
-{
-  int locals_words  = max_locals();
-  int extra_locals  = locals_words - arg_size();
-  int header_words  = SharkFrame::header_words;
-  int monitor_words = max_monitors()*frame::interpreter_frame_monitor_size();
-  int stack_words   = max_stack();
-  int frame_words   = header_words + monitor_words + stack_words;
-
-  _extended_frame_size = frame_words + locals_words;
-
-  // Update the stack pointer
-  Value *zero_stack_pointer = builder()->CreateSub(
-    CreateLoadZeroStackPointer(),
-    LLVMValue::intptr_constant((frame_words + extra_locals) * wordSize));
-  CreateStackOverflowCheck(zero_stack_pointer);
-  NOT_PRODUCT(CreateStoreZeroStackPointer(zero_stack_pointer));
-
-  // Create the frame
-  _frame = builder()->CreateIntToPtr(
-    zero_stack_pointer,
-    PointerType::getUnqual(
-      ArrayType::get(SharkType::intptr_type(), extended_frame_size())),
-    "frame");
-  int offset = 0;
-
-  // Expression stack
-  _stack_slots_offset = offset;
-  offset += stack_words;
-
-  // Monitors
-  _monitors_slots_offset = offset; 
-  offset += monitor_words;
-
-  // Temporary oop slot
-  _oop_tmp_slot_offset = offset++;
-
-  // Method pointer
-  _method_slot_offset = offset++;
-
-  // Unextended SP
-  builder()->CreateStore(
-    zero_stack_pointer,
-    CreateAddressOfFrameEntry(offset++));
-
-  // PC
-  _pc_slot_offset = offset++;
-
-  // Frame header
-  builder()->CreateStore(
-    LLVMValue::intptr_constant(ZeroFrame::SHARK_FRAME),
-    CreateAddressOfFrameEntry(offset++));
-  Value *fp = CreateAddressOfFrameEntry(offset++);
-
-  // Local variables
-  _locals_slots_offset = offset;  
-  offset += locals_words;
-
-  assert(offset == extended_frame_size(), "should do");
-  return fp;
-}
-
-Value* SharkFunction::CreateAddressOfFrameEntry(int               offset,
-                                                const llvm::Type* type,
-                                                const char*       name) const
-{
-  bool needs_cast = type && type != SharkType::intptr_type();
-
-  Value* result = builder()->CreateStructGEP(
-    _frame, offset, needs_cast ? "" : name);
-
-  if (needs_cast) {
-    result = builder()->CreateBitCast(
-      result, PointerType::getUnqual(type), name);
-  }
-  return result;
-}
-
 class DeferredZeroCheck : public SharkTargetInvariants {
  public:
   DeferredZeroCheck(SharkTopLevelBlock* block, SharkValue* value)
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkFunction.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -27,24 +27,24 @@
 class DeferredZeroCheck;
 
 class SharkFunction : public SharkTargetInvariants {
+ friend class SharkStackWithNormalFrame;
+  
  public:
-  static llvm::Function* build(SharkCompiler* compiler,
-                               ciEnv*         env,
-                               SharkBuilder*  builder,
-                               ciTypeFlow*    flow,
-                               const char*    name)
+  static llvm::Function* build(ciEnv*        env,
+                               SharkBuilder* builder,
+                               ciTypeFlow*   flow,
+                               const char*   name)
   {
-    SharkFunction function(compiler, env, builder, flow, name);
+    SharkFunction function(env, builder, flow, name);
     return function.function();
   }
 
  private:
-  SharkFunction(SharkCompiler* compiler,
-                ciEnv*         env,
-                SharkBuilder*  builder,
-                ciTypeFlow*    flow,
-                const char*    name)
-    : SharkTargetInvariants(compiler, env, builder, flow) { initialize(name); }
+  SharkFunction(ciEnv*        env,
+                SharkBuilder* builder,
+                ciTypeFlow*   flow,
+                const char*   name)
+    : SharkTargetInvariants(env, builder, flow) { initialize(name); }
 
  private:
   void initialize(const char* name);
@@ -53,6 +53,7 @@
   llvm::Function*                   _function;
   SharkTopLevelBlock**              _blocks;
   GrowableArray<DeferredZeroCheck*> _deferred_zero_checks;
+  SharkStack*                       _stack;
 
  public:
   llvm::Function* function() const
@@ -72,6 +73,10 @@
   {
     return &_deferred_zero_checks;
   }
+  SharkStack* stack() const
+  {
+    return _stack;
+  }
 
   // On-stack replacement
  private:
@@ -103,153 +108,8 @@
  public:
   llvm::BasicBlock* CreateBlock(const char* name = "") const
   {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::BasicBlock::Create(llvm::getGlobalContext(), name, function(), block_insertion_point());
-#else
-    return llvm::BasicBlock::Create(name, function(), block_insertion_point());
-#endif
-  }
-
-  // Stack management
- private:
-  llvm::Value* _zero_stack_base;
-  llvm::Value* _zero_stack_pointer_addr;
-  llvm::Value* _zero_frame_pointer_addr;
-
- private:
-  llvm::Value* zero_stack_base() const 
-  {
-    return _zero_stack_base;
-  }
-  llvm::Value* zero_stack_pointer_addr() const 
-  {
-    return _zero_stack_pointer_addr;
-  }
-  llvm::Value* zero_frame_pointer_addr() const 
-  {
-    return _zero_frame_pointer_addr;
-  }
-
- private:
-  void CreateInitZeroStack();
-
- public:
-  llvm::LoadInst* CreateLoadZeroStackPointer(const char *name = "")
-  {
-    return builder()->CreateLoad(zero_stack_pointer_addr(), name);
-  }
-  llvm::StoreInst* CreateStoreZeroStackPointer(llvm::Value* value)
-  {
-    return builder()->CreateStore(value, zero_stack_pointer_addr());
-  }
-  llvm::LoadInst* CreateLoadZeroFramePointer(const char *name = "")
-  {
-    return builder()->CreateLoad(zero_frame_pointer_addr(), name);
-  }
- private:
-  llvm::StoreInst* CreateStoreZeroFramePointer(llvm::Value* value)
-  {
-    return builder()->CreateStore(value, zero_frame_pointer_addr());
-  }
-
- private:
-  void CreateStackOverflowCheck(llvm::Value* sp);
-
- public:
-  void CreatePushFrame(llvm::Value* fp);
-  llvm::Value* CreatePopFrame(int result_slots);
-
-  // Frame management
- private:
-  llvm::Value* _frame;
-
- public:
-  llvm::Value* CreateAddressOfFrameEntry(int               offset,
-                                         const llvm::Type* type = NULL,
-                                         const char*       name = "") const;
- private:
-  llvm::Value* CreateBuildFrame();
-
- private:
-  int _extended_frame_size;
-  int _stack_slots_offset;
-  int _monitors_slots_offset;
-  int _oop_tmp_slot_offset;
-  int _method_slot_offset;
-  int _pc_slot_offset;
-  int _locals_slots_offset;
-
- public:
-  int extended_frame_size() const
-  {
-    return _extended_frame_size;
-  }
-  int oopmap_frame_size() const
-  {
-    return extended_frame_size() - arg_size();
-  }
-  int stack_slots_offset() const
-  {
-    return _stack_slots_offset;
-  }
-  int oop_tmp_slot_offset() const
-  {
-    return _oop_tmp_slot_offset;
-  }
-  int method_slot_offset() const
-  {
-    return _method_slot_offset;
-  }
-  int pc_slot_offset() const
-  {
-    return _pc_slot_offset;
-  }
-  int locals_slots_offset() const
-  {
-    return _locals_slots_offset;
-  }
-
-  // Monitors
- public:
-  int monitor_offset(int index) const
-  {
-    assert(index >= 0 && index < max_monitors(), "invalid monitor index");
-    return _monitors_slots_offset +
-      (max_monitors() - 1 - index) * frame::interpreter_frame_monitor_size();
-  }
-  int monitor_object_offset(int index) const
-  {
-    return monitor_offset(index) +
-      (BasicObjectLock::obj_offset_in_bytes() >> LogBytesPerWord);
-  }
-  int monitor_header_offset(int index) const
-  {
-    return monitor_offset(index) +
-      ((BasicObjectLock::lock_offset_in_bytes() +
-        BasicLock::displaced_header_offset_in_bytes()) >> LogBytesPerWord);
-  }
-
- public:
-  llvm::Value* monitor_addr(int index) const
-  {
-    return CreateAddressOfFrameEntry(
-      monitor_offset(index),
-      SharkType::monitor_type(),
-      "monitor");
-  }
-  llvm::Value* monitor_object_addr(int index) const
-  {
-    return CreateAddressOfFrameEntry(
-      monitor_object_offset(index),
-      SharkType::oop_type(),
-      "object_addr");
-  }
-  llvm::Value* monitor_header_addr(int index) const
-  {
-    return CreateAddressOfFrameEntry(
-      monitor_header_offset(index),
-      SharkType::intptr_type(),
-      "displaced_header_addr");
+    return llvm::BasicBlock::Create(
+      SharkContext::current(), name, function(), block_insertion_point());
   }
 
   // Deferred zero checks
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkInvariants.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkInvariants.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -31,35 +31,20 @@
 
 class SharkCompileInvariants : public ResourceObj {
  protected:
-  SharkCompileInvariants(SharkCompiler* compiler,
-                         ciEnv*         env,
-                         SharkBuilder*  builder)
-    : _compiler(compiler),
-      _env(env),
+  SharkCompileInvariants(ciEnv* env, SharkBuilder* builder)
+    : _env(env),
       _builder(builder),
       _thread(NULL) {}
 
   SharkCompileInvariants(const SharkCompileInvariants* parent)
-    : _compiler(parent->_compiler),
-      _env(parent->_env),
+    : _env(parent->_env),
       _builder(parent->_builder),
       _thread(parent->_thread) {}
 
  private:
-  SharkCompiler* _compiler;
-  ciEnv*         _env;
-  SharkBuilder*  _builder;
-  llvm::Value*   _thread;
-
-  // The SharkCompiler that is compiling this method.  Holds the
-  // classes that form the interface with LLVM (the module, the
-  // memory manager, etc) and provides the compile() method to
-  // convert LLVM functions to native code.
- protected:
-  SharkCompiler* compiler() const
-  {
-    return _compiler;
-  }
+  ciEnv*        _env;
+  SharkBuilder* _builder;
+  llvm::Value*  _thread;
 
   // Top-level broker for HotSpot's Compiler Interface.
   //
@@ -73,6 +58,7 @@
  private:
   ciEnv* env() const
   {
+    assert(_env != NULL, "env not available");
     return _env;
   }
 
@@ -124,11 +110,8 @@
 
 class SharkTargetInvariants : public SharkCompileInvariants {
  protected:
-  SharkTargetInvariants(SharkCompiler* compiler,
-                        ciEnv*         env,
-                        SharkBuilder*  builder,
-                        ciTypeFlow*    flow)
-    : SharkCompileInvariants(compiler, env, builder),
+  SharkTargetInvariants(ciEnv* env, SharkBuilder* builder, ciTypeFlow* flow)
+    : SharkCompileInvariants(env, builder),
       _target(flow->method()),
       _flow(flow),
       _max_monitors(count_monitors()) {}
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -103,8 +103,8 @@
 }
 #endif
 
-#if SHARK_LLVM_VERSION >= 26
-uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size, unsigned int Alignment)
+uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size,
+                                            unsigned int Alignment)
 {
   return mm()->allocateGlobal(Size, Alignment);
 }
@@ -124,12 +124,8 @@
   mm()->setPoisonMemory(poison);
 }
 
-#endif
-
-#if SHARK_LLVM_VERSION >= 25
 unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size,
                                                  unsigned int Alignment)
 {
   return mm()->allocateSpace(Size, Alignment);
 }
-#endif
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -71,12 +71,10 @@
                          unsigned char* TableStart,
                          unsigned char* TableEnd,
                          unsigned char* FrameRegister);
-#if SHARK_LLVM_VERSION >= 26
   void* getDlsymTable() const;
   void SetDlsymTable(void *ptr);
   void setPoisonMemory(bool);
   uint8_t* allocateGlobal(uintptr_t, unsigned int);
-#endif
   void setMemoryWritable();
   void setMemoryExecutable();
 #if SHARK_LLVM_VERSION >= 27
@@ -85,9 +83,6 @@
 #else
   void deallocateMemForFunction(const llvm::Function* F);
 #endif
-
-#if SHARK_LLVM_VERSION >= 25
   unsigned char *allocateSpace(intptr_t Size,
 			       unsigned int Alignment);
-#endif
 };
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,352 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_sharkNativeWrapper.cpp.incl"
+
+using namespace llvm;
+
+void SharkNativeWrapper::initialize(const char *name)
+{
+  // Create the function
+  _function = Function::Create(
+    SharkType::entry_point_type(),
+    GlobalVariable::InternalLinkage,
+    name);
+
+  // Get our arguments
+  Function::arg_iterator ai = function()->arg_begin();
+  Argument *method = ai++;
+  method->setName("method");
+  Argument *base_pc = ai++;
+  base_pc->setName("base_pc");
+  code_buffer()->set_base_pc(base_pc);
+  Argument *thread = ai++;
+  thread->setName("thread");
+  set_thread(thread);
+
+  // Create and push our stack frame
+  builder()->SetInsertPoint(CreateBlock());
+  _stack = SharkStack::CreateBuildAndPushFrame(this, method);
+  NOT_PRODUCT(method = NULL);
+
+  // Create the oopmap.  We use the one oopmap for every call site in
+  // the wrapper, which results in the odd mild inefficiency but is a
+  // damn sight easier to code.
+  OopMap *oopmap = new OopMap(
+    SharkStack::oopmap_slot_munge(stack()->oopmap_frame_size()),
+    SharkStack::oopmap_slot_munge(arg_size()));
+  oopmap->set_oop(SharkStack::slot2reg(stack()->method_slot_offset()));
+
+  // Set up the oop_tmp slot if required:
+  //  - For static methods we use it to handlize the class argument
+  //    for the call, and to protect the same during slow path locks
+  //    (if synchronized).
+  //  - For methods returning oops, we use it to protect the return
+  //    value across safepoints or slow path unlocking.
+  if (is_static() || is_returning_oop()) {
+    _oop_tmp_slot = stack()->slot_addr(
+      stack()->oop_tmp_slot_offset(),
+      SharkType::oop_type(),
+      "oop_tmp_slot");
+
+    oopmap->set_oop(SharkStack::slot2reg(stack()->oop_tmp_slot_offset()));
+  }
+
+  // Set up the monitor slot, for synchronized methods
+  if (is_synchronized()) {
+    Unimplemented();
+    _lock_slot_offset = 23;
+  }
+
+  // Start building the argument list
+  std::vector<const Type*> param_types;
+  std::vector<Value*> param_values;
+  const PointerType *box_type = PointerType::getUnqual(SharkType::oop_type());
+
+  // First argument is the JNIEnv
+  param_types.push_back(SharkType::jniEnv_type());
+  param_values.push_back(
+    builder()->CreateAddressOfStructEntry(
+      thread,
+      JavaThread::jni_environment_offset(),
+      SharkType::jniEnv_type(),
+      "jni_environment"));
+
+  // For static methods, the second argument is the class
+  if (is_static()) {
+    builder()->CreateStore(
+      builder()->CreateInlineOop(
+        JNIHandles::make_local(target()->method_holder())),
+      oop_tmp_slot());
+
+    param_types.push_back(box_type);
+    param_values.push_back(oop_tmp_slot());
+
+    _receiver_slot_offset = stack()->oop_tmp_slot_offset();
+  }
+  else if (is_returning_oop()) {
+    // The oop_tmp slot is registered in the oopmap,
+    // so we need to clear it.  This is one of the
+    // mild inefficiencies I mentioned earlier.
+    builder()->CreateStore(LLVMValue::null(), oop_tmp_slot());
+  }
+
+  // Parse the arguments
+  for (int i = 0; i < arg_size(); i++) {
+    int slot_offset = stack()->locals_slots_offset() + arg_size() - 1 - i;
+    int adjusted_offset = slot_offset;
+    BasicBlock *null, *not_null, *merge;
+    Value *box;
+    PHINode *phi;
+
+    switch (arg_type(i)) {
+    case T_VOID:
+      break;
+
+    case T_OBJECT:
+    case T_ARRAY:
+      null     = CreateBlock("null");
+      not_null = CreateBlock("not_null");
+      merge    = CreateBlock("merge");
+
+      box = stack()->slot_addr(slot_offset, SharkType::oop_type());
+      builder()->CreateCondBr(
+        builder()->CreateICmp(
+          ICmpInst::ICMP_EQ,
+          builder()->CreateLoad(box),
+          LLVMValue::null()),
+        null, not_null);
+
+      builder()->SetInsertPoint(null);
+      builder()->CreateBr(merge);
+
+      builder()->SetInsertPoint(not_null);
+      builder()->CreateBr(merge);      
+      
+      builder()->SetInsertPoint(merge);
+      phi = builder()->CreatePHI(box_type, "boxed_object");
+      phi->addIncoming(ConstantPointerNull::get(box_type), null);
+      phi->addIncoming(box, not_null);
+      box = phi;
+
+      param_types.push_back(box_type);
+      param_values.push_back(box);
+
+      oopmap->set_oop(SharkStack::slot2reg(slot_offset));
+
+      if (i == 0 && !is_static())
+        _receiver_slot_offset = slot_offset;
+
+      break;
+
+    case T_LONG:
+    case T_DOUBLE:
+      adjusted_offset--;
+      // fall through
+
+    default:
+      const Type *param_type = SharkType::to_stackType(arg_type(i));
+
+      param_types.push_back(param_type);
+      param_values.push_back(
+        builder()->CreateLoad(stack()->slot_addr(adjusted_offset, param_type)));
+    }                     
+  }
+
+  // The oopmap is now complete, and everything is written
+  // into the frame except the PC.
+  int pc_offset = code_buffer()->create_unique_offset();
+
+  _oop_maps = new OopMapSet();
+  oop_maps()->add_gc_map(pc_offset, oopmap);
+
+  builder()->CreateStore(
+    builder()->code_buffer_address(pc_offset),
+    stack()->slot_addr(stack()->pc_slot_offset()));
+
+  // Set up the Java frame anchor
+  stack()->CreateSetLastJavaFrame();
+
+  // Lock if necessary
+  if (is_synchronized())
+    Unimplemented();
+
+  // Change the thread state to _thread_in_native
+  CreateSetThreadState(_thread_in_native);
+
+  // Make the call
+  BasicType result_type = target()->result_type();
+  const Type* return_type;
+  if (result_type == T_VOID)
+    return_type = SharkType::void_type();
+  else if (is_returning_oop())
+    return_type = box_type;
+  else
+    return_type = SharkType::to_arrayType(result_type);
+  Value* native_function = builder()->CreateIntToPtr(
+     LLVMValue::intptr_constant((intptr_t) target()->native_function()),
+     PointerType::getUnqual(
+       FunctionType::get(return_type, param_types, false)));
+  Value *result = builder()->CreateCall(
+    native_function, param_values.begin(), param_values.end());
+
+  // Start the transition back to _thread_in_Java
+  CreateSetThreadState(_thread_in_native_trans);
+
+  // Make sure new state is visible in the GC thread
+  if (os::is_MP()) {
+    if (UseMembar)
+      { Unimplemented(); }
+    else
+      CreateWriteMemorySerializePage();
+  }
+
+  // Handle safepoint operations, pending suspend requests,
+  // and pending asynchronous exceptions.
+  BasicBlock *check_thread = CreateBlock("check_thread");
+  BasicBlock *do_safepoint = CreateBlock("do_safepoint");
+  BasicBlock *safepointed  = CreateBlock("safepointed");
+
+  Value *global_state = builder()->CreateLoad(
+    builder()->CreateIntToPtr(
+      LLVMValue::intptr_constant(
+        (intptr_t) SafepointSynchronize::address_of_state()),
+      PointerType::getUnqual(SharkType::jint_type())),
+    "global_state");
+
+  builder()->CreateCondBr(
+    builder()->CreateICmpNE(
+      global_state,
+      LLVMValue::jint_constant(SafepointSynchronize::_not_synchronized)),
+    do_safepoint, check_thread);
+
+  builder()->SetInsertPoint(check_thread);
+  Value *thread_state = builder()->CreateValueOfStructEntry(
+    thread,
+    JavaThread::suspend_flags_offset(),
+    SharkType::jint_type(),
+    "thread_state");
+
+  builder()->CreateCondBr(
+    builder()->CreateICmpNE(
+      thread_state,
+      LLVMValue::jint_constant(0)),
+    do_safepoint, safepointed);
+ 
+  builder()->SetInsertPoint(do_safepoint);
+  builder()->CreateCall(
+    builder()->check_special_condition_for_native_trans(), thread);
+  builder()->CreateBr(safepointed);
+
+  // Finally we can change the thread state to _thread_in_Java
+  builder()->SetInsertPoint(safepointed);
+  CreateSetThreadState(_thread_in_Java);
+
+  // Clear the frame anchor
+  stack()->CreateResetLastJavaFrame();
+
+  // If there is a pending exception then we can just unwind and
+  // return.  It seems totally wrong that unlocking is skipped here
+  // but apparently the template interpreter does this so we do too.
+  BasicBlock *exception    = CreateBlock("exception");
+  BasicBlock *no_exception = CreateBlock("no_exception");
+
+  builder()->CreateCondBr(
+    builder()->CreateICmpEQ(
+      CreateLoadPendingException(),
+      LLVMValue::null()),
+    no_exception, exception);
+
+  builder()->SetInsertPoint(exception);
+  CreateResetHandleBlock();
+  stack()->CreatePopFrame(0);
+  builder()->CreateRetVoid();
+
+  builder()->SetInsertPoint(no_exception);
+
+  // If the result was an oop then unbox it before
+  // releasing the handle it might be protected by
+  if (is_returning_oop()) {
+    BasicBlock *null     = builder()->GetInsertBlock();
+    BasicBlock *not_null = CreateBlock("not_null");
+    BasicBlock *merge    = CreateBlock("merge");
+
+    builder()->CreateCondBr(
+      builder()->CreateICmpNE(result, ConstantPointerNull::get(box_type)),
+      not_null, merge);
+
+    builder()->SetInsertPoint(not_null);
+    Value *unboxed_result = builder()->CreateLoad(result);
+    builder()->CreateBr(merge);
+
+    builder()->SetInsertPoint(merge);
+    PHINode *phi = builder()->CreatePHI(SharkType::oop_type(), "result");
+    phi->addIncoming(LLVMValue::null(), null);
+    phi->addIncoming(unboxed_result, not_null);
+    result = phi;
+  }
+
+  // Reset handle block
+  CreateResetHandleBlock();
+
+  // Unlock if necessary.  
+  if (is_synchronized())
+    Unimplemented();
+
+  // Unwind and return
+  Value *result_addr = stack()->CreatePopFrame(type2size[result_type]);
+  if (result_type != T_VOID) {
+    bool needs_cast = false;
+    bool is_signed = false;
+    switch (result_type) {
+    case T_BOOLEAN:
+      result = builder()->CreateICmpNE(result, LLVMValue::jbyte_constant(0));
+      needs_cast = true;
+      break;
+
+    case T_BYTE:
+      needs_cast = true;
+      break;
+      
+    case T_CHAR:
+    case T_SHORT:
+      needs_cast = true;
+      is_signed = true;
+      break;
+    }
+    if (needs_cast) {
+      result = builder()->CreateIntCast(
+        result, SharkType::to_stackType(result_type), is_signed);
+    }
+
+    builder()->CreateStore(
+      result,              
+      builder()->CreateIntToPtr(
+        result_addr,
+        PointerType::getUnqual(SharkType::to_stackType(result_type))));
+  }
+  builder()->CreateRetVoid();
+}
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,204 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+class SharkNativeWrapper : public SharkCompileInvariants {
+  friend class SharkStackWithNativeFrame;
+  
+ public:
+  static SharkNativeWrapper* build(SharkBuilder* builder,
+                                   methodHandle  target,
+                                   const char*   name,
+                                   BasicType*    arg_types,
+                                   BasicType     return_type)
+  {
+    return new SharkNativeWrapper(builder,
+                                  target,
+                                  name,
+                                  arg_types,
+                                  return_type);
+  }
+
+ private:
+  SharkNativeWrapper(SharkBuilder* builder,
+                     methodHandle  target,
+                     const char*   name,
+                     BasicType*    arg_types,
+                     BasicType     return_type)
+    : SharkCompileInvariants(NULL, builder),
+      _target(target),
+      _arg_types(arg_types),
+      _return_type(return_type),
+      _lock_slot_offset(0) { initialize(name); }
+
+ private:
+  void initialize(const char* name);
+
+ private:
+  methodHandle    _target;
+  BasicType*      _arg_types;
+  BasicType       _return_type;
+  llvm::Function* _function;
+  SharkStack*     _stack;
+  llvm::Value*    _oop_tmp_slot;
+  OopMapSet*      _oop_maps;
+  int             _receiver_slot_offset;
+  int             _lock_slot_offset;
+
+  // The method being compiled.
+ protected:
+  methodHandle target() const
+  {
+    return _target;
+  }
+
+  // Properties of the method.
+ protected:
+  int arg_size() const
+  {
+    return target()->size_of_parameters();
+  }
+  BasicType arg_type(int i) const
+  {
+    return _arg_types[i];
+  }
+  BasicType return_type() const
+  {
+    return _return_type;
+  }
+  bool is_static() const
+  {
+    return target()->is_static();
+  }
+  bool is_synchronized() const
+  {
+    return target()->is_synchronized();
+  }
+  bool is_returning_oop() const
+  {
+    return target()->is_returning_oop();
+  }
+
+  // The LLVM function we are building.
+ public:
+  llvm::Function* function() const
+  {
+    return _function;
+  }
+
+  // The Zero stack and our frame on it.
+ protected:
+  SharkStack* stack() const
+  {
+    return _stack;
+  }
+
+  // Temporary oop storage.
+ protected:
+  llvm::Value* oop_tmp_slot() const
+  {
+    assert(is_static() || is_returning_oop(), "should be");
+    return _oop_tmp_slot;
+  }
+
+  // Information required by nmethod::new_native_nmethod().
+ public:
+  int frame_size() const
+  {
+    return stack()->oopmap_frame_size();
+  }
+  ByteSize receiver_offset() const
+  {
+    return in_ByteSize(_receiver_slot_offset * wordSize);
+  }
+  ByteSize lock_offset() const
+  {
+    return in_ByteSize(_lock_slot_offset * wordSize);
+  }
+  OopMapSet* oop_maps() const
+  {
+    return _oop_maps;
+  }
+
+  // Helpers.
+ private:
+  llvm::BasicBlock* CreateBlock(const char* name = "") const
+  {
+    return llvm::BasicBlock::Create(SharkContext::current(), name, function());
+  }
+  llvm::Value* thread_state_address() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      thread(), JavaThread::thread_state_offset(),
+      llvm::PointerType::getUnqual(SharkType::jint_type()),
+      "thread_state_address");
+  }
+  llvm::Value* pending_exception_address() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      thread(), Thread::pending_exception_offset(),
+      llvm::PointerType::getUnqual(SharkType::oop_type()),
+      "pending_exception_address");
+  }
+  void CreateSetThreadState(JavaThreadState state) const
+  {
+    builder()->CreateStore(
+      LLVMValue::jint_constant(state), thread_state_address());
+  }
+  void CreateWriteMemorySerializePage() const
+  {
+    builder()->CreateStore(
+      LLVMValue::jint_constant(1),
+      builder()->CreateIntToPtr(
+        builder()->CreateAdd(
+          LLVMValue::intptr_constant(
+            (intptr_t) os::get_memory_serialize_page()),
+          builder()->CreateAnd(
+            builder()->CreateLShr(
+              builder()->CreatePtrToInt(thread(), SharkType::intptr_type()),
+              LLVMValue::intptr_constant(os::get_serialize_page_shift_count())),
+            LLVMValue::intptr_constant(os::get_serialize_page_mask()))),
+        llvm::PointerType::getUnqual(SharkType::jint_type())));
+  }
+  void CreateResetHandleBlock() const
+  {
+    llvm::Value *active_handles = builder()->CreateValueOfStructEntry(
+      thread(),
+      JavaThread::active_handles_offset(),
+      SharkType::jniHandleBlock_type(),
+      "active_handles");
+    builder()->CreateStore(
+      LLVMValue::intptr_constant(0),
+      builder()->CreateAddressOfStructEntry(
+        active_handles,
+        in_ByteSize(JNIHandleBlock::top_offset_in_bytes()),
+        llvm::PointerType::getUnqual(SharkType::intptr_type()),
+        "top"));
+  }
+  llvm::LoadInst* CreateLoadPendingException() const
+  {
+    return builder()->CreateLoad(
+      pending_exception_address(), "pending_exception");
+  }
+};
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkStack.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkStack.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,239 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008, 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_sharkStack.cpp.incl"
+
+using namespace llvm;
+
+void SharkStack::initialize(Value* method)
+{
+  bool setup_sp_and_method = (method != NULL);
+
+  int locals_words  = max_locals();
+  int extra_locals  = locals_words - arg_size();
+  int header_words  = SharkFrame::header_words;
+  int monitor_words = max_monitors()*frame::interpreter_frame_monitor_size();
+  int stack_words   = max_stack();
+  int frame_words   = header_words + monitor_words + stack_words;
+
+  _extended_frame_size = frame_words + locals_words;
+
+  // Update the stack pointer
+  Value *stack_pointer = builder()->CreateSub(
+    CreateLoadStackPointer(),
+    LLVMValue::intptr_constant((frame_words + extra_locals) * wordSize));
+  CreateHardStackOverflowCheck(stack_pointer);
+  if (setup_sp_and_method)
+    CreateStoreStackPointer(stack_pointer);
+
+  // Create the frame
+  _frame = builder()->CreateIntToPtr(
+    stack_pointer,
+    PointerType::getUnqual(
+      ArrayType::get(SharkType::intptr_type(), extended_frame_size())),
+    "frame");
+  int offset = 0;
+
+  // Expression stack
+  _stack_slots_offset = offset;
+  offset += stack_words;
+
+  // Monitors
+  _monitors_slots_offset = offset; 
+  offset += monitor_words;
+
+  // Temporary oop slot
+  _oop_tmp_slot_offset = offset++;
+
+  // Method pointer
+  _method_slot_offset = offset++;
+  if (setup_sp_and_method) {
+    builder()->CreateStore(
+      method, slot_addr(method_slot_offset(), SharkType::methodOop_type()));
+  }
+
+  // Unextended SP
+  builder()->CreateStore(stack_pointer, slot_addr(offset++));
+
+  // PC
+  _pc_slot_offset = offset++;
+
+  // Frame header
+  builder()->CreateStore(
+    LLVMValue::intptr_constant(ZeroFrame::SHARK_FRAME), slot_addr(offset++));
+  Value *fp = slot_addr(offset++);
+
+  // Local variables
+  _locals_slots_offset = offset;  
+  offset += locals_words;
+
+  // Push the frame
+  assert(offset == extended_frame_size(), "should do");
+  builder()->CreateStore(CreateLoadFramePointer(), fp);
+  CreateStoreFramePointer(
+    builder()->CreatePtrToInt(fp, SharkType::intptr_type()));
+
+  // Check we're not about to run out of stack
+  CreateSoftStackOverflowCheck(stack_pointer);
+}
+
+// Check that the stack will not overflow before a stack pointer
+// update.  Overflows here are problematic as we haven't yet
+// created a frame, so it's not clear how to report the error.
+// http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=249
+void SharkStack::CreateHardStackOverflowCheck(Value* sp)
+{
+  BasicBlock *overflow = CreateBlock("stack_overflow");
+  BasicBlock *no_overflow = CreateBlock("no_overflow");
+  
+  builder()->CreateCondBr(
+    builder()->CreateICmpULT(sp, stack_base()),
+    overflow, no_overflow);
+
+  builder()->SetInsertPoint(overflow);
+  builder()->CreateUnimplemented(__FILE__, __LINE__);
+  builder()->CreateUnreachable();
+
+  builder()->SetInsertPoint(no_overflow);  
+}
+
+// Check that a stack overflow is not imminent, throwing a
+// StackOverflowError if it is while we still have the stack
+// in which to do so.
+void SharkStack::CreateSoftStackOverflowCheck(Value* sp)
+{
+  // XXX see CppInterpreter::stack_overflow_imminent
+}
+
+Value* SharkStack::CreatePopFrame(int result_slots)
+{
+  assert(result_slots >= 0 && result_slots <= 2, "should be");
+  int locals_to_pop = max_locals() - result_slots;
+
+  Value *fp = CreateLoadFramePointer();
+  Value *sp = builder()->CreateAdd(
+    fp,
+    LLVMValue::intptr_constant((1 + locals_to_pop) * wordSize));
+
+  CreateStoreStackPointer(sp);
+  CreateStoreFramePointer(
+    builder()->CreateLoad(
+      builder()->CreateIntToPtr(
+        fp, PointerType::getUnqual(SharkType::intptr_type()))));
+
+  return sp;
+}
+
+Value* SharkStack::slot_addr(int         offset,
+                             const Type* type,
+                             const char* name) const
+{
+  bool needs_cast = type && type != SharkType::intptr_type();
+
+  Value* result = builder()->CreateStructGEP(
+    _frame, offset, needs_cast ? "" : name);
+
+  if (needs_cast) {
+    result = builder()->CreateBitCast(
+      result, PointerType::getUnqual(type), name);
+  }
+  return result;
+}
+
+// The bits that differentiate stacks with normal and native frames on top
+
+SharkStack* SharkStack::CreateBuildAndPushFrame(SharkFunction* function,
+                                                Value*         method)
+{
+  return new SharkStackWithNormalFrame(function, method);
+}
+SharkStack* SharkStack::CreateBuildAndPushFrame(SharkNativeWrapper* wrapper,
+                                                Value*              method)
+{
+  return new SharkStackWithNativeFrame(wrapper, method);
+}
+
+SharkStackWithNormalFrame::SharkStackWithNormalFrame(SharkFunction* function,
+                                                     Value*         method)
+  : SharkStack(function), _function(function)
+{
+  // For normal frames, the stack pointer and the method slot will
+  // be set during each decache, so it is not necessary to do them
+  // at the time the frame is created.  However, we set them for
+  // non-PRODUCT builds to make crash dumps easier to understand.
+  initialize(PRODUCT_ONLY(NULL) NOT_PRODUCT(method));
+}
+SharkStackWithNativeFrame::SharkStackWithNativeFrame(SharkNativeWrapper* wrp,
+                                                     Value*              method)
+  : SharkStack(wrp), _wrapper(wrp)
+{
+  initialize(method);
+}
+
+int SharkStackWithNormalFrame::arg_size() const
+{
+  return function()->arg_size();
+}
+int SharkStackWithNativeFrame::arg_size() const
+{
+  return wrapper()->arg_size();
+}
+
+int SharkStackWithNormalFrame::max_locals() const
+{
+  return function()->max_locals();
+}
+int SharkStackWithNativeFrame::max_locals() const
+{
+  return wrapper()->arg_size();
+}
+
+int SharkStackWithNormalFrame::max_stack() const
+{
+  return function()->max_stack();
+}
+int SharkStackWithNativeFrame::max_stack() const
+{
+  return 0;
+}
+
+int SharkStackWithNormalFrame::max_monitors() const
+{
+  return function()->max_monitors();
+}
+int SharkStackWithNativeFrame::max_monitors() const
+{
+  return wrapper()->is_synchronized() ? 1 : 0;
+}
+
+BasicBlock* SharkStackWithNormalFrame::CreateBlock(const char* name) const
+{
+  return function()->CreateBlock(name);
+}
+BasicBlock* SharkStackWithNativeFrame::CreateBlock(const char* name) const
+{
+  return wrapper()->CreateBlock(name);
+}
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkStack.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkStack.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -0,0 +1,292 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008, 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+class SharkFunction;
+class SharkNativeWrapper;
+class SharkStackWithNormalFrame;
+class SharkStackWithNativeFrame;
+
+class SharkStack : public SharkCompileInvariants {
+ public:
+  static SharkStack* CreateBuildAndPushFrame(
+    SharkFunction* function, llvm::Value* method);
+  static SharkStack* CreateBuildAndPushFrame(
+    SharkNativeWrapper* wrapper, llvm::Value* method);
+
+ protected:
+  SharkStack(const SharkCompileInvariants* parent)
+    : SharkCompileInvariants(parent) {}
+
+ protected:
+  void initialize(llvm::Value* method);
+
+ protected:
+  void CreateHardStackOverflowCheck(llvm::Value* sp);
+  void CreateSoftStackOverflowCheck(llvm::Value* sp);
+
+  // Properties of the method being compiled
+ protected:
+  virtual int arg_size() const = 0;
+  virtual int max_locals() const = 0;
+  virtual int max_stack() const = 0;
+  virtual int max_monitors() const = 0;
+
+  // BasicBlock creation
+ protected:
+  virtual llvm::BasicBlock* CreateBlock(const char* name = "") const = 0;
+  
+  // Interface with the Zero stack
+ private:
+  llvm::Value* zero_stack() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      thread(),
+      JavaThread::zero_stack_offset(),
+      SharkType::zeroStack_type(),
+      "zero_stack");
+  }
+  llvm::Value* stack_base() const
+  {
+    return builder()->CreateValueOfStructEntry(
+      zero_stack(),
+      ZeroStack::base_offset(),
+      SharkType::intptr_type(),
+      "stack_base");
+  }
+  llvm::Value* stack_pointer_addr() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      zero_stack(),
+      ZeroStack::sp_offset(),
+      llvm::PointerType::getUnqual(SharkType::intptr_type()),
+      "stack_pointer_addr");
+  }
+  llvm::Value* frame_pointer_addr() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      thread(),
+      JavaThread::top_zero_frame_offset(),
+      llvm::PointerType::getUnqual(SharkType::intptr_type()),
+      "frame_pointer_addr");
+  }
+
+ public:
+  llvm::LoadInst* CreateLoadStackPointer(const char *name = "")
+  {
+    return builder()->CreateLoad(stack_pointer_addr(), name);
+  }
+  llvm::StoreInst* CreateStoreStackPointer(llvm::Value* value)
+  {
+    return builder()->CreateStore(value, stack_pointer_addr());
+  }
+  llvm::LoadInst* CreateLoadFramePointer(const char *name = "")
+  {
+    return builder()->CreateLoad(frame_pointer_addr(), name);
+  }
+  llvm::StoreInst* CreateStoreFramePointer(llvm::Value* value)
+  {
+    return builder()->CreateStore(value, frame_pointer_addr());
+  }
+  llvm::Value* CreatePopFrame(int result_slots); 
+
+  // Interface with the frame anchor
+ private:
+  llvm::Value* frame_anchor_addr() const
+  {
+    return builder()->CreateAddressOfStructEntry(
+      thread(),
+      JavaThread::last_Java_sp_offset(),
+      llvm::PointerType::getUnqual(SharkType::intptr_type()),
+      "frame_anchor_addr");
+  }
+
+ public:
+  llvm::StoreInst* CreateSetLastJavaFrame()
+  {
+    return builder()->CreateStore(
+      CreateLoadFramePointer(), frame_anchor_addr());
+  }
+  llvm::StoreInst* CreateResetLastJavaFrame()
+  {
+    return builder()->CreateStore(
+      LLVMValue::intptr_constant(0), frame_anchor_addr());
+  }
+
+  // Our method's frame
+ private:
+  llvm::Value* _frame;
+  int          _extended_frame_size;
+  int          _stack_slots_offset;
+
+ public:
+  int extended_frame_size() const
+  {
+    return _extended_frame_size;
+  }
+  int oopmap_frame_size() const
+  {
+    return extended_frame_size() - arg_size();
+  }
+
+  // Offsets of things in the frame
+ private:
+  int _monitors_slots_offset;
+  int _oop_tmp_slot_offset;
+  int _method_slot_offset;
+  int _pc_slot_offset;
+  int _locals_slots_offset;
+
+ public:
+  int stack_slots_offset() const
+  {
+    return _stack_slots_offset;
+  }
+  int oop_tmp_slot_offset() const
+  {
+    return _oop_tmp_slot_offset;
+  }
+  int method_slot_offset() const
+  {
+    return _method_slot_offset;
+  }
+  int pc_slot_offset() const
+  {
+    return _pc_slot_offset;
+  }
+  int locals_slots_offset() const
+  {
+    return _locals_slots_offset;
+  }
+  int monitor_offset(int index) const
+  {
+    assert(index >= 0 && index < max_monitors(), "invalid monitor index");
+    return _monitors_slots_offset +
+      (max_monitors() - 1 - index) * frame::interpreter_frame_monitor_size();
+  }
+  int monitor_object_offset(int index) const
+  {
+    return monitor_offset(index) +
+      (BasicObjectLock::obj_offset_in_bytes() >> LogBytesPerWord);
+  }
+  int monitor_header_offset(int index) const
+  {
+    return monitor_offset(index) +
+      ((BasicObjectLock::lock_offset_in_bytes() +
+        BasicLock::displaced_header_offset_in_bytes()) >> LogBytesPerWord);
+  }
+
+  // Addresses of things in the frame
+ public:
+  llvm::Value* slot_addr(int               offset,
+                         const llvm::Type* type = NULL,
+                         const char*       name = "") const;
+  
+  llvm::Value* monitor_addr(int index) const
+  {
+    return slot_addr(
+      monitor_offset(index),
+      SharkType::monitor_type(),
+      "monitor");
+  }
+  llvm::Value* monitor_object_addr(int index) const
+  {
+    return slot_addr(
+      monitor_object_offset(index),
+      SharkType::oop_type(),
+      "object_addr");
+  }
+  llvm::Value* monitor_header_addr(int index) const
+  {
+    return slot_addr(
+      monitor_header_offset(index),
+      SharkType::intptr_type(),
+      "displaced_header_addr");
+  }  
+
+  // oopmap helpers
+ public:
+  static int oopmap_slot_munge(int offset)
+  {
+    return offset << (LogBytesPerWord - LogBytesPerInt);
+  }
+  static VMReg slot2reg(int offset)
+  {
+    return VMRegImpl::stack2reg(oopmap_slot_munge(offset));
+  }
+};
+
+class SharkStackWithNormalFrame : public SharkStack {
+  friend class SharkStack;
+
+ protected:
+  SharkStackWithNormalFrame(SharkFunction* function, llvm::Value* method);
+
+ private:
+  SharkFunction* _function;
+
+ private:
+  SharkFunction* function() const
+  {
+    return _function;
+  }
+
+  // Properties of the method being compiled
+ private:
+  int arg_size() const;
+  int max_locals() const;
+  int max_stack() const;
+  int max_monitors() const;
+
+  // BasicBlock creation
+ private:
+  llvm::BasicBlock* CreateBlock(const char* name = "") const;
+};
+
+class SharkStackWithNativeFrame : public SharkStack {
+  friend class SharkStack;
+
+ protected:
+  SharkStackWithNativeFrame(SharkNativeWrapper* wrapper, llvm::Value* method);
+
+ private:
+  SharkNativeWrapper* _wrapper;
+
+ private:
+  SharkNativeWrapper* wrapper() const
+  {
+    return _wrapper;
+  }
+
+  // Properties of the method being compiled
+ private:
+  int arg_size() const;
+  int max_locals() const;
+  int max_stack() const;
+  int max_monitors() const;
+
+  // BasicBlock creation
+ private:
+  llvm::BasicBlock* CreateBlock(const char* name = "") const;
+};
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -39,7 +39,7 @@
     process_stack_slot(
       i,
       state->stack_addr(i),
-      function()->stack_slots_offset() +
+      stack()->stack_slots_offset() +
         i + max_stack() - state->stack_depth());
   }
   end_stack();
@@ -49,17 +49,17 @@
   for (int i = 0; i < state->num_monitors(); i++) {
     process_monitor(
       i,
-      function()->monitor_offset(i),
-      function()->monitor_object_offset(i));
+      stack()->monitor_offset(i),
+      stack()->monitor_object_offset(i));
   }
   end_monitors();
 
   // Frame header
   start_frame_header();
   process_oop_tmp_slot(
-    state->oop_tmp_addr(), function()->oop_tmp_slot_offset());
-  process_method_slot(state->method_addr(), function()->method_slot_offset());
-  process_pc_slot(function()->pc_slot_offset());
+    state->oop_tmp_addr(), stack()->oop_tmp_slot_offset());
+  process_method_slot(state->method_addr(), stack()->method_slot_offset());
+  process_pc_slot(stack()->pc_slot_offset());
   end_frame_header();
 
   // Local variables
@@ -69,7 +69,7 @@
     process_local_slot(
       i,
       state->local_addr(i),
-      function()->locals_slots_offset() + max_locals() - 1 - i);
+      stack()->locals_slots_offset() + max_locals() - 1 - i);
   }
   end_locals();
 
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -28,15 +28,15 @@
 class SharkStateScanner : public SharkTargetInvariants {
  protected:
   SharkStateScanner(SharkFunction* function)
-    : SharkTargetInvariants(function), _function(function) {}
+    : SharkTargetInvariants(function), _stack(function->stack()) {}
 
  private:
-  SharkFunction* _function;
+  SharkStack* _stack;
 
  protected:
-  SharkFunction* function() const
+  SharkStack* stack() const
   {
-    return _function;
+    return _stack;
   }
 
   // Scan the frame
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Wed Nov 11 16:21:16 2009 +0000
@@ -638,7 +638,7 @@
     builder()->CreateStore(exception, pending_exception_address());
   }
 
-  Value *result_addr = function()->CreatePopFrame(type2size[type]);
+  Value *result_addr = stack()->CreatePopFrame(type2size[type]);
   if (type != T_VOID) {
     builder()->CreateStore(
       pop_result(type)->generic_value(),
@@ -1648,8 +1648,8 @@
   // of normal stack order.
   int ndims = iter()->get_dimensions();
 
-  Value *dimensions = function()->CreateAddressOfFrameEntry(
-    function()->stack_slots_offset() + max_stack() - xstack_depth(),
+  Value *dimensions = stack()->slot_addr(
+    stack()->stack_slots_offset() + max_stack() - xstack_depth(),
     ArrayType::get(SharkType::jint_type(), ndims),
     "dimensions");
 
@@ -1707,9 +1707,9 @@
   BasicBlock *lock_acquired = function()->CreateBlock("lock_acquired");
 
   int monitor = num_monitors();
-  Value *monitor_addr        = function()->monitor_addr(monitor);
-  Value *monitor_object_addr = function()->monitor_object_addr(monitor);
-  Value *monitor_header_addr = function()->monitor_header_addr(monitor);
+  Value *monitor_addr        = stack()->monitor_addr(monitor);
+  Value *monitor_object_addr = stack()->monitor_object_addr(monitor);
+  Value *monitor_header_addr = stack()->monitor_header_addr(monitor);
 
   // Store the object and mark the slot as live
   builder()->CreateStore(lockee, monitor_object_addr);
@@ -1791,9 +1791,9 @@
   BasicBlock *lock_released = function()->CreateBlock("lock_released");
 
   int monitor = num_monitors() - 1;
-  Value *monitor_addr        = function()->monitor_addr(monitor);
-  Value *monitor_object_addr = function()->monitor_object_addr(monitor);
-  Value *monitor_header_addr = function()->monitor_header_addr(monitor);
+  Value *monitor_addr        = stack()->monitor_addr(monitor);
+  Value *monitor_object_addr = stack()->monitor_object_addr(monitor);
+  Value *monitor_header_addr = stack()->monitor_header_addr(monitor);
 
   // If it is recursive then we're already done
   Value *disp = builder()->CreateLoad(monitor_header_addr);
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -49,6 +49,13 @@
     return _ciblock;
   }
 
+  // Function properties
+ public:
+  SharkStack* stack() const
+  {
+    return function()->stack();
+  }
+  
   // Typeflow properties
  public:
   int index() const
@@ -272,26 +279,6 @@
   void check_pending_exception(int action);
   void handle_exception(llvm::Value* exception, int action);
 
-  // Frame anchor
- private:
-  void set_last_Java_frame(llvm::Value* value) const
-  {
-    builder()->CreateStore(
-      value,
-      builder()->CreateAddressOfStructEntry(
-        thread(), JavaThread::last_Java_sp_offset(),
-        llvm::PointerType::getUnqual(SharkType::intptr_type()),
-        "last_Java_sp_addr"));
-  }
-  void set_last_Java_frame() const
-  {
-    set_last_Java_frame(function()->CreateLoadZeroFramePointer());
-  }
-  void reset_last_Java_frame() const
-  {
-    set_last_Java_frame(LLVMValue::intptr_constant(0));
-  }
-
   // VM calls
  private:
   llvm::CallInst* call_vm(llvm::Value*  callee,
@@ -300,9 +287,9 @@
                           int           exception_action)
   {
     decache_for_VM_call();
-    set_last_Java_frame();
+    stack()->CreateSetLastJavaFrame();
     llvm::CallInst *res = builder()->CreateCall(callee, args_start, args_end);
-    reset_last_Java_frame();
+    stack()->CreateResetLastJavaFrame();
     cache_after_VM_call();
     if (exception_action & EAM_CHECK) {
       check_pending_exception(exception_action);
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkType.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.cpp	Wed Nov 11 10:50:38 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-#include "incls/_precompiled.incl"
-#include "incls/_sharkType.cpp.incl"
-
-using namespace llvm;
-
-const PointerType*  SharkType::_cpCacheEntry_type;
-const FunctionType* SharkType::_entry_point_type;
-const FunctionType* SharkType::_osr_entry_point_type;
-const PointerType*  SharkType::_itableOffsetEntry_type;
-const PointerType*  SharkType::_klass_type;
-const PointerType*  SharkType::_methodOop_type;
-const ArrayType*    SharkType::_monitor_type;
-const PointerType*  SharkType::_oop_type;
-const PointerType*  SharkType::_thread_type;
-const PointerType*  SharkType::_zeroStack_type;
-
-const Type* SharkType::_to_stackType_tab[T_CONFLICT + 1];
-const Type* SharkType::_to_arrayType_tab[T_CONFLICT + 1];
-
-void SharkType::initialize()
-{
-  // VM types
-  _cpCacheEntry_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(ConstantPoolCacheEntry)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(ConstantPoolCacheEntry)));
-#endif
-
-  _itableOffsetEntry_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), itableOffsetEntry::size() * wordSize));
-#else
-    ArrayType::get(Type::Int8Ty, itableOffsetEntry::size() * wordSize));
-#endif
-
-  _klass_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(Klass)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(Klass)));
-#endif
-
-  _methodOop_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(methodOopDesc)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(methodOopDesc)));
-#endif
-
-  _monitor_type = ArrayType::get(
-#if SHARK_LLVM_VERSION >= 26
-      Type::getInt8Ty(getGlobalContext()),
-#else
-      Type::Int8Ty,
-#endif
-      frame::interpreter_frame_monitor_size() * wordSize);
-
-  _oop_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(oopDesc)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(oopDesc)));
-#endif
-
-  _thread_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(JavaThread)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(JavaThread)));
-#endif
-
-  _zeroStack_type = PointerType::getUnqual(
-#if SHARK_LLVM_VERSION >= 26
-    ArrayType::get(Type::getInt8Ty(getGlobalContext()), sizeof(ZeroStack)));
-#else
-    ArrayType::get(Type::Int8Ty, sizeof(ZeroStack)));
-#endif
-
-  std::vector<const Type*> params;
-  params.push_back(methodOop_type());
-  params.push_back(intptr_type());
-  params.push_back(thread_type());
-#if SHARK_LLVM_VERSION >= 26
-  _entry_point_type = FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false);
-#else
-  _entry_point_type = FunctionType::get(Type::VoidTy, params, false);
-#endif
-
-  params.clear();
-  params.push_back(methodOop_type());
-  params.push_back(PointerType::getUnqual(jbyte_type()));
-  params.push_back(intptr_type());
-  params.push_back(thread_type());
-#if SHARK_LLVM_VERSION >= 26
-  _osr_entry_point_type = FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false);
-#else
-  _osr_entry_point_type = FunctionType::get(Type::VoidTy, params, false);
-#endif
-
-  // Java types a) on the stack and in fields, and b) in arrays
-  for (int i = 0; i < T_CONFLICT + 1; i++) {
-    switch (i) {
-    case T_BOOLEAN:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jboolean_type();
-      break;
-      
-    case T_BYTE:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jbyte_type();
-      break;
-
-    case T_CHAR:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jchar_type();
-      break;
-
-    case T_SHORT:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jshort_type();
-      break;
-
-    case T_INT:
-      _to_stackType_tab[i] = jint_type();
-      _to_arrayType_tab[i] = jint_type();
-      break;
-
-    case T_LONG:
-      _to_stackType_tab[i] = jlong_type();
-      _to_arrayType_tab[i] = jlong_type();
-      break;
-
-    case T_FLOAT:
-      _to_stackType_tab[i] = jfloat_type();
-      _to_arrayType_tab[i] = jfloat_type();
-      break;
-
-    case T_DOUBLE:
-      _to_stackType_tab[i] = jdouble_type();
-      _to_arrayType_tab[i] = jdouble_type();
-      break;
-
-    case T_OBJECT:
-    case T_ARRAY:
-      _to_stackType_tab[i] = oop_type();
-      _to_arrayType_tab[i] = oop_type();
-      break;
-
-    case T_ADDRESS:
-      _to_stackType_tab[i] = intptr_type();
-      break;
-    }
-  }
-}
diff -r b3d03017bdef ports/hotspot/src/share/vm/shark/sharkType.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 10:50:38 2009 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkType.hpp	Wed Nov 11 16:21:16 2009 +0000
@@ -24,178 +24,111 @@
  */
 
 class SharkType : public AllStatic {
+ private:
+  static SharkContext& context()
+  {
+    return SharkContext::current();
+  }
+
+  // Basic types
  public:
-  static void initialize();
-
-  // C types
- public:
+  static const llvm::Type* void_type()
+  {
+    return context().void_type();
+  }
+  static const llvm::IntegerType* bit_type()
+  {
+    return context().bit_type();
+  }
+  static const llvm::IntegerType* jbyte_type()
+  {
+    return context().jbyte_type();
+  }
+  static const llvm::IntegerType* jshort_type()
+  {
+    return context().jshort_type();
+  }
+  static const llvm::IntegerType* jint_type()
+  {
+    return context().jint_type();
+  }
+  static const llvm::IntegerType* jlong_type()
+  {
+    return context().jlong_type();
+  }
+  static const llvm::Type* jfloat_type()
+  {
+    return context().jfloat_type();
+  }
+  static const llvm::Type* jdouble_type()
+  {
+    return context().jdouble_type();
+  }
   static const llvm::IntegerType* intptr_type()
   {
-#if SHARK_LLVM_VERSION >= 26
-    return LP64_ONLY(llvm::Type::getInt64Ty(llvm::getGlobalContext()))
-           NOT_LP64 (llvm::Type::getInt32Ty(llvm::getGlobalContext()));
-#else
-    return LP64_ONLY(llvm::Type::Int64Ty)
-           NOT_LP64 (llvm::Type::Int32Ty);
-#endif
+    return context().intptr_type();
   }
 
-  // VM types
- private:
-  static const llvm::PointerType*  _cpCacheEntry_type;
-  static const llvm::FunctionType* _entry_point_type;
-  static const llvm::FunctionType* _osr_entry_point_type;
-  static const llvm::PointerType*  _itableOffsetEntry_type;
-  static const llvm::PointerType*  _klass_type;
-  static const llvm::PointerType*  _methodOop_type;
-  static const llvm::ArrayType*    _monitor_type;
-  static const llvm::PointerType*  _oop_type;
-  static const llvm::PointerType*  _thread_type;
-  static const llvm::PointerType*  _zeroStack_type;
-  
+  // Compound types
  public:
-  static const llvm::PointerType* cpCacheEntry_type()
+  static const llvm::PointerType* itableOffsetEntry_type()
   {
-    return _cpCacheEntry_type;
+    return context().itableOffsetEntry_type();
+  }
+  static const llvm::PointerType* jniEnv_type()
+  {
+    return context().jniEnv_type();
+  }
+  static const llvm::PointerType* jniHandleBlock_type()
+  {
+    return context().jniHandleBlock_type();
+  }
+  static const llvm::PointerType* klass_type()
+  {
+    return context().klass_type();
+  }
+  static const llvm::PointerType* methodOop_type()
+  {
+    return context().methodOop_type();
+  }
+  static const llvm::ArrayType* monitor_type()
+  {
+    return context().monitor_type();
+  }
+  static const llvm::PointerType* oop_type()
+  {
+    return context().oop_type();
+  }
+  static const llvm::PointerType* thread_type()
+  {
+    return context().thread_type();
+  }
+  static const llvm::PointerType* zeroStack_type()
+  {
+    return context().zeroStack_type();
   }
   static const llvm::FunctionType* entry_point_type()
   {
-    return _entry_point_type;
+    return context().entry_point_type();
   }
   static const llvm::FunctionType* osr_entry_point_type()
   {
-    return _osr_entry_point_type;
-  }
-  static const llvm::PointerType* itableOffsetEntry_type()
-  {
-    return _itableOffsetEntry_type;
-  }
-  static const llvm::PointerType* klass_type()
-  {
-    return _klass_type;
-  }
-  static const llvm::PointerType* methodOop_type()
-  {
-    return _methodOop_type;
-  }
-  static const llvm::ArrayType* monitor_type()
-  {
-    return _monitor_type;
-  }
-  static const llvm::PointerType* oop_type()
-  {
-    return _oop_type;
-  }
-  static const llvm::PointerType* thread_type()
-  {
-    return _thread_type;
-  }
-  static const llvm::PointerType* zeroStack_type()
-  {
-    return _zeroStack_type;
+    return context().osr_entry_point_type();
   }
 
-  // Java types
- public:
-  static const llvm::IntegerType* jboolean_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt8Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int8Ty;
-#endif
-  }
-  static const llvm::IntegerType* jbyte_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt8Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int8Ty;
-#endif
-  }
-  static const llvm::IntegerType* jchar_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt16Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int16Ty;
-#endif
-  }
-  static const llvm::IntegerType* jshort_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt16Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int16Ty;
-#endif
-  }
-  static const llvm::IntegerType* jint_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt32Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int32Ty;
-#endif
-  }
-  static const llvm::IntegerType* jlong_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getInt64Ty(llvm::getGlobalContext());
-#else
-    return llvm::Type::Int64Ty;
-#endif
-  }
-  static const llvm::Type* jfloat_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getFloatTy(llvm::getGlobalContext());
-#else
-    return llvm::Type::FloatTy;
-#endif
-  }
-  static const llvm::Type* jdouble_type()
-  {
-#if SHARK_LLVM_VERSION >= 26
-    return llvm::Type::getDoubleTy(llvm::getGlobalContext());
-#else
-    return llvm::Type::DoubleTy;
-#endif
-  }
-
-  // Java types as they appear on the stack and in fields
- private:
-  static const llvm::Type* _to_stackType_tab[T_CONFLICT + 1];
-
+  // Mappings
  public:
   static const llvm::Type* to_stackType(BasicType type)
   {
-#ifdef ASSERT
-    if (type < 0 || type > T_CONFLICT || _to_stackType_tab[type] == NULL) {
-      tty->print_cr("Unhandled type %s", type2name(type));
-      ShouldNotReachHere();
-    }
-#endif // ASSERT
-    return _to_stackType_tab[type];
+    return context().to_stackType(type);
   }
   static const llvm::Type* to_stackType(ciType* type)
   {
     return to_stackType(type->basic_type());
   }
-
-  // Java types as they appear in arrays
- private:
-  static const llvm::Type* _to_arrayType_tab[T_CONFLICT + 1];
-
- public:
   static const llvm::Type* to_arrayType(BasicType type)
   {
-#ifdef ASSERT
-    if (type < 0 || type > T_CONFLICT || _to_arrayType_tab[type] == NULL) {
-      tty->print_cr("Unhandled type %s", type2name(type));
-      ShouldNotReachHere();
-    }
-#endif // ASSERT
-    return _to_arrayType_tab[type];
+    return context().to_arrayType(type);
   }
   static const llvm::Type* to_arrayType(ciType* type)
   {

From gbenson at redhat.com  Wed Nov 11 09:37:20 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 11 Nov 2009 17:37:20 +0000
Subject: Native method wrapper generation
Message-ID: <20091111173720.GA17404@redhat.com>

Hi all,

This commit adds native wrapper generation to Shark.  It also removes
support for LLVM < 2.6, because the new code requires it.  I'll write
this up in more detail tomorrow with some benchmarks.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch.gz
Type: application/x-gzip
Size: 24621 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/da302eca/patch.gz 

From mvfranz at gmail.com  Wed Nov 11 14:07:04 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Wed, 11 Nov 2009 17:07:04 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <20091111140940.GG3256@redhat.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
	<20091111140940.GG3256@redhat.com>
Message-ID: <fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>

On Wed, Nov 11, 2009 at 9:09 AM, Gary Benson <gbenson at redhat.com> wrote:

> Michael Franz wrote:
> > On Wed, Nov 11, 2009 at 8:55 AM, Gary Benson <gbenson at redhat.com> wrote:
> > > Michael Franz wrote:
> > > > On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com>
> wrote:
> > > > > Michael Franz wrote:
> > > > > > I am building on a G4 which is 32 bits, but _LP64=1 is being
> > > > > > defined.  This is causing problems as jlong is being defined
> > > > > > incorrectly (long instead of long long).  How do I unset
> > > > > > _LP64?
> > > > >
> > > > > What does 'uname -m' say on your machine?
> > > > >
> > > > > uname -m
> > > >
> > > > ppc
> > > >
> > > > I was able to get the build to progress by setting
> > > > ARCH_DATA_MODEL=32 before calling make.  I did this since there
> > > > didn't seem to be a case where the ARCH was equal to ppc and it
> > > > then defaults to 64.
> > >
> > > Interesting.  Is this with IcedTea7?
> > >
> > > Yes,  It is current TIP as of a few days ago.
>
> Ah, it looks like it hasn't been updated with the different
> environment variables that the upstreamed Zero requires.
> I'll fix it...
>

My build finished successfully when I set arch before make.  That seems to
be the only thing missing.  I am going to try with the latest TIP.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/cdb74076/attachment.html 

From mvfranz at gmail.com  Wed Nov 11 20:23:07 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Wed, 11 Nov 2009 23:23:07 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>
References: <fee4d890911081546v6f0d3e78x3a4578e1cf4ecd97@mail.gmail.com>
	<17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
	<20091111140940.GG3256@redhat.com>
	<fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>
Message-ID: <fee4d890911112023h181cbbc7m600a52c6562548db@mail.gmail.com>

On Wed, Nov 11, 2009 at 5:07 PM, Michael Franz <mvfranz at gmail.com> wrote:

>
>
> On Wed, Nov 11, 2009 at 9:09 AM, Gary Benson <gbenson at redhat.com> wrote:
>
>> Michael Franz wrote:
>> > On Wed, Nov 11, 2009 at 8:55 AM, Gary Benson <gbenson at redhat.com>
>> wrote:
>> > > Michael Franz wrote:
>> > > > On Wed, Nov 11, 2009 at 4:46 AM, Gary Benson <gbenson at redhat.com>
>> wrote:
>> > > > > Michael Franz wrote:
>> > > > > > I am building on a G4 which is 32 bits, but _LP64=1 is being
>> > > > > > defined.  This is causing problems as jlong is being defined
>> > > > > > incorrectly (long instead of long long).  How do I unset
>> > > > > > _LP64?
>> > > > >
>> > > > > What does 'uname -m' say on your machine?
>> > > > >
>> > > > > uname -m
>> > > >
>> > > > ppc
>> > > >
>> > > > I was able to get the build to progress by setting
>> > > > ARCH_DATA_MODEL=32 before calling make.  I did this since there
>> > > > didn't seem to be a case where the ARCH was equal to ppc and it
>> > > > then defaults to 64.
>> > >
>> > > Interesting.  Is this with IcedTea7?
>> > >
>> > > Yes,  It is current TIP as of a few days ago.
>>
>> Ah, it looks like it hasn't been updated with the different
>> environment variables that the upstreamed Zero requires.
>> I'll fix it...
>>
>
> My build finished successfully when I set arch before make.  That seems to
> be the only thing missing.  I am going to try with the latest TIP.
>

The latest does not build.  Here is the error:
mkdir -p extra-lib
/home/mfranz/icedtea/icedtea/bootstrap/jdk1.6.0/bin/javac  -g -encoding
utf-8  -source 5 -target 5 -d extra-lib \
      -classpath /home/mfranz/icedtea/icedtea/lib/rt \
      -sourcepath
/home/mfranz/icedtea/icedtea/extra:/home/mfranz/icedtea/icedtea/generated:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/home/mfranz/icedtea/icedtea/netx
\
      -bootclasspath \'\' \
      @extra-source-files.txt ; \
    cp -r
/home/mfranz/icedtea/icedtea/extra/net/sourceforge/jnlp/about/resources \
      extra-lib/net/sourceforge/jnlp/about
javac: PPCJITInfo.cpp:391: virtual void llvm::PPCJITInfo::relocate(void*,
llvm::MachineRelocation*, unsigned int, unsigned char*): Assertion
`ResultPtr >= -(1 << 23) && ResultPtr < (1 << 23) && "Relocation out of
range!"' failed.
Stack dump:
0.    Running pass 'PowerPC Machine Code Emitter' on function
'@"com.sun.tools.javac.file.ZipFileIndex$ZipDirectory::readEntry"'
/bin/sh: line 6:  9353 Aborted
/home/mfranz/icedtea/icedtea/bootstrap/jdk1.6.0/bin/javac -g -encoding utf-8
-source 5 -target 5 -d extra-lib -classpath
/home/mfranz/icedtea/icedtea/lib/rt -sourcepath
/home/mfranz/icedtea/icedtea/extra:/home/mfranz/icedtea/icedtea/generated:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/home/mfranz/icedtea/icedtea/netx
-bootclasspath \'\' @extra-source-files.txt
cp: cannot create directory `extra-lib/net/sourceforge/jnlp/about': No such
file or directory
make: *** [stamps/extra-class-files.stamp] Error 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091111/957bd920/attachment.html 

From gbenson at redhat.com  Thu Nov 12 02:19:15 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 12 Nov 2009 10:19:15 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911112023h181cbbc7m600a52c6562548db@mail.gmail.com>
References: <17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911081555r42275e14vd962731e2c6638d6@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
	<20091111140940.GG3256@redhat.com>
	<fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>
	<fee4d890911112023h181cbbc7m600a52c6562548db@mail.gmail.com>
Message-ID: <20091112101915.GA3424@redhat.com>

Michael Franz wrote:
> The latest does not build.  Here is the error:
[snip]
> javac: PPCJITInfo.cpp:391: virtual void llvm::PPCJITInfo::relocate(void*,
> llvm::MachineRelocation*, unsigned int, unsigned char*): Assertion
> `ResultPtr >= -(1 << 23) && ResultPtr < (1 << 23) && "Relocation out of
> range!"' failed.

You need to patch LLVM to run Shark with LLVM 2.6 on PowerPC:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399

Cheers,
Gary

-- 
http://gbenson.net/


From galder at jboss.org  Thu Nov 12 03:48:32 2009
From: galder at jboss.org (Galder Zamarreno)
Date: Thu, 12 Nov 2009 12:48:32 +0100
Subject: Support for com.sun.management.jmxremote.host at some point?
Message-ID: <4AFBF610.1060601@jboss.org>

Hi all,

I've noticed that Java does not allow starting multiple jmx agents in 
the same machine under the same port but passing somehow a different 
bind host/ip address. jmx agents are bound to 
InetAddress.anyLocalAddress() (0.0.0.0)

Does anyone know if there're plans to support something like 
com.sun.management.jmxremote.host ?

Cheers,
-- 
Galder Zamarre?o
Sr. Software Engineer
Infinispan, JBoss Cache


From galder at redhat.com  Thu Nov 12 03:43:50 2009
From: galder at redhat.com (Galder Zamarreno)
Date: Thu, 12 Nov 2009 12:43:50 +0100
Subject: Support for com.sun.management.jmxremote.host at some point?
Message-ID: <4AFBF4F6.8060801@redhat.com>

Hi all,

I've noticed that Java does not allow starting multiple jmx agents in 
the same machine under the same port but passing somehow a different 
bind host/ip address. jmx agents are bound to 
InetAddress.anyLocalAddress() (0.0.0.0)

Does anyone know if there're plans to support something like 
com.sun.management.jmxremote.host ?

Cheers,
-- 
Galder Zamarre?o
Sr. Software Engineer
Infinispan, JBoss Cache


From galder at jboss.org  Thu Nov 12 04:05:39 2009
From: galder at jboss.org (Galder Zamarreno)
Date: Thu, 12 Nov 2009 13:05:39 +0100
Subject: Support for com.sun.management.jmxremote.host at some point?
In-Reply-To: <4AFBF610.1060601@jboss.org>
References: <4AFBF610.1060601@jboss.org>
Message-ID: <4AFBFA13.1050202@jboss.org>

p.s. I wouldn't mind implementing this myself, though I have no idea 
what's the official way to submit and implement this stuff if not yet 
available :)

On 11/12/2009 12:48 PM, Galder Zamarreno wrote:
> Hi all,
>
> I've noticed that Java does not allow starting multiple jmx agents in
> the same machine under the same port but passing somehow a different
> bind host/ip address. jmx agents are bound to
> InetAddress.anyLocalAddress() (0.0.0.0)
>
> Does anyone know if there're plans to support something like
> com.sun.management.jmxremote.host ?
>
> Cheers,

-- 
Galder Zamarre?o
Sr. Software Engineer
Infinispan, JBoss Cache


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 04:31:42 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 12:31:42 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8Ypy-0005hk-PP@icedtea.classpath.org>

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





------- Comment #5 from gnu_andrew at member.fsf.org  2009-11-12 12:31 -------
The OpenJDK provided by Red Hat (note the space between the two words) in RHEL
and thus CentOS is now quite old, but it does have the advantage of being a
certified build, whereas this won't be the case with your own.


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


From xerxes at zafena.se  Thu Nov 12 06:58:19 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 12 Nov 2009 15:58:19 +0100
Subject: [patch] rfc: shark llvm2.7 hotspot macros.hpp NOT_X86 patch
Message-ID: <4AFC228B.9090408@zafena.se>

Shark require the NOT_X86 macro to build with llvm 2.7 and later, the
attached patch adds this new macro to hotspot.
ok to push?

Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-shark_hotspot_NOT_X86.patch
Type: text/x-patch
Size: 914 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091112/77089ff2/icedtea-shark_hotspot_NOT_X86.patch 

From xerxes at zafena.se  Thu Nov 12 07:07:05 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 12 Nov 2009 16:07:05 +0100
Subject: [patch] rfc: shark llvm2.7 r86606 sharkMemoryManager fix
Message-ID: <4AFC2499.8020906@zafena.se>

The  dlsym stubs got removed from JITMemoryManager in llvm 2.7svn r86606
and the attached patch updates sharkMemoryManager accordingly.
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?r1=84859&r2=86606

Cheers
Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm2.7_r86606_sharkMemoryManager-fix.patch
Type: text/x-patch
Size: 1453 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091112/a43ff404/llvm2.7_r86606_sharkMemoryManager-fix.patch 

From gbenson at redhat.com  Thu Nov 12 07:24:25 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 12 Nov 2009 15:24:25 +0000
Subject: [patch] rfc: shark llvm2.7 hotspot macros.hpp NOT_X86 patch
In-Reply-To: <4AFC228B.9090408@zafena.se>
References: <4AFC228B.9090408@zafena.se>
Message-ID: <20091112152425.GC3424@redhat.com>

Xerxes R?nby wrote:
> Shark require the NOT_X86 macro to build with llvm 2.7 and later,
> the attached patch adds this new macro to hotspot.  ok to push?

Push away :)

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Thu Nov 12 07:25:21 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 12 Nov 2009 15:25:21 +0000
Subject: [patch] rfc: shark llvm2.7 r86606 sharkMemoryManager fix
In-Reply-To: <4AFC2499.8020906@zafena.se>
References: <4AFC2499.8020906@zafena.se>
Message-ID: <20091112152521.GD3424@redhat.com>

Xerxes R?nby wrote:
> The dlsym stubs got removed from JITMemoryManager in llvm 2.7svn
> r86606 and the attached patch updates sharkMemoryManager
> accordingly.
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?r1=84859&r2=86606

Please push this too.

Cheers,
Gary

-- 
http://gbenson.net/


From xranby at icedtea.classpath.org  Thu Nov 12 07:35:03 2009
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 15:35:03 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.89f162ea4ec7.1258040103.2873452341184383832@icedtea.classpath.org>

changeset 89f162ea4ec7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=89f162ea4ec7
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Nov 12 16:36:32 2009 +0100

	Added NOT_X86 macro to fix Shark + LLVM 2.7 builds.

	2009-11-12 Xerxes R?nby <xerxes at zafena.se>

	 * patches/icedtea-shark.patch
	(hotspot/src/share/vm/utilities/macros.hpp): Added NOT_X86
	macro.


changeset 86479d159627 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=86479d159627
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Nov 12 16:39:22 2009 +0100

	Adjust sharkMemoryManager to support LLVM 2.7svn rev 86606.

	2009-11-12 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
	(SharkMemoryManager::getDlsymTable): Made dependent on the LLVM
	version to be buildable with LLVM 2.7svn r86606 and later.
	(SharkMemoryManager::SetDlsymTable): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
	(SharkMemoryManager::getDlsymTable): Likewise.
	(SharkMemoryManager::SetDlsymTable): Likewise.


diffstat:

4 files changed, 40 insertions(+)
ChangeLog                                               |   16 ++++++++++++
patches/icedtea-shark.patch                             |   20 +++++++++++++++
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |    2 +
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    2 +

diffs (83 lines):

diff -r b412bab45028 -r 86479d159627 ChangeLog
--- a/ChangeLog	Wed Nov 11 16:08:49 2009 +0000
+++ b/ChangeLog	Thu Nov 12 16:39:22 2009 +0100
@@ -1,3 +1,19 @@ 2009-11-11  Gary Benson  <gbenson at redhat
+2009-11-12  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
+	(SharkMemoryManager::getDlsymTable): Made dependent on the LLVM version
+	to be buildable with LLVM 2.7svn r86606 and later.
+	(SharkMemoryManager::SetDlsymTable): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
+	(SharkMemoryManager::getDlsymTable): Likewise.
+	(SharkMemoryManager::SetDlsymTable): Likewise.
+
+2009-11-12  Xerxes R??nby  <xerxes at zafena.se>
+
+	* patches/icedtea-shark.patch
+	(hotspot/src/share/vm/utilities/macros.hpp):
+	Added NOT_X86 macro.
+
 2009-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
diff -r b412bab45028 -r 86479d159627 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch	Wed Nov 11 16:08:49 2009 +0000
+++ b/patches/icedtea-shark.patch	Thu Nov 12 16:39:22 2009 +0100
@@ -388,3 +388,23 @@ diff -r 0d80af392e67 openjdk/hotspot/src
    ((CodeBlob*)(this))->flush();
  
    CodeCache::free(this);
+Index: openjdk/hotspot/src/share/vm/utilities/macros.hpp
+===================================================================
+--- openjdk.orig/ports/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:17:14.458064088 +0100
++++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:19:18.097063844 +0100
+@@ -146,12 +146,14 @@
+ #define NOT_WINDOWS(code) code
+ #endif
+ 
+-#if defined(IA32) || defined(AMD64)
++#if defined(IA32) || defined(IA64) || defined(AMD64)
+ #define X86
+ #define X86_ONLY(code) code
++#define NOT_X86(code)
+ #else
+ #undef X86
+ #define X86_ONLY(code)
++#define NOT_X86(code) code
+ #endif
+ 
+ #ifdef IA32
diff -r b412bab45028 -r 86479d159627 ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Wed Nov 11 16:08:49 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp	Thu Nov 12 16:39:22 2009 +0100
@@ -109,6 +109,7 @@ uint8_t* SharkMemoryManager::allocateGlo
   return mm()->allocateGlobal(Size, Alignment);
 }
 
+#if SHARK_LLVM_VERSION < 27
 void* SharkMemoryManager::getDlsymTable() const
 {
   return mm()->getDlsymTable();
@@ -118,6 +119,7 @@ void SharkMemoryManager::SetDlsymTable(v
 {
   mm()->SetDlsymTable(ptr);
 }
+#endif
 
 void SharkMemoryManager::setPoisonMemory(bool poison)
 {
diff -r b412bab45028 -r 86479d159627 ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Wed Nov 11 16:08:49 2009 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp	Thu Nov 12 16:39:22 2009 +0100
@@ -71,8 +71,10 @@ class SharkMemoryManager : public llvm::
                          unsigned char* TableStart,
                          unsigned char* TableEnd,
                          unsigned char* FrameRegister);
+#if SHARK_LLVM_VERSION < 27
   void* getDlsymTable() const;
   void SetDlsymTable(void *ptr);
+#endif
   void setPoisonMemory(bool);
   uint8_t* allocateGlobal(uintptr_t, unsigned int);
   void setMemoryWritable();


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 08:03:00 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 16:03:00 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8c8S-0001cB-UL@icedtea.classpath.org>

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





------- Comment #6 from mbaudier at argeo.org  2009-11-12 16:02 -------
I am fully aware of that.

My strategy is to use the custom build on the desktop but to keep developing
and testing using the provided OpenJDK, and use it for server deployment.

Concretely:
- Build the Open JDK using IcedTea (./configure --with-openjdk
--with-parallel-jobs=4 --enable-npplugin)
- Deploy it under /opt
- Use it only:
  - to start Eclipse (thus working around the above bug)
  - as a Firefox plugin (also lacking in RH provided JDK): ln -s
/opt/openjdk-1.6.0-b16/jre/lib/amd64/IcedTeaNPPlugin.so
/usr/lib64/mozilla/plugins/IcedTeaNPPlugin.so 
- use the RH provided OpenJDK as a registered JRE in Eclipse (for compilation
and testing)
- use the RH provided OpenJDK on server deployment

As for Red Hat being written RedHat, I guess that I make too much Java and tend
to see the world as a set of classes... 

class RedHat extends UsFirm implements LinuxVendor, ServiceProvider,
KernelContributor {} ;)


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 08:19:17 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 16:19:17 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8cOD-0002Ex-7x@icedtea.classpath.org>

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





------- Comment #7 from jon.vanalten at redhat.com  2009-11-12 16:19 -------
Just an FYI: Looking at your ./config args, you may be setting yourself up for
some problems wrt plugin.  See
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=385

Leaving off the -enable-npplugin will allow the (stable, sane) default plugin
to be built.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 08:28:16 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 16:28:16 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8cWu-0002dw-Jq@icedtea.classpath.org>

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





------- Comment #8 from mbaudier at argeo.org  2009-11-12 16:28 -------
I tried first to build the standard plugin but the configure failed: it did not
find the proper XulRunner version (also I had installed unstable etc.)

Installed Packages
xulrunner.x86_64                           1.9.0.15-3.el5_4           
installed
xulrunner-devel.x86_64                     1.9.0.15-3.el5_4           
installed
xulrunner-devel-unstable.x86_64            1.9.0.15-3.el5_4           
installed

So I made a first run disabling plugin build altogether (in order to test that
it fixed this ticket issue), and then tried the "other" plugin (which is so far
good enough for my needs).

I am under CentOS 5.4, up to date.

Are you interested that I properly report my issue with the standard plugin
build? 
(in other words, is it supposed to work at all? I guessed no at the time, since
the Mozilla plugin is not available in the RH provided JDK)

Thanks for the FYI anyhow!


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 08:51:35 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 16:51:35 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8ctT-0001eN-VE@icedtea.classpath.org>

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





------- Comment #9 from jon.vanalten at redhat.com  2009-11-12 16:51 -------
Please do report build issue w/ default plugin!   :D


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 12:33:49 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 20:33:49 +0000
Subject: [Bug 403] New: Shark during Java2Demo demos.Mix.JavaMedia
Message-ID: <E1N8gMX-0007w3-A8@icedtea.classpath.org>

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

           Summary: Shark during Java2Demo demos.Mix.JavaMedia
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: http://java.sun.com/products/java-
                    media/2D/samples/java2demo/Java2Demo.html
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: xerxes at zafena.se


testcase: 
appletviewer
http://java.sun.com/products/java-media/2D/samples/java2demo/Java2Demo.html

or

java -cp Java2Demo.jar demos.Mix.JavaMedia
make sure the demo access the media diectory with the audio samples, the bug
hits during initialization if gervill midi when the demo loads
media/trippygaia1.mid

Result:
java version "1.6.0_0"
OpenJDK Runtime Environment (IcedTea6 1.5-rafa643fbffde) (build 1.6.0_0-b16)
OpenJDK Shark VM (build 14.0-b15, mixed mode)
llvm used are 26svn

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (ciObjectFactory.cpp:335), pid=27871, tid=2478779248
#  Error: ShouldNotReachHere()
#
# JRE version: 6.0-b16
# Java VM: OpenJDK Shark VM (14.0-b15 mixed mode linux-i386 )
# If you would like to submit a bug report, please include
# instructions how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
#

---------------  T H R E A D  ---------------

Current thread (0xb7e8cfe0):  JavaThread "CompilerThread0" daemon
[_thread_in_vm, id=27877, stack(0x93b73000,0x93bf3000)]

Java stack:
 stack not set up

Current CompileTask:
shark:587  !   com.sun.media.sound.SoftMainMixer.processAudioBuffers()V (1611
bytes)

I have also tested using latest llvm tip and icedtea6 hg tip from 2009-11-12:
the bug are fully reproducable all fails with the same error:

#  Internal Error (ciObjectFactory.cpp:335), pid=2998, tid=2466618224
#  Error: ShouldNotReachHere()

Here running on ia32.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 12:34:32 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 20:34:32 +0000
Subject: [Bug 403] Shark ShouldNotReachHere() during Java2Demo
	demos.Mix.JavaMedia
Message-ID: <E1N8gNE-0007ze-3D@icedtea.classpath.org>

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


xerxes at zafena.se changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|Shark during Java2Demo      |Shark ShouldNotReachHere()
                   |demos.Mix.JavaMedia         |during Java2Demo
                   |                            |demos.Mix.JavaMedia




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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 12:48:42 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 20:48:42 +0000
Subject: [Bug 404] New: make dist fails: No rule to make target
	`IcedTeaNPPlugin.cc', needed by `distdir'
Message-ID: <E1N8gaw-000142-Kx@icedtea.classpath.org>

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

           Summary: make dist fails: No rule to make target
                    `IcedTeaNPPlugin.cc', needed by `distdir'
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: xerxes at zafena.se


using Icedtea6 trunk:

Testcase:
./autogen.sh
./configure
make dist

Result:
make: *** No rule to make target `IcedTeaNPPlugin.cc', needed by `distdir'. 
Stop.

Expected result:
created dist tarball.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 13:38:53 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 21:38:53 +0000
Subject: [Bug 405] New: Cannot link default plugin when building on CentOS 5.4
	x86_64
Message-ID: <E1N8hNV-0001Pt-UH@icedtea.classpath.org>

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

           Summary: Cannot link default plugin when building on CentOS 5.4
                    x86_64
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mbaudier at argeo.org


As discussed in bug #401, when building icedtea6-1.6 on CentOS 5.4 x86_64 (up
to date as of this comment), I get the following issue:

g++ -g -O2 \
          IcedTeaPlugin.o \
          -L/lib64 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm
-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0   \
          -L/usr/lib64/xulrunner-sdk-1.9/sdk/lib
-L/usr/lib64/xulrunner-sdk-1.9/lib -lmozjs -lxpcomglue_s -lxul -lxpcom -lplds4
-lplc4 -lnspr4 -lpthread -ldl   \
          -shared -o IcedTeaPlugin.so
/usr/bin/ld:
/usr/lib64/xulrunner-sdk-1.9/sdk/lib/libxpcomglue_s.a(nsThreadUtils.o):
relocation R_X86_64_PC32 against `nsIThreadManager::COMTypeInfo<int>::kIID' can
not be used when making a shared object; recompile with -fPIC
/usr/bin/ld: final link failed: Bad value
collect2: ld returned 1 exit status
make: *** [IcedTeaPlugin.so] Error 1

I did:
./configure --with-openjdk
make

I can workaround the issue with the other plugin (although it is apparently not
recommended as described in bug #385):
./configure --with-openjdk --enable-npplugin

This kind of -fPIC issue reminds me of issue I regularly have when building JNI
interfaces in x86_64 platforms...

Please tell me if you need more information.

Installed xulrunner:

Installed Packages
xulrunner.x86_64                           1.9.0.15-3.el5_4           
installed
xulrunner-devel.x86_64                     1.9.0.15-3.el5_4           
installed
xulrunner-devel-unstable.x86_64            1.9.0.15-3.el5_4           
installed
Available Packages
xulrunner.i386                             1.9.0.15-3.el5_4            updates  
xulrunner-devel.i386                       1.9.0.15-3.el5_4            updates


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 13:39:27 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 21:39:27 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1N8hO3-0001Qu-Ic@icedtea.classpath.org>

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





------- Comment #10 from mbaudier at argeo.org  2009-11-12 21:39 -------
Done in bug #405


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


From andrew at icedtea.classpath.org  Thu Nov 12 13:57:07 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 21:57:07 +0000
Subject: /hg/icedtea: Normalize the whitespace in the JTReg sources using...
Message-ID: <hg.1cc292b49ad2.1258063026.-6899778133799504387@icedtea.classpath.org>

changeset 1cc292b49ad2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1cc292b49ad2
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Nov 12 21:27:25 2009 +0000

	Normalize the whitespace in the JTReg sources using the Sun script.

	2009-11-12 Andrew John Hughes <ahughes at redhat.com>

	 * test/jtreg/com/sun/interview/AllFilesFileFilter.java,
		* test/jtreg/com/sun/interview/Checklist.java,
		* test/jtreg/com/sun/interview/ChoiceArrayQuestion.java,
		* test/jtreg/com/sun/interview/ChoiceQuestion.java,
		* test/jtreg/com/sun/interview/DirectoryFileFilter.java,
		* test/jtreg/com/sun/interview/ErrorQuestion.java,
		* test/jtreg/com/sun/interview/ExtensionFileFilter.java,
		* test/jtreg/com/sun/interview/FileListQuestion.java,
		* test/jtreg/com/sun/interview/FileQuestion.java,
		* test/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java,
		* test/jtreg/com/sun/interview/FinalQuestion.java,
		* test/jtreg/com/sun/interview/FloatQuestion.java,
		* test/jtreg/com/sun/interview/InetAddressQuestion.java,
		* test/jtreg/com/sun/interview/IntQuestion.java,
		* test/jtreg/com/sun/interview/Interview.java,
		* test/jtreg/com/sun/interview/InterviewQuestion.java,
		* test/jtreg/com/sun/interview/InterviewSet.java,
		* test/jtreg/com/sun/interview/ListQuestion.java,
		* test/jtreg/com/sun/interview/NullQuestion.java,
		* test/jtreg/com/sun/interview/Properties2.java,
		* test/jtreg/com/sun/interview/PropertiesQuestion.java,
		* test/jtreg/com/sun/interview/Question.java,
		* test/jtreg/com/sun/interview/StringListQuestion.java,
		* test/jtreg/com/sun/interview/StringQuestion.java,
		* test/jtreg/com/sun/interview/TreeQuestion.java,
		* test/jtreg/com/sun/interview/WizEdit.java,
		* test/jtreg/com/sun/interview/WizPrint.java,
		* test/jtreg/com/sun/interview/YesNoQuestion.java,
		* test/jtreg/com/sun/interview/wizard/ActionDocListener.java,
		* test/jtreg/com/sun/interview/wizard/ActionListDataListener.java,
		* test/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java
	,
		* test/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/EditableList.java,
		* test/jtreg/com/sun/interview/wizard/Exporter.java,
		* test/jtreg/com/sun/interview/wizard/FileList.java,
		* test/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/I18NResourceBundle.java,
		* test/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java
	,
		* test/jtreg/com/sun/interview/wizard/InfoPanel.java,
		* test/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/PathPanel.java,
		* test/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/QuestionPanel.java,
		* test/jtreg/com/sun/interview/wizard/QuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/RenderingUtilities.java,
		* test/jtreg/com/sun/interview/wizard/SearchDialog.java,
		* test/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/SwingFileFilter.java,
		* test/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java,
		* test/jtreg/com/sun/interview/wizard/TypeInPanel.java,
		* test/jtreg/com/sun/interview/wizard/WizPane.java,
		* test/jtreg/com/sun/interview/wizard/Wizard.java,
		* test/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java,
		* test/jtreg/com/sun/javatest/AllTestsFilter.java,
		* test/jtreg/com/sun/javatest/BasicParameters.java,
		* test/jtreg/com/sun/javatest/Command.java,
		* test/jtreg/com/sun/javatest/CompositeFilter.java,
		* test/jtreg/com/sun/javatest/DefaultTestRunner.java,
		* test/jtreg/com/sun/javatest/Deprecated.java,
		* test/jtreg/com/sun/javatest/EditJTI.java,
		* test/jtreg/com/sun/javatest/EditLinks.java,
		* test/jtreg/com/sun/javatest/ExcludeList.java,
		* test/jtreg/com/sun/javatest/ExcludeListFilter.java,
		* test/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java,
		* test/jtreg/com/sun/javatest/FileParameters.java,
		* test/jtreg/com/sun/javatest/Harness.java,
		* test/jtreg/com/sun/javatest/HarnessHttpHandler.java,
		* test/jtreg/com/sun/javatest/InitialUrlFilter.java,
		* test/jtreg/com/sun/javatest/InterviewParameters.java,
		* test/jtreg/com/sun/javatest/InterviewPropagator.java,
		* test/jtreg/com/sun/javatest/JavaTestError.java,
		* test/jtreg/com/sun/javatest/JavaTestSecurityManager.java,
		* test/jtreg/com/sun/javatest/Keywords.java,
		* test/jtreg/com/sun/javatest/KeywordsFilter.java,
		* test/jtreg/com/sun/javatest/LastRunFilter.java,
		* test/jtreg/com/sun/javatest/LastRunInfo.java,
		* test/jtreg/com/sun/javatest/ObservableTestFilter.java,
		* test/jtreg/com/sun/javatest/Parameters.java,
		* test/jtreg/com/sun/javatest/ProductInfo.java,
		* test/jtreg/com/sun/javatest/ResourceTable.java,
		* test/jtreg/com/sun/javatest/Script.java,
		* test/jtreg/com/sun/javatest/Status.java,
		* test/jtreg/com/sun/javatest/StatusFilter.java,
		* test/jtreg/com/sun/javatest/TRT_HttpHandler.java,
		* test/jtreg/com/sun/javatest/TRT_Iterator.java,
		* test/jtreg/com/sun/javatest/TRT_TreeNode.java,
		* test/jtreg/com/sun/javatest/TemplateUtilities.java,
		* test/jtreg/com/sun/javatest/Test.java,
		* test/jtreg/com/sun/javatest/TestDescription.java,
		* test/jtreg/com/sun/javatest/TestEnvContext.java,
		* test/jtreg/com/sun/javatest/TestEnvironment.java,
		* test/jtreg/com/sun/javatest/TestFilter.java,
		* test/jtreg/com/sun/javatest/TestFinder.java,
		* test/jtreg/com/sun/javatest/TestFinderQueue.java,
		* test/jtreg/com/sun/javatest/TestResult.java,
		* test/jtreg/com/sun/javatest/TestResultCache.java,
		* test/jtreg/com/sun/javatest/TestResultTable.java,
		* test/jtreg/com/sun/javatest/TestRunner.java,
		* test/jtreg/com/sun/javatest/Trace.java,
		* test/jtreg/com/sun/javatest/WorkDirectory.java,
		* test/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java,
		* test/jtreg/com/sun/javatest/agent/ActiveAgentPool.java,
		* test/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java,
		* test/jtreg/com/sun/javatest/agent/ActiveModeOptions.java,
		* test/jtreg/com/sun/javatest/agent/Agent.java,
		* test/jtreg/com/sun/javatest/agent/AgentApplet.java,
		* test/jtreg/com/sun/javatest/agent/AgentClassLoader.java,
		* test/jtreg/com/sun/javatest/agent/AgentClassLoader2.java,
		* test/jtreg/com/sun/javatest/agent/AgentFrame.java,
		* test/jtreg/com/sun/javatest/agent/AgentMain.java,
		* test/jtreg/com/sun/javatest/agent/AgentManager.java,
		* test/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java,
		* test/jtreg/com/sun/javatest/agent/AgentMonitorTool.java,
		* test/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java,
		* test/jtreg/com/sun/javatest/agent/AgentPanel.java,
		* test/jtreg/com/sun/javatest/agent/BadValue.java,
		* test/jtreg/com/sun/javatest/agent/Connection.java,
		* test/jtreg/com/sun/javatest/agent/ConnectionFactory.java,
		* test/jtreg/com/sun/javatest/agent/Deck.java,
		* test/jtreg/com/sun/javatest/agent/Deprecated.java,
		* test/jtreg/com/sun/javatest/agent/Folder.java,
		* test/jtreg/com/sun/javatest/agent/Icon.java,
		* test/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java
	,
		* test/jtreg/com/sun/javatest/agent/Map.java,
		* test/jtreg/com/sun/javatest/agent/ModeOptions.java,
		* test/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java,
		* test/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java,
		* test/jtreg/com/sun/javatest/agent/PassiveModeOptions.java,
		* test/jtreg/com/sun/javatest/agent/SocketConnection.java,
		* test/jtreg/com/sun/javatest/audit/Audit.java,
		* test/jtreg/com/sun/javatest/audit/AuditCommandManager.java,
		* test/jtreg/com/sun/javatest/audit/AuditPane.java,
		* test/jtreg/com/sun/javatest/audit/AuditTool.java,
		* test/jtreg/com/sun/javatest/audit/AuditToolManager.java,
		* test/jtreg/com/sun/javatest/audit/BadChecksumPane.java,
		* test/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java,
		* test/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java,
		* test/jtreg/com/sun/javatest/audit/BadTestsPane.java,
		* test/jtreg/com/sun/javatest/audit/ListPane.java,
		* test/jtreg/com/sun/javatest/audit/OptionsDialog.java,
		* test/jtreg/com/sun/javatest/audit/SummaryPane.java,
		* test/jtreg/com/sun/javatest/batch/BatchManager.java,
		* test/jtreg/com/sun/javatest/batch/ObserverCommand.java,
		* test/jtreg/com/sun/javatest/batch/RunTestsCommand.java,
		* test/jtreg/com/sun/javatest/cof/COFApplication.java,
		* test/jtreg/com/sun/javatest/cof/COFApplications.java,
		* test/jtreg/com/sun/javatest/cof/COFData.java,
		* test/jtreg/com/sun/javatest/cof/COFEnvironment.java,
		* test/jtreg/com/sun/javatest/cof/COFEnvironments.java,
		* test/jtreg/com/sun/javatest/cof/COFItem.java,
		* test/jtreg/com/sun/javatest/cof/COFOS.java,
		* test/jtreg/com/sun/javatest/cof/COFReportAnnotation.java,
		* test/jtreg/com/sun/javatest/cof/COFReportAnnotations.java,
		* test/jtreg/com/sun/javatest/cof/COFSWEntities.java,
		* test/jtreg/com/sun/javatest/cof/COFSWEntity.java,
		* test/jtreg/com/sun/javatest/cof/COFStatus.java,
		* test/jtreg/com/sun/javatest/cof/COFTest.java,
		* test/jtreg/com/sun/javatest/cof/COFTestAttribute.java,
		* test/jtreg/com/sun/javatest/cof/COFTestAttributes.java,
		* test/jtreg/com/sun/javatest/cof/COFTestCase.java,
		* test/jtreg/com/sun/javatest/cof/COFTestCases.java,
		* test/jtreg/com/sun/javatest/cof/COFTestSuite.java,
		* test/jtreg/com/sun/javatest/cof/COFTestSuites.java,
		* test/jtreg/com/sun/javatest/cof/ID.java,
		* test/jtreg/com/sun/javatest/cof/Main.java,
		* test/jtreg/com/sun/javatest/cof/Report.java,
		* test/jtreg/com/sun/javatest/diff/DiffReader.java,
		* test/jtreg/com/sun/javatest/diff/Help.java,
		* test/jtreg/com/sun/javatest/diff/Main.java,
		* test/jtreg/com/sun/javatest/diff/Reporter.java,
		* test/jtreg/com/sun/javatest/diff/SimpleReporter.java,
		* test/jtreg/com/sun/javatest/diff/StatusComparator.java,
		* test/jtreg/com/sun/javatest/exec/AbstractCellEditor.java,
		* test/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java,
		* test/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java,
		* test/jtreg/com/sun/javatest/exec/BranchPanel.java,
		* test/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_FullView.java,
		* test/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_StdPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_StdView.java,
		* test/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java,
		* test/jtreg/com/sun/javatest/exec/CE_TestsPane.java,
		* test/jtreg/com/sun/javatest/exec/CE_View.java,
		* test/jtreg/com/sun/javatest/exec/ChecklistBrowser.java,
		* test/jtreg/com/sun/javatest/exec/ConfigEditor.java,
		* test/jtreg/com/sun/javatest/exec/ConfigHandler.java,
		* test/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java,
		* test/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java,
		* test/jtreg/com/sun/javatest/exec/DetailsBrowser.java,
		* test/jtreg/com/sun/javatest/exec/ET_FilterHandler.java,
		* test/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java,
		* test/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java,
		* test/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java,
		* test/jtreg/com/sun/javatest/exec/ExecModel.java,
		* test/jtreg/com/sun/javatest/exec/ExecTool.java,
		* test/jtreg/com/sun/javatest/exec/ExecToolManager.java,
		* test/jtreg/com/sun/javatest/exec/FeatureManager.java,
		* test/jtreg/com/sun/javatest/exec/FileSystemTableModel.java,
		* test/jtreg/com/sun/javatest/exec/FileTable.java,
		* test/jtreg/com/sun/javatest/exec/FileType.java,
		* test/jtreg/com/sun/javatest/exec/FilesPane.java,
		* test/jtreg/com/sun/javatest/exec/FilterConfig.java,
		* test/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java,
		* test/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java,
		* test/jtreg/com/sun/javatest/exec/JavaTestToolBar.java,
		* test/jtreg/com/sun/javatest/exec/LogViewer.java,
		* test/jtreg/com/sun/javatest/exec/LogViewerTools.java,
		* test/jtreg/com/sun/javatest/exec/MessageStrip.java,
		* test/jtreg/com/sun/javatest/exec/Monitor.java,
		* test/jtreg/com/sun/javatest/exec/MonitorState.java,
		* test/jtreg/com/sun/javatest/exec/MultiFormatPane.java,
		* test/jtreg/com/sun/javatest/exec/MultiSelectPanel.java,
		* test/jtreg/com/sun/javatest/exec/NavigationPane.java,
		* test/jtreg/com/sun/javatest/exec/NewReportDialog.java,
		* test/jtreg/com/sun/javatest/exec/ParameterFilter.java,
		* test/jtreg/com/sun/javatest/exec/PrefsPane.java,
		* test/jtreg/com/sun/javatest/exec/ProgressMeter.java,
		* test/jtreg/com/sun/javatest/exec/ProgressMonitor.java,
		* test/jtreg/com/sun/javatest/exec/PropertiesBrowser.java,
		* test/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java,
		* test/jtreg/com/sun/javatest/exec/QuickStartWizard.java,
		* test/jtreg/com/sun/javatest/exec/RenderingUtilities.java,
		* test/jtreg/com/sun/javatest/exec/ReportBrowser.java,
		* test/jtreg/com/sun/javatest/exec/ReportHandler.java,
		* test/jtreg/com/sun/javatest/exec/RunProgressMonitor.java,
		* test/jtreg/com/sun/javatest/exec/RunTestsHandler.java,
		* test/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java,
		* test/jtreg/com/sun/javatest/exec/TP_Subpanel.java,
		* test/jtreg/com/sun/javatest/exec/TT_NodeCache.java,
		* test/jtreg/com/sun/javatest/exec/TT_Renderer.java,
		* test/jtreg/com/sun/javatest/exec/TU_ViewManager.java,
		* test/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java,
		* test/jtreg/com/sun/javatest/exec/TestPanel.java,
		* test/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java,
		* test/jtreg/com/sun/javatest/exec/TestTree.java,
		* test/jtreg/com/sun/javatest/exec/TestTreeModel.java,
		* test/jtreg/com/sun/javatest/exec/TestTreePanel.java,
		* test/jtreg/com/sun/javatest/exec/ToolBarManager.java,
		* test/jtreg/com/sun/javatest/exec/ToolBarPanel.java,
		* test/jtreg/com/sun/javatest/exec/TreePanelModel.java,
		* test/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java,
		* test/jtreg/com/sun/javatest/finder/BinaryTestFinder.java,
		* test/jtreg/com/sun/javatest/finder/BinaryTestWriter.java,
		* test/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java,
		* test/jtreg/com/sun/javatest/finder/CommentStream.java,
		* test/jtreg/com/sun/javatest/finder/ExpandTestFinder.java,
		* test/jtreg/com/sun/javatest/finder/HTMLCommentStream.java,
		* test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java,
		* test/jtreg/com/sun/javatest/finder/JavaCommentStream.java,
		* test/jtreg/com/sun/javatest/finder/ReverseTestFinder.java,
		* test/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java,
		* test/jtreg/com/sun/javatest/finder/ShowTests.java,
		* test/jtreg/com/sun/javatest/finder/TagTestFinder.java,
		* test/jtreg/com/sun/javatest/httpd/HttpdServer.java,
		* test/jtreg/com/sun/javatest/httpd/JThttpProvider.java,
		* test/jtreg/com/sun/javatest/httpd/PageGenerator.java,
		* test/jtreg/com/sun/javatest/httpd/ProviderRegistry.java,
		* test/jtreg/com/sun/javatest/httpd/RequestHandler.java,
		* test/jtreg/com/sun/javatest/httpd/RootRegistry.java,
		* test/jtreg/com/sun/javatest/httpd/httpURL.java,
		* test/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java,
		* test/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java,
		* test/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.jav
	a,
		* test/jtreg/com/sun/javatest/interview/EnvironmentInterview.java,
		* test/jtreg/com/sun/javatest/interview/ExcludeListInterview.java,
		* test/jtreg/com/sun/javatest/interview/KeywordsInterview.java,
		* test/jtreg/com/sun/javatest/interview/LegacyParameters.java,
		* test/jtreg/com/sun/javatest/interview/PriorStatusInterview.java,
		* test/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java
	,
		* test/jtreg/com/sun/javatest/interview/TestsInterview.java,
		* test/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java,
		* test/jtreg/com/sun/javatest/lib/APIScript.java,
		* test/jtreg/com/sun/javatest/lib/Deprecated.java,
		* test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java,
		* test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java,
		* test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java,
		* test/jtreg/com/sun/javatest/lib/KeywordScript.java,
		* test/jtreg/com/sun/javatest/lib/MultiStatus.java,
		* test/jtreg/com/sun/javatest/lib/MultiTest.java,
		* test/jtreg/com/sun/javatest/lib/ProcessCommand.java,
		* test/jtreg/com/sun/javatest/lib/ReportScript.java,
		* test/jtreg/com/sun/javatest/lib/StdTestScript.java,
		* test/jtreg/com/sun/javatest/lib/TestCases.java,
		* test/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java,
		* test/jtreg/com/sun/javatest/logging/FileEvent.java,
		* test/jtreg/com/sun/javatest/logging/FileListener.java,
		* test/jtreg/com/sun/javatest/logging/FilteredLogModel.java,
		* test/jtreg/com/sun/javatest/logging/JTFormatter.java,
		* test/jtreg/com/sun/javatest/logging/LogModel.java,
		* test/jtreg/com/sun/javatest/logging/LoggerFactory.java,
		* test/jtreg/com/sun/javatest/logging/ObservedFile.java,
		* test/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java,
		* test/jtreg/com/sun/javatest/mrep/BrowserPane.java,
		* test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
		* test/jtreg/com/sun/javatest/mrep/ConflictResolver.java,
		* test/jtreg/com/sun/javatest/mrep/FilesPane.java,
		* test/jtreg/com/sun/javatest/mrep/Merger.java,
		* test/jtreg/com/sun/javatest/mrep/OptionsDialog.java,
		* test/jtreg/com/sun/javatest/mrep/OptionsPane.java,
		* test/jtreg/com/sun/javatest/mrep/ReportDirChooser.java,
		* test/jtreg/com/sun/javatest/mrep/ReportTool.java,
		* test/jtreg/com/sun/javatest/mrep/ReportToolManager.java,
		* test/jtreg/com/sun/javatest/mrep/Scheme.java,
		* test/jtreg/com/sun/javatest/mrep/TestResultDescr.java,
		* test/jtreg/com/sun/javatest/mrep/XMLReportReader.java,
		* test/jtreg/com/sun/javatest/mrep/XMLReportWriter.java,
		* test/jtreg/com/sun/javatest/regtest/Action.java,
		* test/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java,
		* test/jtreg/com/sun/javatest/regtest/AppletAction.java,
		* test/jtreg/com/sun/javatest/regtest/AppletWrapper.java,
		* test/jtreg/com/sun/javatest/regtest/BuildAction.java,
		* test/jtreg/com/sun/javatest/regtest/CheckFiles.java,
		* test/jtreg/com/sun/javatest/regtest/CompileAction.java,
		* test/jtreg/com/sun/javatest/regtest/Help.java,
		* test/jtreg/com/sun/javatest/regtest/IgnoreAction.java,
		* test/jtreg/com/sun/javatest/regtest/JDK.java,
		* test/jtreg/com/sun/javatest/regtest/Main.java,
		* test/jtreg/com/sun/javatest/regtest/Option.java,
		* test/jtreg/com/sun/javatest/regtest/OptionDecoder.java,
		* test/jtreg/com/sun/javatest/regtest/RegressionObserver.java,
		* test/jtreg/com/sun/javatest/regtest/RegressionParameters.java,
		* test/jtreg/com/sun/javatest/regtest/RegressionScript.java,
		* test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
		* test/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java,
		* test/jtreg/com/sun/javatest/regtest/ShellAction.java,
		* test/jtreg/com/sun/javatest/regtest/StringArray.java,
		* test/jtreg/com/sun/javatest/regtest/Verbose.java,
		* test/jtreg/com/sun/javatest/report/ConfigSection.java,
		* test/jtreg/com/sun/javatest/report/CustomReport.java,
		* test/jtreg/com/sun/javatest/report/HTMLReport.java,
		* test/jtreg/com/sun/javatest/report/HTMLSection.java,
		* test/jtreg/com/sun/javatest/report/PlainTextReport.java,
		* test/jtreg/com/sun/javatest/report/Report.java,
		* test/jtreg/com/sun/javatest/report/ReportDirChooser.java,
		* test/jtreg/com/sun/javatest/report/ReportManager.java,
		* test/jtreg/com/sun/javatest/report/ReportWriter.java,
		* test/jtreg/com/sun/javatest/report/ResultSection.java,
		* test/jtreg/com/sun/javatest/report/StatisticsSection.java,
		* test/jtreg/com/sun/javatest/report/StringArrayComparator.java,
		* test/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java,
		* test/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleCompar
	ator.java,
		* test/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java
	,
		* test/jtreg/com/sun/javatest/report/XMLReport.java,
		* test/jtreg/com/sun/javatest/report/XMLReportMaker.java,
		* test/jtreg/com/sun/javatest/tool/Command.java,
		* test/jtreg/com/sun/javatest/tool/CommandContext.java,
		* test/jtreg/com/sun/javatest/tool/CommandManager.java,
		* test/jtreg/com/sun/javatest/tool/CommandParser.java,
		* test/jtreg/com/sun/javatest/tool/ConfigManager.java,
		* test/jtreg/com/sun/javatest/tool/Deck.java,
		* test/jtreg/com/sun/javatest/tool/DeskView.java,
		* test/jtreg/com/sun/javatest/tool/Desktop.java,
		* test/jtreg/com/sun/javatest/tool/DesktopManager.java,
		* test/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java,
		* test/jtreg/com/sun/javatest/tool/EditableFileList.java,
		* test/jtreg/com/sun/javatest/tool/EditableList.java,
		* test/jtreg/com/sun/javatest/tool/EnvironmentManager.java,
		* test/jtreg/com/sun/javatest/tool/FileChooser.java,
		* test/jtreg/com/sun/javatest/tool/FileHistory.java,
		* test/jtreg/com/sun/javatest/tool/FileOpener.java,
		* test/jtreg/com/sun/javatest/tool/FocusMonitor.java,
		* test/jtreg/com/sun/javatest/tool/HelpLink.java,
		* test/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java,
		* test/jtreg/com/sun/javatest/tool/HelpManager.java,
		* test/jtreg/com/sun/javatest/tool/HelpMenu.java,
		* test/jtreg/com/sun/javatest/tool/HttpManager.java,
		* test/jtreg/com/sun/javatest/tool/I18NUtils.java,
		* test/jtreg/com/sun/javatest/tool/IconFactory.java,
		* test/jtreg/com/sun/javatest/tool/IconLabel.java,
		* test/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java,
		* test/jtreg/com/sun/javatest/tool/LogManager.java,
		* test/jtreg/com/sun/javatest/tool/MDIDeskView.java,
		* test/jtreg/com/sun/javatest/tool/Main.java,
		* test/jtreg/com/sun/javatest/tool/ManagerLoader.java,
		* test/jtreg/com/sun/javatest/tool/PieChart.java,
		* test/jtreg/com/sun/javatest/tool/Preferences.java,
		* test/jtreg/com/sun/javatest/tool/SDIDeskView.java,
		* test/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java,
		* test/jtreg/com/sun/javatest/tool/Startup.java,
		* test/jtreg/com/sun/javatest/tool/TabDeskView.java,
		* test/jtreg/com/sun/javatest/tool/TestSuiteChooser.java,
		* test/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java,
		* test/jtreg/com/sun/javatest/tool/Tool.java,
		* test/jtreg/com/sun/javatest/tool/ToolAction.java,
		* test/jtreg/com/sun/javatest/tool/ToolDialog.java,
		* test/jtreg/com/sun/javatest/tool/ToolManager.java,
		* test/jtreg/com/sun/javatest/tool/TreeSelectionPane.java,
		* test/jtreg/com/sun/javatest/tool/UIFactory.java,
		* test/jtreg/com/sun/javatest/tool/VerboseCommand.java,
		* test/jtreg/com/sun/javatest/tool/WDC_FileFilter.java,
		* test/jtreg/com/sun/javatest/tool/WDC_FileView.java,
		* test/jtreg/com/sun/javatest/tool/WorkDirChooser.java,
		* test/jtreg/com/sun/javatest/util/BackupPolicy.java,
		* test/jtreg/com/sun/javatest/util/BackupUtil.java,
		* test/jtreg/com/sun/javatest/util/Debug.java,
		* test/jtreg/com/sun/javatest/util/DirectoryClassLoader.java,
		* test/jtreg/com/sun/javatest/util/DynamicArray.java,
		* test/jtreg/com/sun/javatest/util/ExitCount.java,
		* test/jtreg/com/sun/javatest/util/Fifo.java,
		* test/jtreg/com/sun/javatest/util/FileFilter.java,
		* test/jtreg/com/sun/javatest/util/FileInfoCache.java,
		* test/jtreg/com/sun/javatest/util/HTMLWriter.java,
		* test/jtreg/com/sun/javatest/util/HelpTree.java,
		* test/jtreg/com/sun/javatest/util/I18NResourceBundle.java,
		* test/jtreg/com/sun/javatest/util/LineParser.java,
		* test/jtreg/com/sun/javatest/util/LogFile.java,
		* test/jtreg/com/sun/javatest/util/MainAppletContext.java,
		* test/jtreg/com/sun/javatest/util/MainFrame.java,
		* test/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java,
		* test/jtreg/com/sun/javatest/util/PathClassLoader.java,
		* test/jtreg/com/sun/javatest/util/PrefixMap.java,
		* test/jtreg/com/sun/javatest/util/Properties.java,
		* test/jtreg/com/sun/javatest/util/PropertyArray.java,
		* test/jtreg/com/sun/javatest/util/ReadAheadIterator.java,
		* test/jtreg/com/sun/javatest/util/SortedProperties.java,
		* test/jtreg/com/sun/javatest/util/StringArray.java,
		* test/jtreg/com/sun/javatest/util/SysEnv.java,
		* test/jtreg/com/sun/javatest/util/TextStream.java,
		* test/jtreg/com/sun/javatest/util/TextWriter.java,
		* test/jtreg/com/sun/javatest/util/Timer.java,
		* test/jtreg/com/sun/javatest/util/WrapWriter.java,
		* test/jtreg/com/sun/javatest/util/WriterStream.java,
		* test/jtreg/com/sun/javatest/util/XMLWriter.java: Normalize
	whitespace using Sun's normalizer script.


diffstat:

444 files changed, 69499 insertions(+), 69140 deletions(-)
ChangeLog                                                                     |  447 +
test/jtreg/com/sun/interview/AllFilesFileFilter.java                          |   16 
test/jtreg/com/sun/interview/Checklist.java                                   |   74 
test/jtreg/com/sun/interview/ChoiceArrayQuestion.java                         |  328 -
test/jtreg/com/sun/interview/ChoiceQuestion.java                              |  272 
test/jtreg/com/sun/interview/DirectoryFileFilter.java                         |   18 
test/jtreg/com/sun/interview/ErrorQuestion.java                               |   12 
test/jtreg/com/sun/interview/ExtensionFileFilter.java                         |   96 
test/jtreg/com/sun/interview/FileListQuestion.java                            |  238 
test/jtreg/com/sun/interview/FileQuestion.java                                |  116 
test/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java               |   18 
test/jtreg/com/sun/interview/FinalQuestion.java                               |    8 
test/jtreg/com/sun/interview/FloatQuestion.java                               |  230 
test/jtreg/com/sun/interview/InetAddressQuestion.java                         |  340 -
test/jtreg/com/sun/interview/IntQuestion.java                                 |  228 
test/jtreg/com/sun/interview/Interview.java                                   | 2466 +++----
test/jtreg/com/sun/interview/InterviewQuestion.java                           |   46 
test/jtreg/com/sun/interview/InterviewSet.java                                |  302 
test/jtreg/com/sun/interview/ListQuestion.java                                |  760 +-
test/jtreg/com/sun/interview/NullQuestion.java                                |   30 
test/jtreg/com/sun/interview/Properties2.java                                 |  412 -
test/jtreg/com/sun/interview/PropertiesQuestion.java                          |  408 -
test/jtreg/com/sun/interview/Question.java                                    |  302 
test/jtreg/com/sun/interview/StringListQuestion.java                          |  210 
test/jtreg/com/sun/interview/StringQuestion.java                              |  110 
test/jtreg/com/sun/interview/TreeQuestion.java                                |  402 -
test/jtreg/com/sun/interview/WizEdit.java                                     |  444 -
test/jtreg/com/sun/interview/WizPrint.java                                    | 1454 ++--
test/jtreg/com/sun/interview/YesNoQuestion.java                               |   36 
test/jtreg/com/sun/interview/wizard/ActionDocListener.java                    |   14 
test/jtreg/com/sun/interview/wizard/ActionListDataListener.java               |   14 
test/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java          |  166 
test/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java               |  160 
test/jtreg/com/sun/interview/wizard/EditableList.java                         |  356 -
test/jtreg/com/sun/interview/wizard/Exporter.java                             |    4 
test/jtreg/com/sun/interview/wizard/FileList.java                             |   78 
test/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java             |  114 
test/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java                 |  190 
test/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java                |  230 
test/jtreg/com/sun/interview/wizard/I18NResourceBundle.java                   |   96 
test/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java          |  608 -
test/jtreg/com/sun/interview/wizard/InfoPanel.java                            |   46 
test/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java                  |  176 
test/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java                 |  350 -
test/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java                 |    4 
test/jtreg/com/sun/interview/wizard/PathPanel.java                            | 1974 +++---
test/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java           |  206 
test/jtreg/com/sun/interview/wizard/QuestionPanel.java                        |  678 +-
test/jtreg/com/sun/interview/wizard/QuestionRenderer.java                     |    6 
test/jtreg/com/sun/interview/wizard/RenderingUtilities.java                   |   24 
test/jtreg/com/sun/interview/wizard/SearchDialog.java                         |  412 -
test/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java           |   50 
test/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java               |   82 
test/jtreg/com/sun/interview/wizard/SwingFileFilter.java                      |   30 
test/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java                 | 1078 +--
test/jtreg/com/sun/interview/wizard/TypeInPanel.java                          |  171 
test/jtreg/com/sun/interview/wizard/WizPane.java                              |  444 -
test/jtreg/com/sun/interview/wizard/Wizard.java                               | 1366 ++--
test/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java                |  118 
test/jtreg/com/sun/javatest/AllTestsFilter.java                               |    8 
test/jtreg/com/sun/javatest/BasicParameters.java                              |  872 +-
test/jtreg/com/sun/javatest/Command.java                                      |   22 
test/jtreg/com/sun/javatest/CompositeFilter.java                              |  181 
test/jtreg/com/sun/javatest/DefaultTestRunner.java                            |  366 -
test/jtreg/com/sun/javatest/Deprecated.java                                   |    4 
test/jtreg/com/sun/javatest/EditJTI.java                                      |  986 +--
test/jtreg/com/sun/javatest/EditLinks.java                                    |  648 +-
test/jtreg/com/sun/javatest/ExcludeList.java                                  | 1736 ++---
test/jtreg/com/sun/javatest/ExcludeListFilter.java                            |   28 
test/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java                     |   86 
test/jtreg/com/sun/javatest/FileParameters.java                               |  634 +-
test/jtreg/com/sun/javatest/Harness.java                                      | 1086 +--
test/jtreg/com/sun/javatest/HarnessHttpHandler.java                           |  942 +--
test/jtreg/com/sun/javatest/InitialUrlFilter.java                             |  123 
test/jtreg/com/sun/javatest/InterviewParameters.java                          |  104 
test/jtreg/com/sun/javatest/InterviewPropagator.java                          |    3 
test/jtreg/com/sun/javatest/JavaTestError.java                                |   69 
test/jtreg/com/sun/javatest/JavaTestSecurityManager.java                      |  148 
test/jtreg/com/sun/javatest/Keywords.java                                     |  676 +-
test/jtreg/com/sun/javatest/KeywordsFilter.java                               |   28 
test/jtreg/com/sun/javatest/LastRunFilter.java                                |   84 
test/jtreg/com/sun/javatest/LastRunInfo.java                                  |   70 
test/jtreg/com/sun/javatest/ObservableTestFilter.java                         |   23 
test/jtreg/com/sun/javatest/Parameters.java                                   | 1142 +--
test/jtreg/com/sun/javatest/ProductInfo.java                                  |  118 
test/jtreg/com/sun/javatest/ResourceTable.java                                |   90 
test/jtreg/com/sun/javatest/Script.java                                       | 1176 +--
test/jtreg/com/sun/javatest/Status.java                                       |  192 
test/jtreg/com/sun/javatest/StatusFilter.java                                 |   58 
test/jtreg/com/sun/javatest/TRT_HttpHandler.java                              |  268 
test/jtreg/com/sun/javatest/TRT_Iterator.java                                 | 1287 ++--
test/jtreg/com/sun/javatest/TRT_TreeNode.java                                 | 2198 +++----
test/jtreg/com/sun/javatest/TemplateUtilities.java                            |   10 
test/jtreg/com/sun/javatest/Test.java                                         |   28 
test/jtreg/com/sun/javatest/TestDescription.java                              |  479 -
test/jtreg/com/sun/javatest/TestEnvContext.java                               |  450 -
test/jtreg/com/sun/javatest/TestEnvironment.java                              |  888 +-
test/jtreg/com/sun/javatest/TestFilter.java                                   |   88 
test/jtreg/com/sun/javatest/TestFinder.java                                   |  628 +-
test/jtreg/com/sun/javatest/TestFinderQueue.java                              |  792 +-
test/jtreg/com/sun/javatest/TestResult.java                                   | 2410 +++----
test/jtreg/com/sun/javatest/TestResultCache.java                              | 1154 +--
test/jtreg/com/sun/javatest/TestResultTable.java                              | 3110 +++++-----
test/jtreg/com/sun/javatest/TestRunner.java                                   |   70 
test/jtreg/com/sun/javatest/Trace.java                                        |  164 
test/jtreg/com/sun/javatest/WorkDirectory.java                                |  136 
test/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java                     |  113 
test/jtreg/com/sun/javatest/agent/ActiveAgentPool.java                        |  796 +-
test/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java                |   34 
test/jtreg/com/sun/javatest/agent/ActiveModeOptions.java                      |   62 
test/jtreg/com/sun/javatest/agent/Agent.java                                  | 1770 ++---
test/jtreg/com/sun/javatest/agent/AgentApplet.java                            |  363 -
test/jtreg/com/sun/javatest/agent/AgentClassLoader.java                       |   92 
test/jtreg/com/sun/javatest/agent/AgentClassLoader2.java                      |   41 
test/jtreg/com/sun/javatest/agent/AgentFrame.java                             |  484 -
test/jtreg/com/sun/javatest/agent/AgentMain.java                              |  754 +-
test/jtreg/com/sun/javatest/agent/AgentManager.java                           |  963 +--
test/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java             |  307 
test/jtreg/com/sun/javatest/agent/AgentMonitorTool.java                       |  832 +-
test/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java                |   61 
test/jtreg/com/sun/javatest/agent/AgentPanel.java                             | 1606 ++---
test/jtreg/com/sun/javatest/agent/BadValue.java                               |   28 
test/jtreg/com/sun/javatest/agent/Connection.java                             |   14 
test/jtreg/com/sun/javatest/agent/ConnectionFactory.java                      |   68 
test/jtreg/com/sun/javatest/agent/Deck.java                                   |   54 
test/jtreg/com/sun/javatest/agent/Deprecated.java                             |    4 
test/jtreg/com/sun/javatest/agent/Folder.java                                 |  399 -
test/jtreg/com/sun/javatest/agent/Icon.java                                   |   66 
test/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java          |   10 
test/jtreg/com/sun/javatest/agent/Map.java                                    |  170 
test/jtreg/com/sun/javatest/agent/ModeOptions.java                            |   24 
test/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java                    |  145 
test/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java               |   44 
test/jtreg/com/sun/javatest/agent/PassiveModeOptions.java                     |   54 
test/jtreg/com/sun/javatest/agent/SocketConnection.java                       |  154 
test/jtreg/com/sun/javatest/audit/Audit.java                                  |  812 +-
test/jtreg/com/sun/javatest/audit/AuditCommandManager.java                    |  137 
test/jtreg/com/sun/javatest/audit/AuditPane.java                              |   44 
test/jtreg/com/sun/javatest/audit/AuditTool.java                              |  464 -
test/jtreg/com/sun/javatest/audit/AuditToolManager.java                       |   61 
test/jtreg/com/sun/javatest/audit/BadChecksumPane.java                        |   12 
test/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java                   |   14 
test/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java                 |   14 
test/jtreg/com/sun/javatest/audit/BadTestsPane.java                           |   14 
test/jtreg/com/sun/javatest/audit/ListPane.java                               |   84 
test/jtreg/com/sun/javatest/audit/OptionsDialog.java                          |  488 -
test/jtreg/com/sun/javatest/audit/SummaryPane.java                            |  420 -
test/jtreg/com/sun/javatest/batch/BatchManager.java                           |  102 
test/jtreg/com/sun/javatest/batch/ObserverCommand.java                        |  192 
test/jtreg/com/sun/javatest/batch/RunTestsCommand.java                        |  654 +-
test/jtreg/com/sun/javatest/cof/COFApplication.java                           |  106 
test/jtreg/com/sun/javatest/cof/COFApplications.java                          |   24 
test/jtreg/com/sun/javatest/cof/COFData.java                                  |   66 
test/jtreg/com/sun/javatest/cof/COFEnvironment.java                           | 1082 +--
test/jtreg/com/sun/javatest/cof/COFEnvironments.java                          |   62 
test/jtreg/com/sun/javatest/cof/COFItem.java                                  |   92 
test/jtreg/com/sun/javatest/cof/COFOS.java                                    |   66 
test/jtreg/com/sun/javatest/cof/COFReportAnnotation.java                      |   72 
test/jtreg/com/sun/javatest/cof/COFReportAnnotations.java                     |   52 
test/jtreg/com/sun/javatest/cof/COFSWEntities.java                            |   44 
test/jtreg/com/sun/javatest/cof/COFSWEntity.java                              |  156 
test/jtreg/com/sun/javatest/cof/COFStatus.java                                |   76 
test/jtreg/com/sun/javatest/cof/COFTest.java                                  |  974 +--
test/jtreg/com/sun/javatest/cof/COFTestAttribute.java                         |   90 
test/jtreg/com/sun/javatest/cof/COFTestAttributes.java                        |   52 
test/jtreg/com/sun/javatest/cof/COFTestCase.java                              |  524 -
test/jtreg/com/sun/javatest/cof/COFTestCases.java                             |   76 
test/jtreg/com/sun/javatest/cof/COFTestSuite.java                             |  162 
test/jtreg/com/sun/javatest/cof/COFTestSuites.java                            |   60 
test/jtreg/com/sun/javatest/cof/ID.java                                       |   20 
test/jtreg/com/sun/javatest/cof/Main.java                                     |  654 +-
test/jtreg/com/sun/javatest/cof/Report.java                                   |  778 +-
test/jtreg/com/sun/javatest/diff/DiffReader.java                              |    3 
test/jtreg/com/sun/javatest/diff/Help.java                                    |  120 
test/jtreg/com/sun/javatest/diff/Main.java                                    |    4 
test/jtreg/com/sun/javatest/diff/Reporter.java                                |   10 
test/jtreg/com/sun/javatest/diff/SimpleReporter.java                          |   34 
test/jtreg/com/sun/javatest/diff/StatusComparator.java                        |   18 
test/jtreg/com/sun/javatest/exec/AbstractCellEditor.java                      |    9 
test/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java                       |   37 
test/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java                |   22 
test/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java                  | 1484 ++--
test/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java                      | 1676 ++---
test/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java                     |  436 -
test/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java                   | 1552 ++--
test/jtreg/com/sun/javatest/exec/BranchPanel.java                             |   21 
test/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java                      |  388 -
test/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java                      |  990 +--
test/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java                        |  340 -
test/jtreg/com/sun/javatest/exec/CE_FullView.java                             |  292 
test/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java                         |  150 
test/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java                      |  254 
test/jtreg/com/sun/javatest/exec/CE_StdPane.java                              |   40 
test/jtreg/com/sun/javatest/exec/CE_StdView.java                              |  336 -
test/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java                       |  448 -
test/jtreg/com/sun/javatest/exec/CE_TestsPane.java                            |  332 -
test/jtreg/com/sun/javatest/exec/CE_View.java                                 |   16 
test/jtreg/com/sun/javatest/exec/ChecklistBrowser.java                        |  368 -
test/jtreg/com/sun/javatest/exec/ConfigEditor.java                            |  190 
test/jtreg/com/sun/javatest/exec/ConfigHandler.java                           |  194 
test/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java                  |   55 
test/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java                  |   34 
test/jtreg/com/sun/javatest/exec/DetailsBrowser.java                          |  148 
test/jtreg/com/sun/javatest/exec/ET_FilterHandler.java                        |  845 +-
test/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java                      |  236 
test/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java                      |  498 -
test/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java                      |  500 -
test/jtreg/com/sun/javatest/exec/ExecModel.java                               |   22 
test/jtreg/com/sun/javatest/exec/ExecTool.java                                |   19 
test/jtreg/com/sun/javatest/exec/ExecToolManager.java                         |  146 
test/jtreg/com/sun/javatest/exec/FeatureManager.java                          |    6 
test/jtreg/com/sun/javatest/exec/FileSystemTableModel.java                    |   58 
test/jtreg/com/sun/javatest/exec/FileTable.java                               |   28 
test/jtreg/com/sun/javatest/exec/FileType.java                                |   44 
test/jtreg/com/sun/javatest/exec/FilesPane.java                               |   72 
test/jtreg/com/sun/javatest/exec/FilterConfig.java                            | 1350 ++--
test/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java                  |  503 -
test/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java                     |    2 
test/jtreg/com/sun/javatest/exec/JavaTestToolBar.java                         |   62 
test/jtreg/com/sun/javatest/exec/LogViewer.java                               |  312 -
test/jtreg/com/sun/javatest/exec/LogViewerTools.java                          |   35 
test/jtreg/com/sun/javatest/exec/MessageStrip.java                            |  437 -
test/jtreg/com/sun/javatest/exec/Monitor.java                                 |    5 
test/jtreg/com/sun/javatest/exec/MonitorState.java                            |  357 -
test/jtreg/com/sun/javatest/exec/MultiFormatPane.java                         |  566 -
test/jtreg/com/sun/javatest/exec/MultiSelectPanel.java                        |  122 
test/jtreg/com/sun/javatest/exec/NavigationPane.java                          |  352 -
test/jtreg/com/sun/javatest/exec/NewReportDialog.java                         | 1280 ++--
test/jtreg/com/sun/javatest/exec/ParameterFilter.java                         |  225 
test/jtreg/com/sun/javatest/exec/PrefsPane.java                               |  216 
test/jtreg/com/sun/javatest/exec/ProgressMeter.java                           |  432 -
test/jtreg/com/sun/javatest/exec/ProgressMonitor.java                         | 1048 +--
test/jtreg/com/sun/javatest/exec/PropertiesBrowser.java                       |  398 -
test/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java                      |  256 
test/jtreg/com/sun/javatest/exec/QuickStartWizard.java                        | 1677 ++---
test/jtreg/com/sun/javatest/exec/RenderingUtilities.java                      |  190 
test/jtreg/com/sun/javatest/exec/ReportBrowser.java                           |  126 
test/jtreg/com/sun/javatest/exec/ReportHandler.java                           |  140 
test/jtreg/com/sun/javatest/exec/RunProgressMonitor.java                      |  124 
test/jtreg/com/sun/javatest/exec/RunTestsHandler.java                         |  678 +-
test/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java                       |    2 
test/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java                         |   28 
test/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java                |   10 
test/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java                          |  130 
test/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java                        |   50 
test/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java                       | 1278 ++--
test/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java                     |  663 +-
test/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java                      |  151 
test/jtreg/com/sun/javatest/exec/TP_Subpanel.java                             |   31 
test/jtreg/com/sun/javatest/exec/TT_NodeCache.java                            | 1060 +--
test/jtreg/com/sun/javatest/exec/TT_Renderer.java                             |  421 -
test/jtreg/com/sun/javatest/exec/TU_ViewManager.java                          |   68 
test/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java                 |   25 
test/jtreg/com/sun/javatest/exec/TestPanel.java                               |  488 -
test/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java                   |  122 
test/jtreg/com/sun/javatest/exec/TestTree.java                                |  288 
test/jtreg/com/sun/javatest/exec/TestTreeModel.java                           | 1813 ++---
test/jtreg/com/sun/javatest/exec/TestTreePanel.java                           | 2566 ++++----
test/jtreg/com/sun/javatest/exec/ToolBarManager.java                          |   36 
test/jtreg/com/sun/javatest/exec/ToolBarPanel.java                            |   29 
test/jtreg/com/sun/javatest/exec/TreePanelModel.java                          |    5 
test/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java                       |  252 
test/jtreg/com/sun/javatest/finder/BinaryTestFinder.java                      |  673 +-
test/jtreg/com/sun/javatest/finder/BinaryTestWriter.java                      | 1312 ++--
test/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java                   |  538 -
test/jtreg/com/sun/javatest/finder/CommentStream.java                         |   14 
test/jtreg/com/sun/javatest/finder/ExpandTestFinder.java                      |  500 -
test/jtreg/com/sun/javatest/finder/HTMLCommentStream.java                     |   74 
test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java                        |  842 +-
test/jtreg/com/sun/javatest/finder/JavaCommentStream.java                     |  194 
test/jtreg/com/sun/javatest/finder/ReverseTestFinder.java                     |   90 
test/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java                 |   58 
test/jtreg/com/sun/javatest/finder/ShowTests.java                             |  364 -
test/jtreg/com/sun/javatest/finder/TagTestFinder.java                         |  344 -
test/jtreg/com/sun/javatest/httpd/HttpdServer.java                            |  163 
test/jtreg/com/sun/javatest/httpd/JThttpProvider.java                         |   83 
test/jtreg/com/sun/javatest/httpd/PageGenerator.java                          |  203 
test/jtreg/com/sun/javatest/httpd/ProviderRegistry.java                       |  683 +-
test/jtreg/com/sun/javatest/httpd/RequestHandler.java                         |  160 
test/jtreg/com/sun/javatest/httpd/RootRegistry.java                           |   95 
test/jtreg/com/sun/javatest/httpd/httpURL.java                                |  307 
test/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java           |  448 -
test/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java               |   40 
test/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java         |   14 
test/jtreg/com/sun/javatest/interview/EnvironmentInterview.java               |  360 -
test/jtreg/com/sun/javatest/interview/ExcludeListInterview.java               |  755 +-
test/jtreg/com/sun/javatest/interview/KeywordsInterview.java                  |  340 -
test/jtreg/com/sun/javatest/interview/LegacyParameters.java                   |   24 
test/jtreg/com/sun/javatest/interview/PriorStatusInterview.java               |  172 
test/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java          |  286 
test/jtreg/com/sun/javatest/interview/TestsInterview.java                     |  549 -
test/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java             |   42 
test/jtreg/com/sun/javatest/lib/APIScript.java                                |   68 
test/jtreg/com/sun/javatest/lib/Deprecated.java                               |    4 
test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java                   |   64 
test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java                    |  159 
test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java                       |  382 -
test/jtreg/com/sun/javatest/lib/KeywordScript.java                            |  290 
test/jtreg/com/sun/javatest/lib/MultiStatus.java                              |  240 
test/jtreg/com/sun/javatest/lib/MultiTest.java                                |  306 
test/jtreg/com/sun/javatest/lib/ProcessCommand.java                           |  639 +-
test/jtreg/com/sun/javatest/lib/ReportScript.java                             |   16 
test/jtreg/com/sun/javatest/lib/StdTestScript.java                            |  256 
test/jtreg/com/sun/javatest/lib/TestCases.java                                |  238 
test/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java                   |   19 
test/jtreg/com/sun/javatest/logging/FileEvent.java                            |    7 
test/jtreg/com/sun/javatest/logging/FileListener.java                         |    1 
test/jtreg/com/sun/javatest/logging/FilteredLogModel.java                     |    3 
test/jtreg/com/sun/javatest/logging/JTFormatter.java                          |   10 
test/jtreg/com/sun/javatest/logging/LogModel.java                             |  116 
test/jtreg/com/sun/javatest/logging/LoggerFactory.java                        |    5 
test/jtreg/com/sun/javatest/logging/ObservedFile.java                         |   41 
test/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java                    |   19 
test/jtreg/com/sun/javatest/mrep/BrowserPane.java                             |  764 +-
test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java                |   27 
test/jtreg/com/sun/javatest/mrep/ConflictResolver.java                        |   16 
test/jtreg/com/sun/javatest/mrep/FilesPane.java                               |  106 
test/jtreg/com/sun/javatest/mrep/Merger.java                                  |   10 
test/jtreg/com/sun/javatest/mrep/OptionsDialog.java                           |   39 
test/jtreg/com/sun/javatest/mrep/OptionsPane.java                             |   50 
test/jtreg/com/sun/javatest/mrep/ReportDirChooser.java                        |  310 
test/jtreg/com/sun/javatest/mrep/ReportTool.java                              |    2 
test/jtreg/com/sun/javatest/mrep/ReportToolManager.java                       |   12 
test/jtreg/com/sun/javatest/mrep/Scheme.java                                  |    6 
test/jtreg/com/sun/javatest/mrep/TestResultDescr.java                         |   80 
test/jtreg/com/sun/javatest/mrep/XMLReportReader.java                         |   17 
test/jtreg/com/sun/javatest/mrep/XMLReportWriter.java                         |   48 
test/jtreg/com/sun/javatest/regtest/Action.java                               |   14 
test/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java                     |   18 
test/jtreg/com/sun/javatest/regtest/AppletAction.java                         |    2 
test/jtreg/com/sun/javatest/regtest/AppletWrapper.java                        |   14 
test/jtreg/com/sun/javatest/regtest/BuildAction.java                          |   10 
test/jtreg/com/sun/javatest/regtest/CheckFiles.java                           |    2 
test/jtreg/com/sun/javatest/regtest/CompileAction.java                        |  156 
test/jtreg/com/sun/javatest/regtest/Help.java                                 |  138 
test/jtreg/com/sun/javatest/regtest/IgnoreAction.java                         |    4 
test/jtreg/com/sun/javatest/regtest/JDK.java                                  |   26 
test/jtreg/com/sun/javatest/regtest/Main.java                                 |   38 
test/jtreg/com/sun/javatest/regtest/Option.java                               |   17 
test/jtreg/com/sun/javatest/regtest/OptionDecoder.java                        |   42 
test/jtreg/com/sun/javatest/regtest/RegressionObserver.java                   |   74 
test/jtreg/com/sun/javatest/regtest/RegressionParameters.java                 |  124 
test/jtreg/com/sun/javatest/regtest/RegressionScript.java                     |  121 
test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java                 |   48 
test/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java                  |   26 
test/jtreg/com/sun/javatest/regtest/ShellAction.java                          |    6 
test/jtreg/com/sun/javatest/regtest/StringArray.java                          |    8 
test/jtreg/com/sun/javatest/regtest/Verbose.java                              |   28 
test/jtreg/com/sun/javatest/report/ConfigSection.java                         |  752 +-
test/jtreg/com/sun/javatest/report/CustomReport.java                          |   52 
test/jtreg/com/sun/javatest/report/HTMLReport.java                            |  350 -
test/jtreg/com/sun/javatest/report/HTMLSection.java                           |   50 
test/jtreg/com/sun/javatest/report/PlainTextReport.java                       |   72 
test/jtreg/com/sun/javatest/report/Report.java                                |  394 -
test/jtreg/com/sun/javatest/report/ReportDirChooser.java                      |  310 
test/jtreg/com/sun/javatest/report/ReportManager.java                         |  278 
test/jtreg/com/sun/javatest/report/ReportWriter.java                          |  182 
test/jtreg/com/sun/javatest/report/ResultSection.java                         |  356 -
test/jtreg/com/sun/javatest/report/StatisticsSection.java                     |  292 
test/jtreg/com/sun/javatest/report/StringArrayComparator.java                 |   22 
test/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java           |   64 
test/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java |   28 
test/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java          |   20 
test/jtreg/com/sun/javatest/report/XMLReport.java                             |  122 
test/jtreg/com/sun/javatest/report/XMLReportMaker.java                        |  192 
test/jtreg/com/sun/javatest/tool/Command.java                                 |  190 
test/jtreg/com/sun/javatest/tool/CommandContext.java                          |  820 +-
test/jtreg/com/sun/javatest/tool/CommandManager.java                          |   26 
test/jtreg/com/sun/javatest/tool/CommandParser.java                           |  508 -
test/jtreg/com/sun/javatest/tool/ConfigManager.java                           | 2190 +++----
test/jtreg/com/sun/javatest/tool/Deck.java                                    |   48 
test/jtreg/com/sun/javatest/tool/DeskView.java                                |  896 +-
test/jtreg/com/sun/javatest/tool/Desktop.java                                 | 1350 ++--
test/jtreg/com/sun/javatest/tool/DesktopManager.java                          |   50 
test/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java                        |  590 -
test/jtreg/com/sun/javatest/tool/EditableFileList.java                        |   80 
test/jtreg/com/sun/javatest/tool/EditableList.java                            |  442 -
test/jtreg/com/sun/javatest/tool/EnvironmentManager.java                      |  136 
test/jtreg/com/sun/javatest/tool/FileChooser.java                             |   61 
test/jtreg/com/sun/javatest/tool/FileHistory.java                             |   68 
test/jtreg/com/sun/javatest/tool/FileOpener.java                              |   58 
test/jtreg/com/sun/javatest/tool/FocusMonitor.java                            | 1038 +--
test/jtreg/com/sun/javatest/tool/HelpLink.java                                |   58 
test/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java                        |   26 
test/jtreg/com/sun/javatest/tool/HelpManager.java                             |  316 -
test/jtreg/com/sun/javatest/tool/HelpMenu.java                                |  314 -
test/jtreg/com/sun/javatest/tool/HttpManager.java                             |   62 
test/jtreg/com/sun/javatest/tool/I18NUtils.java                               |  222 
test/jtreg/com/sun/javatest/tool/IconFactory.java                             |  972 +--
test/jtreg/com/sun/javatest/tool/IconLabel.java                               |   68 
test/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java                       |   22 
test/jtreg/com/sun/javatest/tool/LogManager.java                              |   96 
test/jtreg/com/sun/javatest/tool/MDIDeskView.java                             |  858 +-
test/jtreg/com/sun/javatest/tool/Main.java                                    |  722 +-
test/jtreg/com/sun/javatest/tool/ManagerLoader.java                           |  144 
test/jtreg/com/sun/javatest/tool/PieChart.java                                |  270 
test/jtreg/com/sun/javatest/tool/Preferences.java                             | 1002 +--
test/jtreg/com/sun/javatest/tool/SDIDeskView.java                             |  686 +-
test/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java                 |   38 
test/jtreg/com/sun/javatest/tool/Startup.java                                 |   84 
test/jtreg/com/sun/javatest/tool/TabDeskView.java                             |  752 +-
test/jtreg/com/sun/javatest/tool/TestSuiteChooser.java                        |  300 
test/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java                   |  142 
test/jtreg/com/sun/javatest/tool/Tool.java                                    |  246 
test/jtreg/com/sun/javatest/tool/ToolAction.java                              |  212 
test/jtreg/com/sun/javatest/tool/ToolDialog.java                              |  114 
test/jtreg/com/sun/javatest/tool/ToolManager.java                             |  100 
test/jtreg/com/sun/javatest/tool/TreeSelectionPane.java                       | 1268 ++--
test/jtreg/com/sun/javatest/tool/UIFactory.java                               |  374 -
test/jtreg/com/sun/javatest/tool/VerboseCommand.java                          |  142 
test/jtreg/com/sun/javatest/tool/WDC_FileFilter.java                          |    1 
test/jtreg/com/sun/javatest/tool/WDC_FileView.java                            |    4 
test/jtreg/com/sun/javatest/tool/WorkDirChooser.java                          |   80 
test/jtreg/com/sun/javatest/util/BackupPolicy.java                            |  246 
test/jtreg/com/sun/javatest/util/BackupUtil.java                              |   78 
test/jtreg/com/sun/javatest/util/Debug.java                                   |  477 -
test/jtreg/com/sun/javatest/util/DirectoryClassLoader.java                    |  214 
test/jtreg/com/sun/javatest/util/DynamicArray.java                            |  111 
test/jtreg/com/sun/javatest/util/ExitCount.java                               |   22 
test/jtreg/com/sun/javatest/util/Fifo.java                                    |  100 
test/jtreg/com/sun/javatest/util/FileFilter.java                              |    2 
test/jtreg/com/sun/javatest/util/FileInfoCache.java                           |   92 
test/jtreg/com/sun/javatest/util/HTMLWriter.java                              |  270 
test/jtreg/com/sun/javatest/util/HelpTree.java                                |  582 -
test/jtreg/com/sun/javatest/util/I18NResourceBundle.java                      |    8 
test/jtreg/com/sun/javatest/util/LineParser.java                              |  336 -
test/jtreg/com/sun/javatest/util/LogFile.java                                 |  116 
test/jtreg/com/sun/javatest/util/MainAppletContext.java                       |   30 
test/jtreg/com/sun/javatest/util/MainFrame.java                               |  208 
test/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java                      |   50 
test/jtreg/com/sun/javatest/util/PathClassLoader.java                         |  234 
test/jtreg/com/sun/javatest/util/PrefixMap.java                               |  136 
test/jtreg/com/sun/javatest/util/Properties.java                              |  400 -
test/jtreg/com/sun/javatest/util/PropertyArray.java                           |  531 -
test/jtreg/com/sun/javatest/util/ReadAheadIterator.java                       |  268 
test/jtreg/com/sun/javatest/util/SortedProperties.java                        |   28 
test/jtreg/com/sun/javatest/util/StringArray.java                             |  142 
test/jtreg/com/sun/javatest/util/SysEnv.java                                  |  132 
test/jtreg/com/sun/javatest/util/TextStream.java                              |   42 
test/jtreg/com/sun/javatest/util/TextWriter.java                              |  264 
test/jtreg/com/sun/javatest/util/Timer.java                                   |  248 
test/jtreg/com/sun/javatest/util/WrapWriter.java                              |  124 
test/jtreg/com/sun/javatest/util/WriterStream.java                            |   30 
test/jtreg/com/sun/javatest/util/XMLWriter.java                               |  196 

diffs (truncated from 180576 to 500 lines):

diff -r 581bf37cca26 -r 1cc292b49ad2 ChangeLog
--- a/ChangeLog	Wed Nov 11 05:15:50 2009 +0000
+++ b/ChangeLog	Thu Nov 12 21:27:25 2009 +0000
@@ -1,3 +1,450 @@ 2009-11-10  Andrew John Hughes  <ahughes
+2009-11-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* test/jtreg/com/sun/interview/AllFilesFileFilter.java,
+	* test/jtreg/com/sun/interview/Checklist.java,
+	* test/jtreg/com/sun/interview/ChoiceArrayQuestion.java,
+	* test/jtreg/com/sun/interview/ChoiceQuestion.java,
+	* test/jtreg/com/sun/interview/DirectoryFileFilter.java,
+	* test/jtreg/com/sun/interview/ErrorQuestion.java,
+	* test/jtreg/com/sun/interview/ExtensionFileFilter.java,
+	* test/jtreg/com/sun/interview/FileListQuestion.java,
+	* test/jtreg/com/sun/interview/FileQuestion.java,
+	* test/jtreg/com/sun/interview/FilesAndDirectoriesFileFilter.java,
+	* test/jtreg/com/sun/interview/FinalQuestion.java,
+	* test/jtreg/com/sun/interview/FloatQuestion.java,
+	* test/jtreg/com/sun/interview/InetAddressQuestion.java,
+	* test/jtreg/com/sun/interview/IntQuestion.java,
+	* test/jtreg/com/sun/interview/Interview.java,
+	* test/jtreg/com/sun/interview/InterviewQuestion.java,
+	* test/jtreg/com/sun/interview/InterviewSet.java,
+	* test/jtreg/com/sun/interview/ListQuestion.java,
+	* test/jtreg/com/sun/interview/NullQuestion.java,
+	* test/jtreg/com/sun/interview/Properties2.java,
+	* test/jtreg/com/sun/interview/PropertiesQuestion.java,
+	* test/jtreg/com/sun/interview/Question.java,
+	* test/jtreg/com/sun/interview/StringListQuestion.java,
+	* test/jtreg/com/sun/interview/StringQuestion.java,
+	* test/jtreg/com/sun/interview/TreeQuestion.java,
+	* test/jtreg/com/sun/interview/WizEdit.java,
+	* test/jtreg/com/sun/interview/WizPrint.java,
+	* test/jtreg/com/sun/interview/YesNoQuestion.java,
+	* test/jtreg/com/sun/interview/wizard/ActionDocListener.java,
+	* test/jtreg/com/sun/interview/wizard/ActionListDataListener.java,
+	* test/jtreg/com/sun/interview/wizard/ChoiceArrayQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/ChoiceQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/EditableList.java,
+	* test/jtreg/com/sun/interview/wizard/Exporter.java,
+	* test/jtreg/com/sun/interview/wizard/FileList.java,
+	* test/jtreg/com/sun/interview/wizard/FileListQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/FileQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/FloatQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/I18NResourceBundle.java,
+	* test/jtreg/com/sun/interview/wizard/InetAddressQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/InfoPanel.java,
+	* test/jtreg/com/sun/interview/wizard/IntQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/ListQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/NullQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/PathPanel.java,
+	* test/jtreg/com/sun/interview/wizard/PropertiesQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/QuestionPanel.java,
+	* test/jtreg/com/sun/interview/wizard/QuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/RenderingUtilities.java,
+	* test/jtreg/com/sun/interview/wizard/SearchDialog.java,
+	* test/jtreg/com/sun/interview/wizard/StringListQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/StringQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/SwingFileFilter.java,
+	* test/jtreg/com/sun/interview/wizard/TreeQuestionRenderer.java,
+	* test/jtreg/com/sun/interview/wizard/TypeInPanel.java,
+	* test/jtreg/com/sun/interview/wizard/WizPane.java,
+	* test/jtreg/com/sun/interview/wizard/Wizard.java,
+	* test/jtreg/com/sun/interview/wizard/YesNoQuestionRenderer.java,
+	* test/jtreg/com/sun/javatest/AllTestsFilter.java,
+	* test/jtreg/com/sun/javatest/BasicParameters.java,
+	* test/jtreg/com/sun/javatest/Command.java,
+	* test/jtreg/com/sun/javatest/CompositeFilter.java,
+	* test/jtreg/com/sun/javatest/DefaultTestRunner.java,
+	* test/jtreg/com/sun/javatest/Deprecated.java,
+	* test/jtreg/com/sun/javatest/EditJTI.java,
+	* test/jtreg/com/sun/javatest/EditLinks.java,
+	* test/jtreg/com/sun/javatest/ExcludeList.java,
+	* test/jtreg/com/sun/javatest/ExcludeListFilter.java,
+	* test/jtreg/com/sun/javatest/ExcludeListUpdateHandler.java,
+	* test/jtreg/com/sun/javatest/FileParameters.java,
+	* test/jtreg/com/sun/javatest/Harness.java,
+	* test/jtreg/com/sun/javatest/HarnessHttpHandler.java,
+	* test/jtreg/com/sun/javatest/InitialUrlFilter.java,
+	* test/jtreg/com/sun/javatest/InterviewParameters.java,
+	* test/jtreg/com/sun/javatest/InterviewPropagator.java,
+	* test/jtreg/com/sun/javatest/JavaTestError.java,
+	* test/jtreg/com/sun/javatest/JavaTestSecurityManager.java,
+	* test/jtreg/com/sun/javatest/Keywords.java,
+	* test/jtreg/com/sun/javatest/KeywordsFilter.java,
+	* test/jtreg/com/sun/javatest/LastRunFilter.java,
+	* test/jtreg/com/sun/javatest/LastRunInfo.java,
+	* test/jtreg/com/sun/javatest/ObservableTestFilter.java,
+	* test/jtreg/com/sun/javatest/Parameters.java,
+	* test/jtreg/com/sun/javatest/ProductInfo.java,
+	* test/jtreg/com/sun/javatest/ResourceTable.java,
+	* test/jtreg/com/sun/javatest/Script.java,
+	* test/jtreg/com/sun/javatest/Status.java,
+	* test/jtreg/com/sun/javatest/StatusFilter.java,
+	* test/jtreg/com/sun/javatest/TRT_HttpHandler.java,
+	* test/jtreg/com/sun/javatest/TRT_Iterator.java,
+	* test/jtreg/com/sun/javatest/TRT_TreeNode.java,
+	* test/jtreg/com/sun/javatest/TemplateUtilities.java,
+	* test/jtreg/com/sun/javatest/Test.java,
+	* test/jtreg/com/sun/javatest/TestDescription.java,
+	* test/jtreg/com/sun/javatest/TestEnvContext.java,
+	* test/jtreg/com/sun/javatest/TestEnvironment.java,
+	* test/jtreg/com/sun/javatest/TestFilter.java,
+	* test/jtreg/com/sun/javatest/TestFinder.java,
+	* test/jtreg/com/sun/javatest/TestFinderQueue.java,
+	* test/jtreg/com/sun/javatest/TestResult.java,
+	* test/jtreg/com/sun/javatest/TestResultCache.java,
+	* test/jtreg/com/sun/javatest/TestResultTable.java,
+	* test/jtreg/com/sun/javatest/TestRunner.java,
+	* test/jtreg/com/sun/javatest/Trace.java,
+	* test/jtreg/com/sun/javatest/WorkDirectory.java,
+	* test/jtreg/com/sun/javatest/agent/ActiveAgentCommand.java,
+	* test/jtreg/com/sun/javatest/agent/ActiveAgentPool.java,
+	* test/jtreg/com/sun/javatest/agent/ActiveConnectionFactory.java,
+	* test/jtreg/com/sun/javatest/agent/ActiveModeOptions.java,
+	* test/jtreg/com/sun/javatest/agent/Agent.java,
+	* test/jtreg/com/sun/javatest/agent/AgentApplet.java,
+	* test/jtreg/com/sun/javatest/agent/AgentClassLoader.java,
+	* test/jtreg/com/sun/javatest/agent/AgentClassLoader2.java,
+	* test/jtreg/com/sun/javatest/agent/AgentFrame.java,
+	* test/jtreg/com/sun/javatest/agent/AgentMain.java,
+	* test/jtreg/com/sun/javatest/agent/AgentManager.java,
+	* test/jtreg/com/sun/javatest/agent/AgentMonitorCommandManager.java,
+	* test/jtreg/com/sun/javatest/agent/AgentMonitorTool.java,
+	* test/jtreg/com/sun/javatest/agent/AgentMonitorToolManager.java,
+	* test/jtreg/com/sun/javatest/agent/AgentPanel.java,
+	* test/jtreg/com/sun/javatest/agent/BadValue.java,
+	* test/jtreg/com/sun/javatest/agent/Connection.java,
+	* test/jtreg/com/sun/javatest/agent/ConnectionFactory.java,
+	* test/jtreg/com/sun/javatest/agent/Deck.java,
+	* test/jtreg/com/sun/javatest/agent/Deprecated.java,
+	* test/jtreg/com/sun/javatest/agent/Folder.java,
+	* test/jtreg/com/sun/javatest/agent/Icon.java,
+	* test/jtreg/com/sun/javatest/agent/InterruptableSocketConnection.java,
+	* test/jtreg/com/sun/javatest/agent/Map.java,
+	* test/jtreg/com/sun/javatest/agent/ModeOptions.java,
+	* test/jtreg/com/sun/javatest/agent/PassiveAgentCommand.java,
+	* test/jtreg/com/sun/javatest/agent/PassiveConnectionFactory.java,
+	* test/jtreg/com/sun/javatest/agent/PassiveModeOptions.java,
+	* test/jtreg/com/sun/javatest/agent/SocketConnection.java,
+	* test/jtreg/com/sun/javatest/audit/Audit.java,
+	* test/jtreg/com/sun/javatest/audit/AuditCommandManager.java,
+	* test/jtreg/com/sun/javatest/audit/AuditPane.java,
+	* test/jtreg/com/sun/javatest/audit/AuditTool.java,
+	* test/jtreg/com/sun/javatest/audit/AuditToolManager.java,
+	* test/jtreg/com/sun/javatest/audit/BadChecksumPane.java,
+	* test/jtreg/com/sun/javatest/audit/BadTestCaseTestsPane.java,
+	* test/jtreg/com/sun/javatest/audit/BadTestDescriptionPane.java,
+	* test/jtreg/com/sun/javatest/audit/BadTestsPane.java,
+	* test/jtreg/com/sun/javatest/audit/ListPane.java,
+	* test/jtreg/com/sun/javatest/audit/OptionsDialog.java,
+	* test/jtreg/com/sun/javatest/audit/SummaryPane.java,
+	* test/jtreg/com/sun/javatest/batch/BatchManager.java,
+	* test/jtreg/com/sun/javatest/batch/ObserverCommand.java,
+	* test/jtreg/com/sun/javatest/batch/RunTestsCommand.java,
+	* test/jtreg/com/sun/javatest/cof/COFApplication.java,
+	* test/jtreg/com/sun/javatest/cof/COFApplications.java,
+	* test/jtreg/com/sun/javatest/cof/COFData.java,
+	* test/jtreg/com/sun/javatest/cof/COFEnvironment.java,
+	* test/jtreg/com/sun/javatest/cof/COFEnvironments.java,
+	* test/jtreg/com/sun/javatest/cof/COFItem.java,
+	* test/jtreg/com/sun/javatest/cof/COFOS.java,
+	* test/jtreg/com/sun/javatest/cof/COFReportAnnotation.java,
+	* test/jtreg/com/sun/javatest/cof/COFReportAnnotations.java,
+	* test/jtreg/com/sun/javatest/cof/COFSWEntities.java,
+	* test/jtreg/com/sun/javatest/cof/COFSWEntity.java,
+	* test/jtreg/com/sun/javatest/cof/COFStatus.java,
+	* test/jtreg/com/sun/javatest/cof/COFTest.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestAttribute.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestAttributes.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestCase.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestCases.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestSuite.java,
+	* test/jtreg/com/sun/javatest/cof/COFTestSuites.java,
+	* test/jtreg/com/sun/javatest/cof/ID.java,
+	* test/jtreg/com/sun/javatest/cof/Main.java,
+	* test/jtreg/com/sun/javatest/cof/Report.java,
+	* test/jtreg/com/sun/javatest/diff/DiffReader.java,
+	* test/jtreg/com/sun/javatest/diff/Help.java,
+	* test/jtreg/com/sun/javatest/diff/Main.java,
+	* test/jtreg/com/sun/javatest/diff/Reporter.java,
+	* test/jtreg/com/sun/javatest/diff/SimpleReporter.java,
+	* test/jtreg/com/sun/javatest/diff/StatusComparator.java,
+	* test/jtreg/com/sun/javatest/exec/AbstractCellEditor.java,
+	* test/jtreg/com/sun/javatest/exec/BP_BranchSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/BP_DocumentationSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/BP_FilteredOutSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/BP_SummarySubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/BP_TestListSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/BasicCustomTestFilter.java,
+	* test/jtreg/com/sun/javatest/exec/BranchPanel.java,
+	* test/jtreg/com/sun/javatest/exec/CE_EnvironmentPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_ExcludeListPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_ExecutionPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_FullView.java,
+	* test/jtreg/com/sun/javatest/exec/CE_KeywordsPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_PriorStatusPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_StdPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_StdView.java,
+	* test/jtreg/com/sun/javatest/exec/CE_TemplateDialog.java,
+	* test/jtreg/com/sun/javatest/exec/CE_TestsPane.java,
+	* test/jtreg/com/sun/javatest/exec/CE_View.java,
+	* test/jtreg/com/sun/javatest/exec/ChecklistBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/ConfigEditor.java,
+	* test/jtreg/com/sun/javatest/exec/ConfigHandler.java,
+	* test/jtreg/com/sun/javatest/exec/ConfigurableTestFilter.java,
+	* test/jtreg/com/sun/javatest/exec/CustomTestResultViewer.java,
+	* test/jtreg/com/sun/javatest/exec/DetailsBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/ET_FilterHandler.java,
+	* test/jtreg/com/sun/javatest/exec/ElapsedTimeMonitor.java,
+	* test/jtreg/com/sun/javatest/exec/EnvironmentBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/ExcludeListBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/ExecModel.java,
+	* test/jtreg/com/sun/javatest/exec/ExecTool.java,
+	* test/jtreg/com/sun/javatest/exec/ExecToolManager.java,
+	* test/jtreg/com/sun/javatest/exec/FeatureManager.java,
+	* test/jtreg/com/sun/javatest/exec/FileSystemTableModel.java,
+	* test/jtreg/com/sun/javatest/exec/FileTable.java,
+	* test/jtreg/com/sun/javatest/exec/FileType.java,
+	* test/jtreg/com/sun/javatest/exec/FilesPane.java,
+	* test/jtreg/com/sun/javatest/exec/FilterConfig.java,
+	* test/jtreg/com/sun/javatest/exec/FilterSelectionHandler.java,
+	* test/jtreg/com/sun/javatest/exec/JavaTestMenuManager.java,
+	* test/jtreg/com/sun/javatest/exec/JavaTestToolBar.java,
+	* test/jtreg/com/sun/javatest/exec/LogViewer.java,
+	* test/jtreg/com/sun/javatest/exec/LogViewerTools.java,
+	* test/jtreg/com/sun/javatest/exec/MessageStrip.java,
+	* test/jtreg/com/sun/javatest/exec/Monitor.java,
+	* test/jtreg/com/sun/javatest/exec/MonitorState.java,
+	* test/jtreg/com/sun/javatest/exec/MultiFormatPane.java,
+	* test/jtreg/com/sun/javatest/exec/MultiSelectPanel.java,
+	* test/jtreg/com/sun/javatest/exec/NavigationPane.java,
+	* test/jtreg/com/sun/javatest/exec/NewReportDialog.java,
+	* test/jtreg/com/sun/javatest/exec/ParameterFilter.java,
+	* test/jtreg/com/sun/javatest/exec/PrefsPane.java,
+	* test/jtreg/com/sun/javatest/exec/ProgressMeter.java,
+	* test/jtreg/com/sun/javatest/exec/ProgressMonitor.java,
+	* test/jtreg/com/sun/javatest/exec/PropertiesBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/QuestionLogBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/QuickStartWizard.java,
+	* test/jtreg/com/sun/javatest/exec/RenderingUtilities.java,
+	* test/jtreg/com/sun/javatest/exec/ReportBrowser.java,
+	* test/jtreg/com/sun/javatest/exec/ReportHandler.java,
+	* test/jtreg/com/sun/javatest/exec/RunProgressMonitor.java,
+	* test/jtreg/com/sun/javatest/exec/RunTestsHandler.java,
+	* test/jtreg/com/sun/javatest/exec/TP_CustomSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_DescSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_DocumentationSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_EnvSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_FilesSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_OutputSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_PropertySubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_ResultsSubpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TP_Subpanel.java,
+	* test/jtreg/com/sun/javatest/exec/TT_NodeCache.java,
+	* test/jtreg/com/sun/javatest/exec/TT_Renderer.java,
+	* test/jtreg/com/sun/javatest/exec/TU_ViewManager.java,
+	* test/jtreg/com/sun/javatest/exec/TemplateParameterFilter.java,
+	* test/jtreg/com/sun/javatest/exec/TestPanel.java,
+	* test/jtreg/com/sun/javatest/exec/TestSuiteErrorsDialog.java,
+	* test/jtreg/com/sun/javatest/exec/TestTree.java,
+	* test/jtreg/com/sun/javatest/exec/TestTreeModel.java,
+	* test/jtreg/com/sun/javatest/exec/TestTreePanel.java,
+	* test/jtreg/com/sun/javatest/exec/ToolBarManager.java,
+	* test/jtreg/com/sun/javatest/exec/ToolBarPanel.java,
+	* test/jtreg/com/sun/javatest/exec/TreePanelModel.java,
+	* test/jtreg/com/sun/javatest/exec/WorkDirChooseTool.java,
+	* test/jtreg/com/sun/javatest/finder/BinaryTestFinder.java,
+	* test/jtreg/com/sun/javatest/finder/BinaryTestWriter.java,
+	* test/jtreg/com/sun/javatest/finder/ChameleonTestFinder.java,
+	* test/jtreg/com/sun/javatest/finder/CommentStream.java,
+	* test/jtreg/com/sun/javatest/finder/ExpandTestFinder.java,
+	* test/jtreg/com/sun/javatest/finder/HTMLCommentStream.java,
+	* test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java,
+	* test/jtreg/com/sun/javatest/finder/JavaCommentStream.java,
+	* test/jtreg/com/sun/javatest/finder/ReverseTestFinder.java,
+	* test/jtreg/com/sun/javatest/finder/ShScriptCommentStream.java,
+	* test/jtreg/com/sun/javatest/finder/ShowTests.java,
+	* test/jtreg/com/sun/javatest/finder/TagTestFinder.java,
+	* test/jtreg/com/sun/javatest/httpd/HttpdServer.java,
+	* test/jtreg/com/sun/javatest/httpd/JThttpProvider.java,
+	* test/jtreg/com/sun/javatest/httpd/PageGenerator.java,
+	* test/jtreg/com/sun/javatest/httpd/ProviderRegistry.java,
+	* test/jtreg/com/sun/javatest/httpd/RequestHandler.java,
+	* test/jtreg/com/sun/javatest/httpd/RootRegistry.java,
+	* test/jtreg/com/sun/javatest/httpd/httpURL.java,
+	* test/jtreg/com/sun/javatest/interview/BasicInterviewParameters.java,
+	* test/jtreg/com/sun/javatest/interview/ConcurrencyInterview.java,
+	* test/jtreg/com/sun/javatest/interview/DefaultInterviewParameters.java,
+	* test/jtreg/com/sun/javatest/interview/EnvironmentInterview.java,
+	* test/jtreg/com/sun/javatest/interview/ExcludeListInterview.java,
+	* test/jtreg/com/sun/javatest/interview/KeywordsInterview.java,
+	* test/jtreg/com/sun/javatest/interview/LegacyParameters.java,
+	* test/jtreg/com/sun/javatest/interview/PriorStatusInterview.java,
+	* test/jtreg/com/sun/javatest/interview/SimpleInterviewParameters.java,
+	* test/jtreg/com/sun/javatest/interview/TestsInterview.java,
+	* test/jtreg/com/sun/javatest/interview/TimeoutFactorInterview.java,
+	* test/jtreg/com/sun/javatest/lib/APIScript.java,
+	* test/jtreg/com/sun/javatest/lib/Deprecated.java,
+	* test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java,
+	* test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java,
+	* test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java,
+	* test/jtreg/com/sun/javatest/lib/KeywordScript.java,
+	* test/jtreg/com/sun/javatest/lib/MultiStatus.java,
+	* test/jtreg/com/sun/javatest/lib/MultiTest.java,
+	* test/jtreg/com/sun/javatest/lib/ProcessCommand.java,
+	* test/jtreg/com/sun/javatest/lib/ReportScript.java,
+	* test/jtreg/com/sun/javatest/lib/StdTestScript.java,
+	* test/jtreg/com/sun/javatest/lib/TestCases.java,
+	* test/jtreg/com/sun/javatest/logging/ErrorDialogHandler.java,
+	* test/jtreg/com/sun/javatest/logging/FileEvent.java,
+	* test/jtreg/com/sun/javatest/logging/FileListener.java,
+	* test/jtreg/com/sun/javatest/logging/FilteredLogModel.java,
+	* test/jtreg/com/sun/javatest/logging/JTFormatter.java,
+	* test/jtreg/com/sun/javatest/logging/LogModel.java,
+	* test/jtreg/com/sun/javatest/logging/LoggerFactory.java,
+	* test/jtreg/com/sun/javatest/logging/ObservedFile.java,
+	* test/jtreg/com/sun/javatest/logging/WorkDirLogHandler.java,
+	* test/jtreg/com/sun/javatest/mrep/BrowserPane.java,
+	* test/jtreg/com/sun/javatest/mrep/ConflictResolutionDialog.java,
+	* test/jtreg/com/sun/javatest/mrep/ConflictResolver.java,
+	* test/jtreg/com/sun/javatest/mrep/FilesPane.java,
+	* test/jtreg/com/sun/javatest/mrep/Merger.java,
+	* test/jtreg/com/sun/javatest/mrep/OptionsDialog.java,
+	* test/jtreg/com/sun/javatest/mrep/OptionsPane.java,
+	* test/jtreg/com/sun/javatest/mrep/ReportDirChooser.java,
+	* test/jtreg/com/sun/javatest/mrep/ReportTool.java,
+	* test/jtreg/com/sun/javatest/mrep/ReportToolManager.java,
+	* test/jtreg/com/sun/javatest/mrep/Scheme.java,
+	* test/jtreg/com/sun/javatest/mrep/TestResultDescr.java,
+	* test/jtreg/com/sun/javatest/mrep/XMLReportReader.java,
+	* test/jtreg/com/sun/javatest/mrep/XMLReportWriter.java,
+	* test/jtreg/com/sun/javatest/regtest/Action.java,
+	* test/jtreg/com/sun/javatest/regtest/AntOptionDecoder.java,
+	* test/jtreg/com/sun/javatest/regtest/AppletAction.java,
+	* test/jtreg/com/sun/javatest/regtest/AppletWrapper.java,
+	* test/jtreg/com/sun/javatest/regtest/BuildAction.java,
+	* test/jtreg/com/sun/javatest/regtest/CheckFiles.java,
+	* test/jtreg/com/sun/javatest/regtest/CompileAction.java,
+	* test/jtreg/com/sun/javatest/regtest/Help.java,
+	* test/jtreg/com/sun/javatest/regtest/IgnoreAction.java,
+	* test/jtreg/com/sun/javatest/regtest/JDK.java,
+	* test/jtreg/com/sun/javatest/regtest/Main.java,
+	* test/jtreg/com/sun/javatest/regtest/Option.java,
+	* test/jtreg/com/sun/javatest/regtest/OptionDecoder.java,
+	* test/jtreg/com/sun/javatest/regtest/RegressionObserver.java,
+	* test/jtreg/com/sun/javatest/regtest/RegressionParameters.java,
+	* test/jtreg/com/sun/javatest/regtest/RegressionScript.java,
+	* test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
+	* test/jtreg/com/sun/javatest/regtest/RegressionTestSuite.java,
+	* test/jtreg/com/sun/javatest/regtest/ShellAction.java,
+	* test/jtreg/com/sun/javatest/regtest/StringArray.java,
+	* test/jtreg/com/sun/javatest/regtest/Verbose.java,
+	* test/jtreg/com/sun/javatest/report/ConfigSection.java,
+	* test/jtreg/com/sun/javatest/report/CustomReport.java,
+	* test/jtreg/com/sun/javatest/report/HTMLReport.java,
+	* test/jtreg/com/sun/javatest/report/HTMLSection.java,
+	* test/jtreg/com/sun/javatest/report/PlainTextReport.java,
+	* test/jtreg/com/sun/javatest/report/Report.java,
+	* test/jtreg/com/sun/javatest/report/ReportDirChooser.java,
+	* test/jtreg/com/sun/javatest/report/ReportManager.java,
+	* test/jtreg/com/sun/javatest/report/ReportWriter.java,
+	* test/jtreg/com/sun/javatest/report/ResultSection.java,
+	* test/jtreg/com/sun/javatest/report/StatisticsSection.java,
+	* test/jtreg/com/sun/javatest/report/StringArrayComparator.java,
+	* test/jtreg/com/sun/javatest/report/TestResultsByFileComparator.java,
+	* test/jtreg/com/sun/javatest/report/TestResultsByStatusAndTitleComparator.java,
+	* test/jtreg/com/sun/javatest/report/TestResultsByTitleComparator.java,
+	* test/jtreg/com/sun/javatest/report/XMLReport.java,
+	* test/jtreg/com/sun/javatest/report/XMLReportMaker.java,
+	* test/jtreg/com/sun/javatest/tool/Command.java,
+	* test/jtreg/com/sun/javatest/tool/CommandContext.java,
+	* test/jtreg/com/sun/javatest/tool/CommandManager.java,
+	* test/jtreg/com/sun/javatest/tool/CommandParser.java,
+	* test/jtreg/com/sun/javatest/tool/ConfigManager.java,
+	* test/jtreg/com/sun/javatest/tool/Deck.java,
+	* test/jtreg/com/sun/javatest/tool/DeskView.java,
+	* test/jtreg/com/sun/javatest/tool/Desktop.java,
+	* test/jtreg/com/sun/javatest/tool/DesktopManager.java,
+	* test/jtreg/com/sun/javatest/tool/DesktopPrefsPane.java,
+	* test/jtreg/com/sun/javatest/tool/EditableFileList.java,
+	* test/jtreg/com/sun/javatest/tool/EditableList.java,
+	* test/jtreg/com/sun/javatest/tool/EnvironmentManager.java,
+	* test/jtreg/com/sun/javatest/tool/FileChooser.java,
+	* test/jtreg/com/sun/javatest/tool/FileHistory.java,
+	* test/jtreg/com/sun/javatest/tool/FileOpener.java,
+	* test/jtreg/com/sun/javatest/tool/FocusMonitor.java,
+	* test/jtreg/com/sun/javatest/tool/HelpLink.java,
+	* test/jtreg/com/sun/javatest/tool/HelpLinkBeanInfo.java,
+	* test/jtreg/com/sun/javatest/tool/HelpManager.java,
+	* test/jtreg/com/sun/javatest/tool/HelpMenu.java,
+	* test/jtreg/com/sun/javatest/tool/HttpManager.java,
+	* test/jtreg/com/sun/javatest/tool/I18NUtils.java,
+	* test/jtreg/com/sun/javatest/tool/IconFactory.java,
+	* test/jtreg/com/sun/javatest/tool/IconLabel.java,
+	* test/jtreg/com/sun/javatest/tool/IconLabelBeanInfo.java,
+	* test/jtreg/com/sun/javatest/tool/LogManager.java,
+	* test/jtreg/com/sun/javatest/tool/MDIDeskView.java,
+	* test/jtreg/com/sun/javatest/tool/Main.java,
+	* test/jtreg/com/sun/javatest/tool/ManagerLoader.java,
+	* test/jtreg/com/sun/javatest/tool/PieChart.java,
+	* test/jtreg/com/sun/javatest/tool/Preferences.java,
+	* test/jtreg/com/sun/javatest/tool/SDIDeskView.java,
+	* test/jtreg/com/sun/javatest/tool/SelectedWorkDirApprover.java,
+	* test/jtreg/com/sun/javatest/tool/Startup.java,
+	* test/jtreg/com/sun/javatest/tool/TabDeskView.java,
+	* test/jtreg/com/sun/javatest/tool/TestSuiteChooser.java,
+	* test/jtreg/com/sun/javatest/tool/TestTreeSelectionPane.java,
+	* test/jtreg/com/sun/javatest/tool/Tool.java,
+	* test/jtreg/com/sun/javatest/tool/ToolAction.java,
+	* test/jtreg/com/sun/javatest/tool/ToolDialog.java,
+	* test/jtreg/com/sun/javatest/tool/ToolManager.java,
+	* test/jtreg/com/sun/javatest/tool/TreeSelectionPane.java,
+	* test/jtreg/com/sun/javatest/tool/UIFactory.java,
+	* test/jtreg/com/sun/javatest/tool/VerboseCommand.java,
+	* test/jtreg/com/sun/javatest/tool/WDC_FileFilter.java,
+	* test/jtreg/com/sun/javatest/tool/WDC_FileView.java,
+	* test/jtreg/com/sun/javatest/tool/WorkDirChooser.java,
+	* test/jtreg/com/sun/javatest/util/BackupPolicy.java,
+	* test/jtreg/com/sun/javatest/util/BackupUtil.java,
+	* test/jtreg/com/sun/javatest/util/Debug.java,
+	* test/jtreg/com/sun/javatest/util/DirectoryClassLoader.java,
+	* test/jtreg/com/sun/javatest/util/DynamicArray.java,
+	* test/jtreg/com/sun/javatest/util/ExitCount.java,
+	* test/jtreg/com/sun/javatest/util/Fifo.java,
+	* test/jtreg/com/sun/javatest/util/FileFilter.java,
+	* test/jtreg/com/sun/javatest/util/FileInfoCache.java,
+	* test/jtreg/com/sun/javatest/util/HTMLWriter.java,
+	* test/jtreg/com/sun/javatest/util/HelpTree.java,
+	* test/jtreg/com/sun/javatest/util/I18NResourceBundle.java,
+	* test/jtreg/com/sun/javatest/util/LineParser.java,
+	* test/jtreg/com/sun/javatest/util/LogFile.java,
+	* test/jtreg/com/sun/javatest/util/MainAppletContext.java,
+	* test/jtreg/com/sun/javatest/util/MainFrame.java,
+	* test/jtreg/com/sun/javatest/util/OrderedTwoWayTable.java,
+	* test/jtreg/com/sun/javatest/util/PathClassLoader.java,
+	* test/jtreg/com/sun/javatest/util/PrefixMap.java,
+	* test/jtreg/com/sun/javatest/util/Properties.java,
+	* test/jtreg/com/sun/javatest/util/PropertyArray.java,
+	* test/jtreg/com/sun/javatest/util/ReadAheadIterator.java,
+	* test/jtreg/com/sun/javatest/util/SortedProperties.java,
+	* test/jtreg/com/sun/javatest/util/StringArray.java,
+	* test/jtreg/com/sun/javatest/util/SysEnv.java,
+	* test/jtreg/com/sun/javatest/util/TextStream.java,
+	* test/jtreg/com/sun/javatest/util/TextWriter.java,
+	* test/jtreg/com/sun/javatest/util/Timer.java,
+	* test/jtreg/com/sun/javatest/util/WrapWriter.java,
+	* test/jtreg/com/sun/javatest/util/WriterStream.java,
+	* test/jtreg/com/sun/javatest/util/XMLWriter.java:
+	Normalize whitespace using Sun's normalizer script.
+
 2009-11-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	* HACKING: Document icedtea-sources.patch.
diff -r 581bf37cca26 -r 1cc292b49ad2 test/jtreg/com/sun/interview/AllFilesFileFilter.java
--- a/test/jtreg/com/sun/interview/AllFilesFileFilter.java	Wed Nov 11 05:15:50 2009 +0000
+++ b/test/jtreg/com/sun/interview/AllFilesFileFilter.java	Thu Nov 12 21:27:25 2009 +0000
@@ -37,24 +37,24 @@ public class AllFilesFileFilter implemen
      * @param description A short string describing the filter.
      */
     public AllFilesFileFilter(String description) {
-	this.description = description;
+        this.description = description;
     }
-    
+
     public boolean accept(File f) {
-	return (!f.isDirectory());
+        return (!f.isDirectory());
     }
-    
+
     public boolean acceptsDirectories() {
-	return false;
+        return false;
     }
-    
+
     /**
      * Get a short description for this filter.
      * @return a short description of this filter
      */
     public String getDescription() {
-	return description;
+        return description;
     }
-    
+
     private String description;
 }
diff -r 581bf37cca26 -r 1cc292b49ad2 test/jtreg/com/sun/interview/Checklist.java
--- a/test/jtreg/com/sun/interview/Checklist.java	Wed Nov 11 05:15:50 2009 +0000
+++ b/test/jtreg/com/sun/interview/Checklist.java	Thu Nov 12 21:27:25 2009 +0000
@@ -34,7 +34,7 @@ import java.util.Vector;
  * A Checklist is a sorted collection of messages,
  * for the purpose of providing a list of actions that must
  * be performed in association with a completed interview.
- * Messages are grouped into sections, which are sorted 
+ * Messages are grouped into sections, which are sorted
  * alphabetically; within a section, messages are stored


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 13:57:48 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 21:57:48 +0000
Subject: [Bug 406] New: IcedTeaPlugin.so fails to load processing created
	applets.
Message-ID: <E1N8hfo-0003WF-VL@icedtea.classpath.org>

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

           Summary: IcedTeaPlugin.so fails to load processing created
                    applets.
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: http://www.openprocessing.org/visuals/?visualID=2615
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: xerxes at zafena.se


Testcase: Load http://www.openprocessing.org/visuals/?visualID=2615
Expected result: applet loads and a flower gets drawn
Actual result: applet fails to load only a gry box are displayed

Processing are a IDE and simplified language built on top of Java made for
rapid visual art prototyping using a simplifyed java API.

The Processing IDE have the ability export processing "sketches" to webapplets.
These applets fails to load using the IcedTea Java Web Browser Plugin.

Go to http://www.openprocessing.org and try to view any of the uploaded sketch
applets
http://www.openprocessing.org/browse/?viewBy=most&filter=favorited

IcedTea Java Web Browser Plugin
    Filnamn: IcedTeaPlugin.so
    The IcedTea Java Web Browser Plugin 1.6 (fedora-29.b16.fc11-i386) executes
Java applets.

GPL sources for processing can be fetched from
http://dev.processing.org/
and sources can be browsed online here:
http://dev.processing.org/source/index.cgi/


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


From andrew at icedtea.classpath.org  Thu Nov 12 13:57:52 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 21:57:52 +0000
Subject: /hg/icedtea: Replace non-ASCII copyright symbol with Unicode num...
Message-ID: <hg.0e4ad6f4ee6f.1258063072.-6899778133799504387@icedtea.classpath.org>

changeset 0e4ad6f4ee6f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0e4ad6f4ee6f
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Nov 12 22:02:23 2009 +0000

	Replace non-ASCII copyright symbol with Unicode number.

	2009-11-12 Andrew John Hughes <ahughes at redhat.com>

	 * test/jtreg/com/sun/javatest/agent/Agent.java,
		* test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java:
	Replace literal copyright symbol with its Unicode number to
	avoid encoding issues.


diffstat:

3 files changed, 9 insertions(+), 2 deletions(-)
ChangeLog                                              |    7 +++++++
test/jtreg/com/sun/javatest/agent/Agent.java           |    2 +-
test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java |    2 +-

diffs (38 lines):

diff -r 1cc292b49ad2 -r 0e4ad6f4ee6f ChangeLog
--- a/ChangeLog	Thu Nov 12 21:27:25 2009 +0000
+++ b/ChangeLog	Thu Nov 12 22:02:23 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-12  Andrew John Hughes  <ahughes
+2009-11-12  Andrew John Hughes  <ahughes at redhat.com>
+
+	* test/jtreg/com/sun/javatest/agent/Agent.java,
+	* test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java:
+	Replace literal copyright symbol with its Unicode
+	number to avoid encoding issues.
+
 2009-11-12  Andrew John Hughes  <ahughes at redhat.com>
 
 	* test/jtreg/com/sun/interview/AllFilesFileFilter.java,
diff -r 1cc292b49ad2 -r 0e4ad6f4ee6f test/jtreg/com/sun/javatest/agent/Agent.java
--- a/test/jtreg/com/sun/javatest/agent/Agent.java	Thu Nov 12 21:27:25 2009 +0000
+++ b/test/jtreg/com/sun/javatest/agent/Agent.java	Thu Nov 12 22:02:23 2009 +0000
@@ -584,7 +584,7 @@ public class Agent implements Runnable
 
     static final String productName = "JT Harness Agent";
     static final String productVersion = "JTA_3.1.4";
-    static final String productCopyright = "Copyright ? 1996-2008 Sun Microsystems, Inc";
+    static final String productCopyright = "Copyright \u00A9 1996-2008 Sun Microsystems, Inc";
 
 
     /**
diff -r 1cc292b49ad2 -r 0e4ad6f4ee6f test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java
--- a/test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java	Thu Nov 12 21:27:25 2009 +0000
+++ b/test/jtreg/com/sun/javatest/finder/HTMLTestFinder.java	Thu Nov 12 22:02:23 2009 +0000
@@ -276,7 +276,7 @@ public class HTMLTestFinder extends Test
                         else if (tag.equals("amp"))
                             replace = "&";
                         else if (tag.equals("copy"))
-                            replace = "?";
+                            replace = "\u00A9";
                         if (replace == null)
                             replace = "&" + tag + ((char) c);
                     }


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 12 14:13:37 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 12 Nov 2009 22:13:37 +0000
Subject: [Bug 406] IcedTeaPlugin.so fails to load processing created applets.
Message-ID: <E1N8hv7-0005nW-SQ@icedtea.classpath.org>

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





------- Comment #1 from xerxes at zafena.se  2009-11-12 22:13 -------
To rule out a lot of potential bug-causes i can confirm that by running the
applets in question using the appletviewer do work:

appletviewer -J-version
java version "1.6.0_0"
OpenJDK Runtime Environment (IcedTea6 1.6) (fedora-29.b16.fc11-i386)
OpenJDK Server VM (build 14.0-b16, mixed mode)

appletviewer http://www.openprocessing.org/visuals/?visualID=2615   <- this
runs beautifully.

so the problem seems to be pure plugin related.


-- 
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 Nov 13 01:39:17 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 13 Nov 2009 09:39:17 +0000
Subject: [Bug 407] New: Segfault in IcedTeaPluginFactory::GetProxyInfo
Message-ID: <E1N8scf-0004xX-Tk@icedtea.classpath.org>

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

           Summary: Segfault in IcedTeaPluginFactory::GetProxyInfo
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mikhail.zabaluev at nokia.com


I've installed OpenJDK 1.6 and the IcedTea plugin on Ununtu 9.10.

When I try to join a LiveMeeting on the web using a partner link under
https://www.livemeeting.com, Firefox crashes during applet initialization.
Here's the backtrace of the faulty thread:

#0  0x001d2832 in _dl_sysinfo_int80 () from /lib/ld-linux.so.2
#1  0x00c6bf60 in raise (sig=11)
    at ../nptl/sysdeps/unix/sysv/linux/pt-raise.c:42
#2  0x01097f2a in nsProfileLock::FatalSignalHandler (signo=11)
    at nsProfileLock.cpp:212
#3  <signal handler called>
#4  IcedTeaPluginFactory::GetProxyInfo (this=0xb03f2500, 
    siteAddr=0xafaa2188
"https://fwd506.livemeeting.com//etc/fwd/gb2frepws008.rtc.local$9002/$jGHN30BltnChhfL54fBpW1BjqBBBBBPBBCD39BBBBW8", 
    proxyScheme=0xb0dff134, proxyHost=0xb0dff130, proxyPort=0xb0dff120)
    at ../IcedTeaPlugin.cc:2741
#5  0x047d73e8 in IcedTeaPluginFactory::HandleMessage (this=0xb03f2500, 
    message=...) at ../IcedTeaPlugin.cc:3479
#6  0x047da69b in IcedTeaPluginFactory::ConsumeMsgFromJVM (this=0xb03f2500)
    at ../IcedTeaPlugin.cc:3588
#7  0x047da82a in IcedTeaPluginFactory::ProcessMessage (this=0xb03f2500)
    at ../IcedTeaPlugin.cc:3546
#8  0x047db80c in IcedTeaRunnableMethod<IcedTeaPluginFactory>::Run (
    this=0x1a860c4) at ../IcedTeaPlugin.cc:1430

In the frame #4, *proxyScheme points to an empty string, *proxyHost and
*proxyPort apparently point to garbage.

Version information:

Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.5) Gecko/20091109 Ubuntu/9.10
(karmic) Firefox/3.5.5

IcedTea Java Web Browser Plugin 1.6.1 (6b16-1.6.1-3ubuntu1)

java version "1.6.0_0"
OpenJDK Runtime Environment (IcedTea6 1.6.1) (6b16-1.6.1-3ubuntu1)
OpenJDK Server VM (build 14.0-b16, mixed mode)


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


From mvfranz at gmail.com  Fri Nov 13 15:45:37 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Fri, 13 Nov 2009 18:45:37 -0500
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <20091112101915.GA3424@redhat.com>
References: <17c6771e0911081549j36e06285j6645a8c56e2a774@mail.gmail.com>
	<fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
	<20091111140940.GG3256@redhat.com>
	<fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>
	<fee4d890911112023h181cbbc7m600a52c6562548db@mail.gmail.com>
	<20091112101915.GA3424@redhat.com>
Message-ID: <fee4d890911131545h140a4f76iad0aee6de5dc6160@mail.gmail.com>

On Thu, Nov 12, 2009 at 5:19 AM, Gary Benson <gbenson at redhat.com> wrote:

> Michael Franz wrote:
> > The latest does not build.  Here is the error:
> [snip]
> > javac: PPCJITInfo.cpp:391: virtual void llvm::PPCJITInfo::relocate(void*,
> > llvm::MachineRelocation*, unsigned int, unsigned char*): Assertion
> > `ResultPtr >= -(1 << 23) && ResultPtr < (1 << 23) && "Relocation out of
> > range!"' failed.
>
> You need to patch LLVM to run Shark with LLVM 2.6 on PowerPC:
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399
>
> Cheers,
> Gary
>
I applied this patch and the build progresses farther.  I guess llvm is just
not stable at this point.  I get the following crash during the build.


-def-check:

-check-boot.java.home:

-def-pcompile:
#
# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (debugInfo.cpp:85), pid=22190, tid=1209107600
#  Error: ShouldNotReachHere()
#
# JRE version: 7.0-b75
# Java VM: OpenJDK Shark VM (17.0-b04 mixed mode linux-ppc )
# Distribution: Built on Fedora release 11 (Leonidas)
# An error report file with more information is saved as:
# /home/mfranz/icedtea/icedtea/openjdk/langtools/make/hs_err_pid22190.log
#
# If you would like to submit a bug report, please include
# instructions how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091113/66b1a704/attachment.html 

From ekrichardson at gmail.com  Sat Nov 14 20:48:57 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Sat, 14 Nov 2009 20:48:57 -0800
Subject: Build progress on Mac OS X PowerPC
Message-ID: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>

Hello,

I have been able to get through all the patching in Icedtea 7. I am trying
to compile using the Apple JDK5 (modified layout).

There was one patch that was strange - patches/icedtea-version.patch - this
looks like
|--- openjdk/jdk/src/share/classes/sun/misc/Version.java.template~1~
2008-11-25 01:04:53.000000000 -0800
|+++ openjdk/jdk/src/share/classes/sun/misc/Version.java.template
2009-02-20 09:03:25.000000000 -0800

This file is named Version-template.java in the bsd-port.

The following is where the build stopped. Any help appreciated.

Eric

make ARCH=ppc \
    ALT_FREETYPE_LIB_PATH=/opt/local/lib \
    ALT_FREETYPE_HEADERS_PATH=/opt/local/include

#######################################################################
########################################################################
##### Entering  langtools for target  all                          #####
########################################################################
(cd  ./langtools/make && \
      /usr/bin/make JDK_TOPDIR=/Users/eric/openjdk/icedtea/openjdk-boot/jdk
JDK_MAKE_SHARED_DIR=/Users/eric/openjdk/icedtea/openjdk-boot/jdk/make/common/shared
EXTERNALSANITYCONTROL=true SOURCE_LANGUAGE_VERSION=7 TARGET_CLASS_VERSION=7
MILESTONE=fcs BUILD_NUMBER=b75 JDK_BUILD_NUMBER=b75
FULL_VERSION=1.7.0_0-bsd-b75 PREVIOUS_JDK_VERSION=1.6.0 JDK_VERSION=1.7.0_0
JDK_MKTG_VERSION=7u JDK_MAJOR_VERSION=1 JDK_MINOR_VERSION=7
JDK_MICRO_VERSION=0 PREVIOUS_MAJOR_VERSION=1 PREVIOUS_MINOR_VERSION=6
PREVIOUS_MICRO_VERSION=0 ARCH_DATA_MODEL=64 COOKED_JDK_UPDATE_VERSION=0
COOKED_BUILD_NUMBER=75 ANT_HOME="/usr/share/ant"
ALT_OUTPUTDIR=/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools
ALT_BOOTDIR=/Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0 all)
JAVA_HOME=/Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/ant-tmp'
ant -diagnostics >
/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/ant-diagnostics.log
JAVA_HOME=/Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/ant-tmp'
ant -Djdk.version=1.7.0_0 -Dfull.version='1.7.0_0-bsd-b75'
-Drelease=1.7.0_0 -Dbuild.number=b75 -Djavac.debug=true
-Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7
-Dboot.java.home=/Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0
-Dbuild.dir=/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build
-Ddist.dir=/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/dist
build
Buildfile: build.xml

-def-check:

-check-boot.java.home:

-def-pcompile:
    [mkdir] Created dir:
/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
    [javac] Compiling 2 source files to
/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses

BUILD FAILED
/Users/eric/openjdk/icedtea/openjdk-boot/langtools/make/build.xml:603:
java.lang.UnsupportedClassVersionError: Bad version number in .class file

Total time: 6 seconds
make[3]: *** [build] Error 1
make[2]: *** [langtools-build] Error 2
make[1]: *** [build_product_image] Error 2
make: *** [stamps/icedtea-boot.stamp] Error 2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091114/1e4aa63e/attachment.html 

From mvfranz at gmail.com  Sat Nov 14 21:34:53 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 15 Nov 2009 00:34:53 -0500
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
Message-ID: <fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>

Eric,

I have encountered this issue before.  I am not sure what I did to fix it.
I think I used ecj instead of the Apple javac.  Check the javac perl script
that IcedTea has.  The other option is to apply this patch in the required
build files.

http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html

Here is my initial post on this
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html

If I remember correctly, there is a tool that is compiled by ant (the two in
the output), but it is not compiled with Java 5 byte code.  When ant tries
to run the tool you get that error.

I would switch to using ecj, as you might be able to get past this issue,
there is another issue that will come up and ecj acts differently than javac
and you really need the ecj way of doing things.  This is my original email
on this:
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html

Michael

On Sat, Nov 14, 2009 at 11:48 PM, Eric Richardson <ekrichardson at gmail.com>wrote:

>
> -def-pcompile:
>     [mkdir] Created dir:
> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>     [javac] Compiling 2 source files to
> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>
> BUILD FAILED
> /Users/eric/openjdk/icedtea/openjdk-boot/langtools/make/build.xml:603:
> java.lang.UnsupportedClassVersionError: Bad version number in .class file
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091115/cba3409c/attachment.html 

From gnu_andrew at member.fsf.org  Sun Nov 15 07:00:45 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 15 Nov 2009 15:00:45 +0000
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
Message-ID: <17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>

2009/11/15 Michael Franz <mvfranz at gmail.com>:
> Eric,
>
> I have encountered this issue before.? I am not sure what I did to fix it.
> I think I used ecj instead of the Apple javac.? Check the javac perl script
> that IcedTea has.? The other option is to apply this patch in the required
> build files.
>
> http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html
>

That patch is in OpenJDK:
http://hg.openjdk.java.net/jdk7/jdk7/langtools/rev/2aa3a1cdb094

> Here is my initial post on this
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
>
> If I remember correctly, there is a tool that is compiled by ant (the two in
> the output), but it is not compiled with Java 5 byte code.? When ant tries
> to run the tool you get that error.
>
> I would switch to using ecj, as you might be able to get past this issue,
> there is another issue that will come up and ecj acts differently than javac
> and you really need the ecj way of doing things.? This is my original email
> on this:
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
>

ecj is currently the only supported method for doing a build without
--disable-bootstrap, but that may change in the future.
Note that a normal OpenJDK build requires a Sun-based implementation
of Java 6, due to dependence on com.sun classes and AWT classes that
are part of the 1.6 specification.  We do our best to get round this
for IcedTea bootstrapping, but that testing is based on ecj+gcj not
Apple's products.

> Michael
>
> On Sat, Nov 14, 2009 at 11:48 PM, Eric Richardson <ekrichardson at gmail.com>
> wrote:
>>
>> -def-pcompile:
>> ??? [mkdir] Created dir:
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>> ??? [javac] Compiling 2 source files to
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>>
>> BUILD FAILED
>> /Users/eric/openjdk/icedtea/openjdk-boot/langtools/make/build.xml:603:
>> java.lang.UnsupportedClassVersionError: Bad version number in .class file
>>
>
>
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Sun Nov 15 07:41:52 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Sun, 15 Nov 2009 10:41:52 -0500
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
Message-ID: <fee4d890911150741i219c066xc8bba807f60f0a85@mail.gmail.com>

On Sun, Nov 15, 2009 at 10:00 AM, Andrew John Hughes <
gnu_andrew at member.fsf.org> wrote:

> 2009/11/15 Michael Franz <mvfranz at gmail.com>:
> > Eric,
> >
> > I have encountered this issue before.  I am not sure what I did to fix
> it.
> > I think I used ecj instead of the Apple javac.  Check the javac perl
> script
> > that IcedTea has.  The other option is to apply this patch in the
> required
> > build files.
> >
> >
> http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html<http://cr.openjdk.java.net/%7Eandrew/ecj/01/webrev.01/make/build.xml.udiff.html>
> >
>
> That patch is in OpenJDK:
> http://hg.openjdk.java.net/jdk7/jdk7/langtools/rev/2aa3a1cdb094
>
> > Here is my initial post on this
> >
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
> >
> > If I remember correctly, there is a tool that is compiled by ant (the two
> in
> > the output), but it is not compiled with Java 5 byte code.  When ant
> tries
> > to run the tool you get that error.
> >
> > I would switch to using ecj, as you might be able to get past this issue,
> > there is another issue that will come up and ecj acts differently than
> javac
> > and you really need the ecj way of doing things.  This is my original
> email
> > on this:
> >
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
> >
>
> ecj is currently the only supported method for doing a build without
> --disable-bootstrap, but that may change in the future.
> Note that a normal OpenJDK build requires a Sun-based implementation
> of Java 6, due to dependence on com.sun classes and AWT classes that
> are part of the 1.6 specification.  We do our best to get round this
> for IcedTea bootstrapping, but that testing is based on ecj+gcj not
> Apple's products.
>
> It is possible to build IcedTea 1.11 using Apple's JDK 5 with ecj and the
bsd port repo.  There are hoops to jump through, but it works.
I mostly worked on this since I could no-longer build OpenJDK 7 with a
previous OpenJDK 7 and could not figure out why it was not working.  Using
the IcedTea bootstrap process was simpler and should help in bring
zero/shark to PowerPC Macs.

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

From andrew at icedtea.classpath.org  Sun Nov 15 15:04:55 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sun, 15 Nov 2009 23:04:55 +0000
Subject: /hg/icedtea: 2 new changesets
Message-ID: <hg.c3d838b78987.1258326295.-6899778133799504387@icedtea.classpath.org>

changeset c3d838b78987 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3d838b78987
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Nov 14 00:26:36 2009 +0000

	Set ARCH_DATA_MODEL rather than ZERO_BITSPERWORD

	2009-11-13 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Set ARCH_DATA_MODEL rather than
	ZERO_BITSPERWORD.


changeset 1d2d9efc77e6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d2d9efc77e6
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Nov 15 20:19:16 2009 +0000

	Bump to b76, use SHA256 checksums for OpenJDK and JAXP, always set
	Zero defines.

	2009-11-13 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-xjc.patch: Move to upstream jaxws
	repository.
		* patches/icedtea-xml-encodinginfo.patch: Dropped, in upstream
	jaxp M5 bundle.
		* Makefile.am: Bump to b76, switch to SHA256 checksums,
	only include jaxws in sourcepaths if
	javax.annotation.Resource is missing from the boot JDK.
	Drop $(JAVAWS)/javax/xml/bind from the list of OpenJDK
	bootstrap directories. Move build definitions up to occur
	before sourcepath definitions. (stamps/download-
	jaxp-drop.stamp): Use SHA256 checksum. (stamps/download-
	openjdk.stamp): Likewise for all OpenJDK bundles.
	(stamps/extract.stamp): Also depend on extract-jaxws.stamp.
	(clean-extract): Depend on clean-extract-jaxws as well.
	(stamps/extract-jaxws.stamp): Call the JAXWS ant build to
	extract the JAXWS sources ahead-of-time if javax.annotation.Resource
	is not in the bootstrap JDK. (clean-extract-jaxws): Revert
	above target. (stamps/liveconnect.stamp): Include the system
	JDK on the classpath. (stamps/netx.stamp): Likewise.
	(stamps/rt-class-files.stamp): Likewise.
		* acinclude.m4: (ENABLE_ZERO_BUILD): Always set ZERO flags so
	that ARCH_DATA_MODEL is not set empty.
	(IT_SCANNER_CHECK): Removed, generalised.
	(IT_CHECK_FOR_CLASS): Generic macro to check for any class.
	Takes as arguments the define and the name of the class.
		* configure.ac: Find sha256sum tool. Check for
	java.util.Scanner and javax.annotation.Resource classes
	using the new IT_CHECK_FOR_CLASS macro.


diffstat:

6 files changed, 243 insertions(+), 206 deletions(-)
ChangeLog                              |   44 +++++++
Makefile.am                            |  198 ++++++++++++++++++--------------
acinclude.m4                           |  168 +++++++++++++--------------
configure.ac                           |    4 
patches/icedtea-xjc.patch              |   17 --
patches/icedtea-xml-encodinginfo.patch |   18 --

diffs (truncated from 719 to 500 lines):

diff -r 0e4ad6f4ee6f -r 1d2d9efc77e6 ChangeLog
--- a/ChangeLog	Thu Nov 12 22:02:23 2009 +0000
+++ b/ChangeLog	Sun Nov 15 20:19:16 2009 +0000
@@ -1,3 +1,47 @@ 2009-11-12  Andrew John Hughes  <ahughes
+2009-11-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-xjc.patch:
+	Move to upstream jaxws repository.
+	* patches/icedtea-xml-encodinginfo.patch:
+	Dropped, in upstream jaxp M5 bundle.
+	* Makefile.am:
+	Bump to b76, switch to SHA256 checksums,
+	only include jaxws in sourcepaths if
+	javax.annotation.Resource is missing from
+	the boot JDK.  Drop $(JAVAWS)/javax/xml/bind
+	from the list of OpenJDK bootstrap directories.
+	Move build definitions up to occur before sourcepath
+	definitions.
+	(stamps/download-jaxp-drop.stamp): Use SHA256 checksum.
+	(stamps/download-openjdk.stamp): Likewise for all OpenJDK
+	bundles.
+	(stamps/extract.stamp): Also depend on extract-jaxws.stamp.
+	(clean-extract): Depend on clean-extract-jaxws as well.
+	(stamps/extract-jaxws.stamp): Call the JAXWS ant build to
+	extract the JAXWS sources ahead-of-time if javax.annotation.Resource
+	is not in the bootstrap JDK.
+	(clean-extract-jaxws): Revert above target.
+	(stamps/liveconnect.stamp): Include the system JDK on the classpath.
+	(stamps/netx.stamp): Likewise.
+	(stamps/rt-class-files.stamp): Likewise.
+	* acinclude.m4:
+	(ENABLE_ZERO_BUILD): Always set ZERO flags so that ARCH_DATA_MODEL
+	is not set empty.
+	(IT_SCANNER_CHECK): Removed, generalised.
+	(IT_CHECK_FOR_CLASS): Generic macro to check for
+	any class.  Takes as arguments the define and
+	the name of the class.
+	* configure.ac:
+	Find sha256sum tool.  Check for java.util.Scanner
+	and javax.annotation.Resource classes using the
+	new IT_CHECK_FOR_CLASS macro.
+	
+2009-11-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Set ARCH_DATA_MODEL rather than
+	ZERO_BITSPERWORD.
+	
 2009-11-12  Andrew John Hughes  <ahughes at redhat.com>
 
 	* test/jtreg/com/sun/javatest/agent/Agent.java,
diff -r 0e4ad6f4ee6f -r 1d2d9efc77e6 Makefile.am
--- a/Makefile.am	Thu Nov 12 22:02:23 2009 +0000
+++ b/Makefile.am	Sun Nov 15 20:19:16 2009 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
-OPENJDK_VERSION = b75
-
-CORBA_CHANGESET = a12dac8f71dc
-HOTSPOT_CHANGESET = e004313753cc
-JAXP_CHANGESET  = 45da06168568
-JAXWS_CHANGESET = 14446af481e9
-JDK_CHANGESET = d03acee39d3b
+OPENJDK_VERSION = b76
+
+CORBA_CHANGESET = d728db3889da
+HOTSPOT_CHANGESET = b4ab978ce52c
+JAXP_CHANGESET  = fb68fd18eb9f
+JAXWS_CHANGESET = 0dc08d528c99
+JDK_CHANGESET = fb2ee5e96b17
 LANGTOOLS_CHANGESET = 83367f01297b
-OPENJDK_CHANGESET = a8bc38cb80ef
-
-CORBA_MD5SUM = 455cfaad689717ab542685dd9ed2d876
-HOTSPOT_MD5SUM = 6c711e43b7f6db9d2299f71b8987d446
-JAXP_MD5SUM = bd6ae928afdecf5356c8ecd56a1c39ed
-JAXWS_MD5SUM = 3e2d558e91adcc8630953b1b3a37e269
-JDK_MD5SUM = b811728173a6e554f43a39e84c7f555a
-LANGTOOLS_MD5SUM = 1102b019cd3a734f77bb804228d1727d
-OPENJDK_MD5SUM = 6121a71424fd81df8a34a8b9666fabfd
+OPENJDK_CHANGESET = f0bfd9bd1a0e
+
+CORBA_SHA256SUM = 67824d9e0e21a1b5b55ee6ebc079260672d7d2ed7b9cfabf0cfe67ffd3160f34
+HOTSPOT_SHA256SUM = 1b035a9bf71072b9f60c144c143d501b107a83a009ed31c90c8d0b6d3482a940
+JAXP_SHA256SUM = 7f2f16538bb51081e8483b252f59a2e6e70ba3c33341ed85eaa1532e9fc93dcd
+JAXWS_SHA256SUM = 2005bf1e10bfd49002368088e34f26e86652f175ad827824ccfd9cbc0b840512
+JDK_SHA256SUM = dc409e64ef6e7b310d9e7292b15200529b8e6960404a8751c0ec38bb781a0319
+LANGTOOLS_SHA256SUM = 01c43af5d3da14ff9a96e769d212b2297c2c6756b28cc6a6d6f00148c2eded26
+OPENJDK_SHA256SUM = 6a28cd0ba1bcc4290175497e6cfe11295a8e4f82f4c030b3e5686f7c48297936
 
 CACAO_VERSION = 0.99.4
 CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -31,13 +31,14 @@ VISUALVM_SRC_ZIP = visualvm-111-src.tar.
 VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
 VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
 
-DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
+JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
 JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
 JAXWS_DROP_MD5SUM = f5010ebf636db9f465a61a7a74944543
 JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
 JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472
-JAXP_DROP_ZIP = jdk7-jaxp-2009_09_28.zip
-JAXP_DROP_MD5SUM = 8800970d03bab1fff188dcfafc346f5d
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/144160
+JAXP_DROP_ZIP = jdk7-jaxp-m5.zip
+JAXP_DROP_SHA256SUM = ebab4c6c4e641a4c95a7b6669e78f9bb1149a11054fc5b423cf292b633d6be53
 
 OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot
 
@@ -57,20 +58,44 @@ LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langto
 LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
 HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot
 
+# Build directories
+
+OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
+BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR)
+ICEDTEA_BUILD_DIR = \
+	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
+ICEDTEA_RT = \
+	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+ICEDTEA_BOOT_DIR= \
+	$(abs_top_builddir)/bootstrap/jdk1.6.0
+ICEDTEA_ENDORSED_DIR = \
+	$(ICEDTEA_BOOT_DIR)/lib/endorsed
+ICEDTEA_BUILD_DIR_BOOT = \
+	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/
+ICEDTEA_CLS_DIR_BOOT = \
+	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes
+SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
+BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+
+# Source directories
+
 JDK_SHARE = openjdk/jdk/src/share/classes
 JDK_SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
-JAXP = openjdk/jaxp/src/share/classes
 CORBA = openjdk/corba/src/share/classes
-JAXWS = openjdk/jaxws/src/share/classes
+if LACKS_JAVAX_ANNOTATION_RESOURCE
+JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/jaxws_src/src
+endif
 
 NETX_SRCDIR = $(abs_top_srcdir)/netx
 NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS):$(NETX_SRCDIR)
-
-SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+        $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
+
+SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS):$(NETX_SRCDIR)
 
 # Sources used from OpenJDK.
 ICEDTEA_BOOTSTRAP_DIRS = \
@@ -90,33 +115,15 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(JDK_SHARE)/sun/awt/ \
 	$(JDK_SHARE)/sun/rmi/rmic \
 	$(JDK_SHARE)/sun/tools/java \
-	$(JAXWS)/javax/xml/bind \
 	$(LANGTOOLS)/com/sun/mirror \
 	$(LANGTOOLS)/com/sun/tools/apt
+
+# Settings for javac
 
 IT_LANGUAGE_SOURCE_VERSION=5
 IT_CLASS_TARGET_VERSION=5
 IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS)
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-
-OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR)
-BOOT_BUILD_OUTPUT_DIR = openjdk-boot/build/$(OS_DIR)
-ICEDTEA_BUILD_DIR = \
-	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
-ICEDTEA_RT = \
-	$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-ICEDTEA_BOOT_DIR= \
-	$(abs_top_builddir)/bootstrap/jdk1.6.0
-ICEDTEA_ENDORSED_DIR = \
-	$(ICEDTEA_BOOT_DIR)/lib/endorsed
-ICEDTEA_BUILD_DIR_BOOT = \
-	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/
-ICEDTEA_CLS_DIR_BOOT = \
-	$(abs_top_builddir)/$(BOOT_BUILD_OUTPUT_DIR)/classes
-SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
-BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 
 # Conditional defintions
 
@@ -300,7 +307,6 @@ ICEDTEA_PATCHES = \
 	patches/cacao/arch.patch \
 	patches/icedtea-signed-types.patch \
 	patches/icedtea-lc_ctype.patch \
-	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
 	patches/icedtea-tests-jdk.patch \
 	patches/icedtea-stroker-finish.patch \
@@ -320,7 +326,6 @@ ICEDTEA_PATCHES = \
 	patches/hotspot/$(HSBUILD)/icedtea-includedb.patch \
 	patches/icedtea-demo-swingapplet.patch \
 	patches/icedtea-jvmtiEnv.patch \
-	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-cc-interp-backedge.patch \
 	patches/icedtea-netx.patch \
 	patches/icedtea-disable-intree-ec.patch \
@@ -461,7 +466,7 @@ ICEDTEA_ENV = \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
 	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-	ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
+	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
 	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
 	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
 	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -795,16 +800,16 @@ if USE_ALT_JAXP_DROP_ZIP
 if USE_ALT_JAXP_DROP_ZIP
 	ln -sf $(ALT_JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP)
 endif
-	if ! echo "$(JAXP_DROP_MD5SUM)  drops/$(JAXP_DROP_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JAXP_DROP_SHA256SUM)  drops/$(JAXP_DROP_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ -f drops/$(JAXP_DROP_ZIP) ] ; \
 	  then \
 	    mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
 	  fi ; \
-	  $(WGET) $(DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
-	  if ! echo "$(JAXP_DROP_MD5SUM)  drops/$(JAXP_DROP_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  $(WGET) $(JAXP_DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
+	  if ! echo "$(JAXP_DROP_SHA256SUM)  drops/$(JAXP_DROP_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of jaxp drop zip"; false; \
 	  fi; \
 	fi ;
@@ -827,7 +832,7 @@ endif
 	  then \
 	    mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
 	  fi ; \
-	  $(WGET) $(DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+	  $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
 	  if ! echo "$(JAF_DROP_MD5SUM)  drops/$(JAF_DROP_ZIP)" \
 	    | $(MD5SUM) --check ; \
 	  then echo "ERROR: Bad download of jaf drop zip"; false; \
@@ -852,7 +857,7 @@ endif
 	  then \
 	    mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
 	  fi ; \
-	  $(WGET) $(DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
+	  $(WGET) $(JAXWS_DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
 	  if ! echo "$(JAXWS_DROP_MD5SUM)  drops/$(JAXWS_DROP_ZIP)" \
 	    | $(MD5SUM) --check ; \
 	  then echo "ERROR: Bad download of jaxws drop zip"; false; \
@@ -906,94 +911,94 @@ else
 	$(HG) fclone $(ICEDTEA_HG_URL) openjdk;
 endif
 else
-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(OPENJDK_SRC_ZIP) ] ; \
 	  then \
 	    mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \
-	  if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of OpenJDK root zip"; false; \
 	  fi; \
 	fi ; \
-	if ! echo "$(CORBA_MD5SUM)  $(CORBA_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(CORBA_SRC_ZIP) ] ; \
 	  then \
 	    mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \
-	  if ! echo "$(CORBA_MD5SUM)  $(CORBA_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of CORBA zip"; false; \
 	  fi; \
 	fi ; \
-	if ! echo "$(JAXP_MD5SUM)  $(JAXP_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(JAXP_SRC_ZIP) ] ; \
 	  then \
 	    mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \
-	  if ! echo "$(JAXP_MD5SUM)  $(JAXP_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JAXP zip"; false; \
 	  fi; \
 	fi ; \
-	if ! echo "$(JAXWS_MD5SUM)  $(JAXWS_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(JAXWS_SRC_ZIP) ] ; \
 	  then \
 	    mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \
-	  if ! echo "$(JAXWS_MD5SUM)  $(JAXWS_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JAXWS zip"; false; \
 	  fi; \
 	fi ; \
-	if ! echo "$(JDK_MD5SUM)  $(JDK_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(JDK_SRC_ZIP) ] ; \
 	  then \
 	    mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \
-	  if ! echo "$(JDK_MD5SUM)  $(JDK_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JDK zip"; false; \
 	  fi; \
 	fi ; \
-	if ! echo "$(LANGTOOLS_MD5SUM)  $(LANGTOOLS_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(LANGTOOLS_SRC_ZIP) ] ; \
 	  then \
 	    mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \
-	  if ! echo "$(LANGTOOLS_MD5SUM)  $(LANGTOOLS_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of langtools zip"; false; \
 	  fi; \
 	fi ;
-	if ! echo "$(HS_MD5SUM)  $(HOTSPOT_SRC_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ $(HOTSPOT_SRC_ZIP) ] ; \
 	  then \
 	    mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
-	  if ! echo "$(HOTSPOT_MD5SUM)  $(HOTSPOT_SRC_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(HOTSPOT_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of HotSpot zip"; false; \
 	  fi; \
 	fi
@@ -1122,12 +1127,13 @@ endif
 	rm -f stamps/download-visualvm.stamp
 
 stamps/extract.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-visualvm.stamp stamps/extract-cacao.stamp
+ stamps/extract-visualvm.stamp stamps/extract-cacao.stamp \
+ stamps/extract-jaxws.stamp
 	mkdir -p stamps
 	touch $@
 
 clean-extract: clean-extract-openjdk clean-extract-visualvm \
- clean-extract-cacao
+ clean-extract-cacao clean-extract-jaxws
 	rm -f stamps/extract.stamp
 
 stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
@@ -1281,6 +1287,25 @@ endif
 
 clean-extract-cacao: clean-cacao
 	rm -f stamps/extract-cacao.stamp
+
+stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp
+if LACKS_JAVAX_ANNOTATION_RESOURCE
+	(cd openjdk/jaxws ; \
+	 $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \
+	  -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \
+	  source ; \
+	 cd ../..)
+endif
+	mkdir -p stamps
+	touch $@
+
+clean-extract-jaxws:
+	if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then
+	  (cd openjdk/jaxws ; \
+	   $(ANT) -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws clobber ; \
+	   cd ../../); \
+        fi
+	rm -f stamps/extract-jaxws.stamp
 
 # Link ports sources into tree
 stamps/ports.stamp: stamps/extract.stamp
@@ -1990,7 +2015,7 @@ stamps/liveconnect.stamp: liveconnect-so
 	  mkdir -p $(abs_top_builddir)/liveconnect ; \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
 	      -d $(abs_top_builddir)/liveconnect \
-	      -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build \
+	      -classpath $(abs_top_builddir)/lib/rt:$(abs_top_builddir)/netx.build:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
 	      -sourcepath $(SOURCEPATH_DIRS) \
 	      -bootclasspath \'\' \
 	      @liveconnect-source-files.txt ; \
@@ -2030,7 +2055,7 @@ stamps/netx.stamp: netx-source-files.txt
 	mkdir -p $(abs_top_builddir)/netx.build
 	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
 	    -d $(abs_top_builddir)/netx.build \
-	    -classpath $(abs_top_builddir)/lib/rt \
+	    -classpath $(abs_top_builddir)/lib/rt:$(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
 	    -sourcepath $(SOURCEPATH_DIRS) \
 	    -bootclasspath \'\' \
 	    @netx-source-files.txt ;
@@ -2473,6 +2498,7 @@ stamps/rt-class-files.stamp: $(INITIAL_B
 stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
 	mkdir -p lib/rt
 	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d lib/rt \
+	  -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
           -sourcepath '$(SOURCEPATH_DIRS)' \
           -bootclasspath \'\' @rt-source-files.txt ;
 	mkdir -p stamps
diff -r 0e4ad6f4ee6f -r 1d2d9efc77e6 acinclude.m4
--- a/acinclude.m4	Thu Nov 12 22:02:23 2009 +0000
+++ b/acinclude.m4	Sun Nov 15 20:19:16 2009 +0000
@@ -728,55 +728,48 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
   fi
   AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
 
-  ZERO_LIBARCH=
-  ZERO_BITSPERWORD=
-  ZERO_ENDIANNESS=
-  ZERO_ARCHDEF=
-  ZERO_ARCHFLAG=
-  if test "x${use_zero}" = xyes; then
-    ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
-    dnl can't use AC_CHECK_SIZEOF on multilib
-    case "${ZERO_LIBARCH}" in
-      i386|ppc|s390|sparc)
-        ZERO_BITSPERWORD=32
-        ;;
-      amd64|ppc64|s390x|sparc64)
-        ZERO_BITSPERWORD=64
-        ;;
-      *)
-        AC_CHECK_SIZEOF(void *)
-        ZERO_BITSPERWORD=`expr "${ac_cv_sizeof_void_p}" "*" 8`
-    esac
-    AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"])
-    case "${ZERO_LIBARCH}" in
-      i386)
-        ZERO_ARCHDEF="IA32"
-        ;;
-      ppc*)
-        ZERO_ARCHDEF="PPC"
-        ;;
-      s390*)
-        ZERO_ARCHDEF="S390"
-        ;;
-      sparc*)
-        ZERO_ARCHDEF="SPARC"
-        ;;
-      *)
-        ZERO_ARCHDEF=`echo ${ZERO_LIBARCH} | tr a-z A-Z`
-    esac
-    dnl multilib machines need telling which mode to build for
-    case "${ZERO_LIBARCH}" in
-      i386|ppc|sparc)
-        ZERO_ARCHFLAG="-m32"


From gbenson at redhat.com  Mon Nov 16 01:25:50 2009
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 16 Nov 2009 09:25:50 +0000
Subject: What is the status of Zero on OpenJDK 7
In-Reply-To: <fee4d890911131545h140a4f76iad0aee6de5dc6160@mail.gmail.com>
References: <fee4d890911101524i55944f61t62d5dfa7901bb66c@mail.gmail.com>
	<20091111094651.GA3256@redhat.com>
	<fee4d890911110546h3a4acb89kd5275821c3c76f9b@mail.gmail.com>
	<20091111135501.GC3256@redhat.com>
	<fee4d890911110603y6584f0f6vaa0d1fc1b8169e37@mail.gmail.com>
	<20091111140940.GG3256@redhat.com>
	<fee4d890911111407q7d1b7fb6x93c07bd2a0c1ebe6@mail.gmail.com>
	<fee4d890911112023h181cbbc7m600a52c6562548db@mail.gmail.com>
	<20091112101915.GA3424@redhat.com>
	<fee4d890911131545h140a4f76iad0aee6de5dc6160@mail.gmail.com>
Message-ID: <20091116092549.GA3423@redhat.com>

Michael Franz wrote:
> On Thu, Nov 12, 2009 at 5:19 AM, Gary Benson <gbenson at redhat.com> wrote:
> > You need to patch LLVM to run Shark with LLVM 2.6 on PowerPC:
> > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399
> 
> I applied this patch and the build progresses farther.  I guess llvm
> is just not stable at this point.  I get the following crash during
> the build.
> 
> #
> # A fatal error has been detected by the Java Runtime Environment:
> #
> #  Internal Error (debugInfo.cpp:85), pid=22190, tid=1209107600
> #  Error: ShouldNotReachHere()
> #
> # JRE version: 7.0-b75
> # Java VM: OpenJDK Shark VM (17.0-b04 mixed mode linux-ppc )
> # Distribution: Built on Fedora release 11 (Leonidas)
> # An error report file with more information is saved as:
> # /home/mfranz/icedtea/icedtea/openjdk/langtools/make/hs_err_pid22190.log
> #
> # If you would like to submit a bug report, please include
> # instructions how to reproduce the bug and visit:
> #   http://icedtea.classpath.org/bugzilla
> #

This is http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348.
It's on my list :)

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 16 01:22:39 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 16 Nov 2009 09:22:39 +0000
Subject: [Bug 403] Shark ShouldNotReachHere() during Java2Demo
	demos.Mix.JavaMedia
Message-ID: <E1N9xnD-0003BZ-AH@icedtea.classpath.org>

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


gbenson at redhat.com changed:

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




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


From ekrichardson at gmail.com  Mon Nov 16 08:58:02 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Mon, 16 Nov 2009 08:58:02 -0800
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
Message-ID: <860cb0120911160858t204560a4nfb5454dd406b17cd@mail.gmail.com>

Michael,

On Sat, Nov 14, 2009 at 9:34 PM, Michael Franz <mvfranz at gmail.com> wrote:

> Eric,
>
> I have encountered this issue before.  I am not sure what I did to fix it.
> I think I used ecj instead of the Apple javac.  Check the javac perl script
> that IcedTea has.  The other option is to apply this patch in the required
> build files.
>
>
> http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html<http://cr.openjdk.java.net/%7Eandrew/ecj/01/webrev.01/make/build.xml.udiff.html>
>
> Here is my initial post on this
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
>
> If I remember correctly, there is a tool that is compiled by ant (the two
> in the output), but it is not compiled with Java 5 byte code.  When ant
> tries to run the tool you get that error.
>
> I would switch to using ecj, as you might be able to get past this issue,
> there is another issue that will come up and ecj acts differently than javac
> and you really need the ecj way of doing things.  This is my original email
> on this:
>
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
>

I am using ecj and I checked the build.xml and it does include the
properties ${boot.javac.source} and ${boot.javac.target} and I tried
changing the build.properties as I think they were set at Java 6 compliance.
I will recheck this and try your suggestions.

The thing I was confused about is that the ant-diagnostics.log showed the
system Java being used. But, I guess the rearranged JDK we use is more for
the bootstrapping process.

Eric


> Michael
>
>
> On Sat, Nov 14, 2009 at 11:48 PM, Eric Richardson <ekrichardson at gmail.com>wrote:
>
>>
>> -def-pcompile:
>>     [mkdir] Created dir:
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>>     [javac] Compiling 2 source files to
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>>
>> BUILD FAILED
>> /Users/eric/openjdk/icedtea/openjdk-boot/langtools/make/build.xml:603:
>> java.lang.UnsupportedClassVersionError: Bad version number in .class file
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091116/a6a6c1d0/attachment.html 

From ekrichardson at gmail.com  Mon Nov 16 09:16:33 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Mon, 16 Nov 2009 09:16:33 -0800
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
Message-ID: <860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>

Andrew,

On Sun, Nov 15, 2009 at 7:00 AM, Andrew John Hughes <
gnu_andrew at member.fsf.org> wrote:

> 2009/11/15 Michael Franz <mvfranz at gmail.com>:
> > Eric,
> >
> > I have encountered this issue before.  I am not sure what I did to fix
> it.
> > I think I used ecj instead of the Apple javac.  Check the javac perl
> script
> > that IcedTea has.  The other option is to apply this patch in the
> required
> > build files.
> >
> >
> http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html<http://cr.openjdk.java.net/%7Eandrew/ecj/01/webrev.01/make/build.xml.udiff.html>
> >
>
> That patch is in OpenJDK:
> http://hg.openjdk.java.net/jdk7/jdk7/langtools/rev/2aa3a1cdb094
>
> > Here is my initial post on this
> >
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
> >
> > If I remember correctly, there is a tool that is compiled by ant (the two
> in
> > the output), but it is not compiled with Java 5 byte code.  When ant
> tries
> > to run the tool you get that error.
> >
> > I would switch to using ecj, as you might be able to get past this issue,
> > there is another issue that will come up and ecj acts differently than
> javac
> > and you really need the ecj way of doing things.  This is my original
> email
> > on this:
> >
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
> >
>
> ecj is currently the only supported method for doing a build without
> --disable-bootstrap, but that may change in the future.
> Note that a normal OpenJDK build requires a Sun-based implementation
> of Java 6, due to dependence on com.sun classes and AWT classes that
> are part of the 1.6 specification.  We do our best to get round this
> for IcedTea bootstrapping, but that testing is based on ecj+gcj not
> Apple's products.
>

We appreciate this and believe the Icedtea infrastructure really is the best
method to bring Free Java to other platforms albeit in this case a not
purely free one. I guess with the Apple PPC we have no choice but to use
JDK5 which is a Sun based implementation. With the bsd port changes upstream
we wouldn't even have patching problems.

BTW, what is the safest make option that will not remove the patches I have
applied. I hand patched the portions of the patches that didn't work and
removed them from the make file after they succeeded. I didn't have much
luck with the make clean-patch option so I opted for this approach
eventhough this may not be the best approach.

It seems that so far I have been able to just fix problems and then run make
again without any problems but I'm not too advanced in my understanding of
the process and my approach so far is not very repeatable.

Eric

--
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091116/9eae068c/attachment.html 

From gbenson at redhat.com  Mon Nov 16 09:31:13 2009
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 16 Nov 2009 17:31:13 +0000
Subject: IcedTea7 Zero/Shark build patch
Message-ID: <20091116173113.GA31912@redhat.com>

Hi all,

Zero (and Shark) require different build variables to be set for the
upstream Zero than the ones we've currently been using.  This patch
should fix the way these are set.  I haven't tested this with Cacao,
or with the build-multiple-vms-at-once that doko contributed.  Is this
ok to commit?

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 1d2d9efc77e6 Makefile.am
--- a/Makefile.am	Sun Nov 15 20:19:16 2009 +0000
+++ b/Makefile.am	Mon Nov 16 17:27:47 2009 +0000
@@ -427,21 +427,6 @@
 endif
 
 # OpenJDK build environment.
-if CORE_BUILD
-  ICEDTEA_CORE_BUILD = true
-else
-  ICEDTEA_CORE_BUILD =
-endif
-if ZERO_BUILD
-  ICEDTEA_ZERO_BUILD = true
-else
-  ICEDTEA_ZERO_BUILD =
-endif
-if SHARK_BUILD
-  ICEDTEA_SHARK_BUILD = yes
-else
-  ICEDTEA_SHARK_BUILD =
-endif
 
 JDK_UPDATE_VERSION = 0
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
@@ -462,19 +447,6 @@
 	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
-	CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
-	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
-	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
-	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
-	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
-	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
-	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
-	LIBFFI_LIBS="$(LIBFFI_LIBS)" \
-	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
-	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
-	LLVM_LIBS="$(LLVM_LIBS)" \
 	FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \
 	FT2_LIB="$(FREETYPE2_LIBS)" \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
@@ -494,6 +466,25 @@
 	DISABLE_INTREE_EC="true" \
 	ALT_DROPS_DIR="$(abs_top_builddir)/drops"
 
+if ZERO_BUILD
+ICEDTEA_ENV += \
+	ZERO_BUILD="true"\
+	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
+	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
+	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
+	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
+	ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
+	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" \
+	LIBFFI_LIBS="$(LIBFFI_LIBS)"
+if SHARK_BUILD
+ICEDTEA_ENV += \
+	ICEDTEA_SHARK_BUILD="true" \
+	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
+	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
+	LLVM_LIBS="$(LLVM_LIBS)"
+endif
+endif
+
 if WITH_CACAO
 ICEDTEA_ENV += \
 	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
@@ -1300,7 +1291,7 @@
 	touch $@
 
 clean-extract-jaxws:
-	if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then
+	if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then \
 	  (cd openjdk/jaxws ; \
 	   $(ANT) -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws clobber ; \
 	   cd ../../); \
@@ -1315,13 +1306,12 @@
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
 	  ln -sfv $$target $$link; \
 	done
-	if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
-	  = "xno" ; then \
+	if ! test "x$(WITH_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 ; \
 	fi
-	if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(WITH_CACAO)" = "xno"; then \
 	  ln -sf $(abs_top_builddir)/ergo.c \
 	    openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
@@ -1743,10 +1733,11 @@
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 endif
 if ZERO_BUILD
+if SHARK_BUILD
+	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
-if SHARK_BUILD
-	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@@ -1818,10 +1809,11 @@
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 endif
 if ZERO_BUILD
+if SHARK_BUILD
+	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
-if SHARK_BUILD
-	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
diff -r 1d2d9efc77e6 acinclude.m4
--- a/acinclude.m4	Sun Nov 15 20:19:16 2009 +0000
+++ b/acinclude.m4	Mon Nov 16 17:27:47 2009 +0000
@@ -718,16 +718,6 @@
   AC_MSG_RESULT($use_zero)
   AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
 
-  use_core=no
-  if test "x${WITH_CACAO}" != "xno"; then
-    use_core=yes;
-  elif test "x${use_zero}" = "xyes"; then
-    if test "x${use_shark}" = "xno"; then
-      use_core=yes;
-    fi
-  fi
-  AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
-
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in

From doko at ubuntu.com  Mon Nov 16 09:40:44 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Mon, 16 Nov 2009 11:40:44 -0600
Subject: IcedTea7 Zero/Shark build patch
In-Reply-To: <20091116173113.GA31912@redhat.com>
References: <20091116173113.GA31912@redhat.com>
Message-ID: <4B018E9C.1020801@ubuntu.com>

On 16.11.2009 11:31, Gary Benson wrote:
> Hi all,
>
> Zero (and Shark) require different build variables to be set for the
> upstream Zero than the ones we've currently been using.  This patch
> should fix the way these are set.  I haven't tested this with Cacao,
> or with the build-multiple-vms-at-once that doko contributed.  Is this
> ok to commit?

not able to test this now; will check with a future build.

   Matthias


From gnu_andrew at member.fsf.org  Mon Nov 16 09:46:40 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Nov 2009 17:46:40 +0000
Subject: IcedTea7 Zero/Shark build patch
In-Reply-To: <4B018E9C.1020801@ubuntu.com>
References: <20091116173113.GA31912@redhat.com> <4B018E9C.1020801@ubuntu.com>
Message-ID: <17c6771e0911160946v49fb6a29q86ff6cd0a7060579@mail.gmail.com>

2009/11/16 Matthias Klose <doko at ubuntu.com>:
> On 16.11.2009 11:31, Gary Benson wrote:
>>
>> Hi all,
>>
>> Zero (and Shark) require different build variables to be set for the
>> upstream Zero than the ones we've currently been using. ?This patch
>> should fix the way these are set. ?I haven't tested this with Cacao,
>> or with the build-multiple-vms-at-once that doko contributed. ?Is this
>> ok to commit?
>
> not able to test this now; will check with a future build.
>
> ?Matthias
>

This doesn't do what you say it does; it just makes the addition of
the environment variables conditional on zero and/or shark being
turned on.
The actual environment variables are identical.  I don't see a benefit
to that, but I do see a risk in something being broken so I don't want
it applied just before a release.

Similarly, please don't change the multiple-vms build unless you've tested it.

That missing backslash does need to go in though... :)
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gbenson at redhat.com  Mon Nov 16 10:07:40 2009
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 16 Nov 2009 18:07:40 +0000
Subject: IcedTea7 Zero/Shark build patch
In-Reply-To: <17c6771e0911160946v49fb6a29q86ff6cd0a7060579@mail.gmail.com>
References: <20091116173113.GA31912@redhat.com> <4B018E9C.1020801@ubuntu.com>
	<17c6771e0911160946v49fb6a29q86ff6cd0a7060579@mail.gmail.com>
Message-ID: <20091116180739.GB31912@redhat.com>

Andrew John Hughes wrote:
> 2009/11/16 Matthias Klose <doko at ubuntu.com>:
> > On 16.11.2009 11:31, Gary Benson wrote:
> > > Zero (and Shark) require different build variables to be set for
> > > the upstream Zero than the ones we've currently been using.
> > > This patch should fix the way these are set. ?I haven't tested
> > > this with Cacao, or with the build-multiple-vms-at-once that
> > > doko contributed. ?Is this ok to commit?
> >
> > not able to test this now; will check with a future build.
> 
> This doesn't do what you say it does; it just makes the addition of
> the environment variables conditional on zero and/or shark being
> turned on.  The actual environment variables are identical.  I don't
> see a benefit to that, but I do see a risk in something being broken
> so I don't want it applied just before a release.

Hmmm, you're right, I didn't see your ARCH_DATA_MODEL patch.  I made
the variables only be set for Zero builds because ARCH_DATA_MODEL has
meaning for non-Zero builds, so setting ARCH_DATA_MODEL always could
cause non-Zero builds to suddenly break.

Cheers,
Gary

-- 
http://gbenson.net/


From gnu_andrew at member.fsf.org  Mon Nov 16 10:25:45 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Nov 2009 18:25:45 +0000
Subject: IcedTea7 Zero/Shark build patch
In-Reply-To: <20091116180739.GB31912@redhat.com>
References: <20091116173113.GA31912@redhat.com> <4B018E9C.1020801@ubuntu.com>
	<17c6771e0911160946v49fb6a29q86ff6cd0a7060579@mail.gmail.com>
	<20091116180739.GB31912@redhat.com>
Message-ID: <17c6771e0911161025y18b70035s7b13ac9bf6842f63@mail.gmail.com>

2009/11/16 Gary Benson <gbenson at redhat.com>:
> Andrew John Hughes wrote:
>> 2009/11/16 Matthias Klose <doko at ubuntu.com>:
>> > On 16.11.2009 11:31, Gary Benson wrote:
>> > > Zero (and Shark) require different build variables to be set for
>> > > the upstream Zero than the ones we've currently been using.
>> > > This patch should fix the way these are set. ?I haven't tested
>> > > this with Cacao, or with the build-multiple-vms-at-once that
>> > > doko contributed. ?Is this ok to commit?
>> >
>> > not able to test this now; will check with a future build.
>>
>> This doesn't do what you say it does; it just makes the addition of
>> the environment variables conditional on zero and/or shark being
>> turned on. ?The actual environment variables are identical. ?I don't
>> see a benefit to that, but I do see a risk in something being broken
>> so I don't want it applied just before a release.
>
> Hmmm, you're right, I didn't see your ARCH_DATA_MODEL patch. ?I made
> the variables only be set for Zero builds because ARCH_DATA_MODEL has
> meaning for non-Zero builds, so setting ARCH_DATA_MODEL always could
> cause non-Zero builds to suddenly break.
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

Yes, I fixed that:

        * acinclude.m4:
        (ENABLE_ZERO_BUILD): Always set ZERO flags so that ARCH_DATA_MODEL
        is not set empty.

So the Zero flags are always set and just ZERO_BUILD determines
whether they are used or not.
I did think of doing the same thing as your patch after I'd done that,
but I think it makes things easier if all the variables used are
always set.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From andrew at icedtea.classpath.org  Mon Nov 16 13:33:29 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 16 Nov 2009 21:33:29 +0000
Subject: /hg/icedtea: Add missing backslash.
Message-ID: <hg.14aa53fc72ba.1258407209.-6899778133799504387@icedtea.classpath.org>

changeset 14aa53fc72ba in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=14aa53fc72ba
author: Gary Benson <gbenson at redhat.com>
date: Mon Nov 16 21:34:54 2009 +0000

	Add missing backslash.

	2009-11-16 Gary Benson <gbenson at redhat.com>

	 * Makefile.am: (clean-extract-jaxws): Add missing
	backslash.


diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-

diffs (24 lines):

diff -r 1d2d9efc77e6 -r 14aa53fc72ba ChangeLog
--- a/ChangeLog	Sun Nov 15 20:19:16 2009 +0000
+++ b/ChangeLog	Mon Nov 16 21:34:54 2009 +0000
@@ -1,3 +1,8 @@ 2009-11-13  Andrew John Hughes  <ahughes
+2009-11-16  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am:
+	(clean-extract-jaxws): Add missing backslash.
+	
 2009-11-13  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-xjc.patch:
diff -r 1d2d9efc77e6 -r 14aa53fc72ba Makefile.am
--- a/Makefile.am	Sun Nov 15 20:19:16 2009 +0000
+++ b/Makefile.am	Mon Nov 16 21:34:54 2009 +0000
@@ -1300,7 +1300,7 @@ endif
 	touch $@
 
 clean-extract-jaxws:
-	if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then
+	if [ -d $(BUILD_OUTPUT_DIR)/jaxws ] ; then \
 	  (cd openjdk/jaxws ; \
 	   $(ANT) -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws clobber ; \
 	   cd ../../); \


From gnu_andrew at member.fsf.org  Mon Nov 16 14:21:29 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 16 Nov 2009 22:21:29 +0000
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
Message-ID: <17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>

2009/11/16 Eric Richardson <ekrichardson at gmail.com>:
> Andrew,
>
> On Sun, Nov 15, 2009 at 7:00 AM, Andrew John Hughes
> <gnu_andrew at member.fsf.org> wrote:
>>
>> 2009/11/15 Michael Franz <mvfranz at gmail.com>:
>> > Eric,
>> >
>> > I have encountered this issue before.? I am not sure what I did to fix
>> > it.
>> > I think I used ecj instead of the Apple javac.? Check the javac perl
>> > script
>> > that IcedTea has.? The other option is to apply this patch in the
>> > required
>> > build files.
>> >
>> >
>> > http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html
>> >
>>
>> That patch is in OpenJDK:
>> http://hg.openjdk.java.net/jdk7/jdk7/langtools/rev/2aa3a1cdb094
>>
>> > Here is my initial post on this
>> >
>> > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
>> >
>> > If I remember correctly, there is a tool that is compiled by ant (the
>> > two in
>> > the output), but it is not compiled with Java 5 byte code.? When ant
>> > tries
>> > to run the tool you get that error.
>> >
>> > I would switch to using ecj, as you might be able to get past this
>> > issue,
>> > there is another issue that will come up and ecj acts differently than
>> > javac
>> > and you really need the ecj way of doing things.? This is my original
>> > email
>> > on this:
>> >
>> > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
>> >
>>
>> ecj is currently the only supported method for doing a build without
>> --disable-bootstrap, but that may change in the future.
>> Note that a normal OpenJDK build requires a Sun-based implementation
>> of Java 6, due to dependence on com.sun classes and AWT classes that
>> are part of the 1.6 specification. ?We do our best to get round this
>> for IcedTea bootstrapping, but that testing is based on ecj+gcj not
>> Apple's products.
>
> We appreciate this and believe the Icedtea infrastructure really is the best
> method to bring Free Java to other platforms albeit in this case a not
> purely free one. I guess with the Apple PPC we have no choice but to use
> JDK5 which is a Sun based implementation. With the bsd port changes upstream
> we wouldn't even have patching problems.
>
> BTW, what is the safest make option that will not remove the patches I have
> applied. I hand patched the portions of the patches that didn't work and
> removed them from the make file after they succeeded. I didn't have much
> luck with the make clean-patch option so I opted for this approach
> eventhough this may not be the best approach.
>
> It seems that so far I have been able to just fix problems and then run make
> again without any problems but I'm not too advanced in my understanding of
> the process and my approach so far is not very repeatable.
>
> Eric
>
>> --
>> Andrew :-)
>>
>> Free Java Software Engineer
>> Red Hat, Inc. (http://www.redhat.com)
>>
>> Support Free Java!
>> Contribute to GNU Classpath and the OpenJDK
>> http://www.gnu.org/software/classpath
>> http://openjdk.java.net
>>
>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>> Fingerprint: F8EF F1EA 401E 2E60 15FA ?7927 142C 2591 94EF D9D8
>
>

If there are patches that won't apply for a good reason, we can
actually knock them out for the BSD port in the IcedTea build.  We
already do:

if !USE_CVMI
ICEDTEA_PATCHES += \
        patches/icedtea-javafiles.patch
endif

so if it's needed, I don't have an objection to a similar USE_BSD block.

I'm currently trying to build the BSD tree on linux-amd64 and am confused by:

http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk

Why were these additions made?  They aren't in either tl or the icedtea forests.

I spotted this because icedtea-copy-plugs.patch won't apply.  I may
just drop the copy-plugs patch altogether unless it's actually being
used; I think it may be dead.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From kurt at intricatesoftware.com  Mon Nov 16 17:14:15 2009
From: kurt at intricatesoftware.com (Kurt Miller)
Date: Mon, 16 Nov 2009 20:14:15 -0500
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
	<17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>
Message-ID: <4B01F8E7.90803@intricatesoftware.com>

Hi Andrew,

Andrew John Hughes wrote:
> I'm currently trying to build the BSD tree on linux-amd64 and am confused by:
> 
> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk
> 
> Why were these additions made?  They aren't in either tl or the icedtea forests.
> 
> I spotted this because icedtea-copy-plugs.patch won't apply.  I may
> just drop the copy-plugs patch altogether unless it's actually being
> used; I think it may be dead.

This was added to support building with binary plugs from when it
was required to have them. It was left in so that people still
building ALT_BINARY_PLUGS_PATH set would work. Enough time has
passed so I'm ok with removing it now if other project members
agree.

Regards,
-Kurt


From gnu_andrew at member.fsf.org  Mon Nov 16 17:40:31 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 17 Nov 2009 01:40:31 +0000
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <4B01F8E7.90803@intricatesoftware.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
	<17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>
	<4B01F8E7.90803@intricatesoftware.com>
Message-ID: <17c6771e0911161740w15ca90c4x53d1489f9830d02@mail.gmail.com>

2009/11/17 Kurt Miller <kurt at intricatesoftware.com>:
> Hi Andrew,
>
> Andrew John Hughes wrote:
>> I'm currently trying to build the BSD tree on linux-amd64 and am confused by:
>>
>> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk
>>
>> Why were these additions made? ?They aren't in either tl or the icedtea forests.
>>
>> I spotted this because icedtea-copy-plugs.patch won't apply. ?I may
>> just drop the copy-plugs patch altogether unless it's actually being
>> used; I think it may be dead.
>
> This was added to support building with binary plugs from when it
> was required to have them. It was left in so that people still
> building ALT_BINARY_PLUGS_PATH set would work. Enough time has
> passed so I'm ok with removing it now if other project members
> agree.
>
> Regards,
> -Kurt
>

Strangely, it's part of
http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/4fef42eb432c
which was added _after_ the binary plug dependency was removed.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From kurt at intricatesoftware.com  Mon Nov 16 19:15:44 2009
From: kurt at intricatesoftware.com (Kurt Miller)
Date: Mon, 16 Nov 2009 22:15:44 -0500
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <17c6771e0911161740w15ca90c4x53d1489f9830d02@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>	
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>	
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>	
	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>	
	<17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>	
	<4B01F8E7.90803@intricatesoftware.com>
	<17c6771e0911161740w15ca90c4x53d1489f9830d02@mail.gmail.com>
Message-ID: <4B021560.2070805@intricatesoftware.com>

Hi Andrew,

Andrew John Hughes wrote:
> 2009/11/17 Kurt Miller <kurt at intricatesoftware.com>:
>> Andrew John Hughes wrote:
>>> I'm currently trying to build the BSD tree on linux-amd64 and am confused by:
>>>
>>> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk
>>>
>>> Why were these additions made?  They aren't in either tl or the icedtea forests.
>>>
>>> I spotted this because icedtea-copy-plugs.patch won't apply.  I may
>>> just drop the copy-plugs patch altogether unless it's actually being
>>> used; I think it may be dead.
>> This was added to support building with binary plugs from when it
>> was required to have them. It was left in so that people still
>> building ALT_BINARY_PLUGS_PATH set would work. Enough time has
>> passed so I'm ok with removing it now if other project members
>> agree.
> 
> Strangely, it's part of
> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/4fef42eb432c
> which was added _after_ the binary plug dependency was removed.

If you look at the full history, you will see it was there from the
beginning. When the binary plugs became optional, Greg removed it.
I wasn't aware the binary plugs were no longer required and added it
back in the update to b59.

Regards,
-Kurt


From ekrichardson at gmail.com  Mon Nov 16 20:04:28 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Mon, 16 Nov 2009 20:04:28 -0800
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <4B021560.2070805@intricatesoftware.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
	<17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>
	<4B01F8E7.90803@intricatesoftware.com>
	<17c6771e0911161740w15ca90c4x53d1489f9830d02@mail.gmail.com>
	<4B021560.2070805@intricatesoftware.com>
Message-ID: <860cb0120911162004s1f95c11cu6d0cc2f3bc56771f@mail.gmail.com>

All,

Just wanted to post the patches and the portions that I hand merged. I
didn't pay much attention to what I needed but I didn't select shark (yet)
or cacao (unless it is default) and also the solaris patch doesn't seem
appropriate. Some of these portions of the patches may have succeeded but I
was on autopilot and may not have tried to rerun the patch after removing
the portion that didn't work.

I can run diffs on any of these if needed - my previous experience a few
months back had me patching and re-patching the same file from different
patches so this version is much more streamlined.

patches/icedtea-version.patch

openjdk/jdk/make/common/shared/Defs.gmk
openjdk/jdk/src/share/classes/sun/misc/Version.java.template  **but named
Version-template.java**
openjdk/jdk/make/java/version/Makefile

patches/icedtea-copy-plugs.patch

openjdk/jdk/make/common/internal/BinaryPlugs.gmk
openjdk/jdk/src/share/classes/java/beans/MetaData.java

patches/icedtea-headers.patch

openjdk/jdk/make/common/Defs.gmk
openjdk/jdk/make/sun/font/Makefile
openjdk/jdk/make/tools/freetypecheck/Makefile

patches/icedtea-gcc-suffix.patch

openjdk/corba/make/common/shared/Compiler-gcc.gmk
openjdk/jdk/make/common/shared/Compiler-gcc.gmk

patches/icedtea-libraries.patch

*** I may have over patched but some of these have to do with ZLIB ***
openjdk/jdk/make/com/sun/java/pack/Makefile
openjdk/jdk/make/common/Program.gmk
openjdk/jdk/make/java/jli/Makefile
openjdk/jdk/make/java/zip/Makefile
openjdk/jdk/make/sun/jpeg/FILES_c.gmk
openjdk/jdk/make/sun/jpeg/Makefile
openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
openjdk/jdk/make/sun/splashscreen/Makefile
openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
openjdk/jdk/src/share/native/java/util/zip/Adler32.c
openjdk/jdk/src/share/native/java/util/zip/CRC32.c
openjdk/jdk/src/share/native/java/util/zip/Deflater.c
openjdk/jdk/src/share/native/java/util/zip/Inflater.c
openjdk/jdk/src/share/native/java/util/zip/zip_util.c
openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c

patches/icedtea-shark-build.patch

openjdk/jdk/make/java/redist/Makefile
openjdk/make/hotspot-rules.gmk
** added both zero and shark code **

patches/hotspot/default/icedtea-shark-build.patch

openjdk/hotspot/make/Makefile

patches/cacao/arch.patch

openjdk/jdk/make/javax/sound/SoundDefs.gmk
openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h

patches/icedtea-lc_ctype.patch

openjdk/jdk/src/solaris/native/java/lang/java_props_md.c

patches/icedtea-linker-libs-order.patch

openjdk/jdk/make/com/sun/java/pack/Makefile --tricky--

************************************
did overlays
start java build

patches/boot/icedtea.patch

openjdk-boot/corba/make/common/Defs.gmk

Eric

On Mon, Nov 16, 2009 at 7:15 PM, Kurt Miller <kurt at intricatesoftware.com>wrote:

> Hi Andrew,
>
> Andrew John Hughes wrote:
> > 2009/11/17 Kurt Miller <kurt at intricatesoftware.com>:
> >> Andrew John Hughes wrote:
> >>> I'm currently trying to build the BSD tree on linux-amd64 and am
> confused by:
> >>>
> >>>
> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk
> >>>
> >>> Why were these additions made?  They aren't in either tl or the icedtea
> forests.
> >>>
> >>> I spotted this because icedtea-copy-plugs.patch won't apply.  I may
> >>> just drop the copy-plugs patch altogether unless it's actually being
> >>> used; I think it may be dead.
> >> This was added to support building with binary plugs from when it
> >> was required to have them. It was left in so that people still
> >> building ALT_BINARY_PLUGS_PATH set would work. Enough time has
> >> passed so I'm ok with removing it now if other project members
> >> agree.
> >
> > Strangely, it's part of
> > http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/4fef42eb432c
> > which was added _after_ the binary plug dependency was removed.
>
> If you look at the full history, you will see it was there from the
> beginning. When the binary plugs became optional, Greg removed it.
> I wasn't aware the binary plugs were no longer required and added it
> back in the update to b59.
>
> Regards,
> -Kurt
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091116/7d46400f/attachment.html 

From andrew at icedtea.classpath.org  Mon Nov 16 20:31:16 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 04:31:16 +0000
Subject: /hg/icedtea: 3 new changesets
Message-ID: <hg.4afd580ad443.1258432276.-6899778133799504387@icedtea.classpath.org>

changeset 4afd580ad443 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4afd580ad443
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 01:28:51 2009 +0000

	Obtain a better default for --with-parallel-jobs using getconf

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (IT_FIND_NUMBER_OF_PROCESSORS): Add
	new macro which finds out the number of available
	processors.
		* configure.ac: Call IT_FIND_NUMBER_OF_PROCESSORS and use
	result to set default for --with-parallel-jobs.


changeset 3f7290ca2f57 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3f7290ca2f57
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 04:34:42 2009 +0000

	Bump to 1.12. Ensure make distcheck passes by adding missing clean
	targets and sources.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add missing CORBA CurrentPackage
	directory to list of distributed sources. (clean-
	local): Ensure all targets are included. (clean-download):
	Also depend on clean-cacao and clean-visualvm.
	(clean-clone-boot): Depend on clean-patch-boot. (clean-
	icedtea): Makefile is in openjdk, not openjdk/make.
	(clean-icedtea-boot): Remove stamp last. (clean-icedtea-
	stage1): New target to revert icedtea-stage1.stamp.
	(clean-plugin): Remove the stamp. (clean-pulse-java): Remove
	the empty pulseaudio directory if building out-of-tree.
	(clean-add-cacao): Revert add-cacao.stamp. (clean-add-cacao-
	debug): Revert add-cacao-debug.stamp. (add-zero.stamp): Make
	-zero print ERROR when Shark is built and vice-versa for
	when Zero is built. (clean-add-zero): Revert add-zero.stamp.
	(clean-add-zero-debug): Revert add-zero-debug.stamp.
		* configure.ac: Bump to 1.12.


changeset 766972166cea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=766972166cea
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 04:35:14 2009 +0000

	Added tag icedtea-1.12 for changeset 3f7290ca2f57


diffstat:

5 files changed, 103 insertions(+), 18 deletions(-)
.hgtags      |    1 
ChangeLog    |   36 +++++++++++++++++++++++++++++++++
Makefile.am  |   62 ++++++++++++++++++++++++++++++++++++++++++++--------------
acinclude.m4 |   14 ++++++++++++-
configure.ac |    8 ++++---

diffs (288 lines):

diff -r 14aa53fc72ba -r 766972166cea .hgtags
--- a/.hgtags	Mon Nov 16 21:34:54 2009 +0000
+++ b/.hgtags	Tue Nov 17 04:35:14 2009 +0000
@@ -21,3 +21,4 @@ 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000 icedtea-1.11
 0000000000000000000000000000000000000000 icedtea-1.11
 df574d432c00e6ad570cc9d92eb4dcd51d31eb7a icedtea-1.11
+3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
diff -r 14aa53fc72ba -r 766972166cea ChangeLog
--- a/ChangeLog	Mon Nov 16 21:34:54 2009 +0000
+++ b/ChangeLog	Tue Nov 17 04:35:14 2009 +0000
@@ -1,3 +1,39 @@ 2009-11-16  Gary Benson  <gbenson at redhat
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add missing CORBA CurrentPackage directory to
+	list of distributed sources.
+	(clean-local): Ensure all targets are included.
+	(clean-download): Also depend on clean-cacao
+	and clean-visualvm.
+	(clean-clone-boot): Depend on clean-patch-boot.
+	(clean-icedtea): Makefile is in openjdk, not
+	openjdk/make.
+	(clean-icedtea-boot): Remove stamp last.
+	(clean-icedtea-stage1): New target to revert
+	icedtea-stage1.stamp.
+	(clean-plugin): Remove the stamp.
+	(clean-pulse-java): Remove the empty pulseaudio
+	directory if building out-of-tree.
+	(clean-add-cacao): Revert add-cacao.stamp.
+	(clean-add-cacao-debug): Revert add-cacao-debug.stamp.
+	(add-zero.stamp): Make -zero print ERROR when Shark
+	is built and vice-versa for when Zero is built.
+	(clean-add-zero): Revert add-zero.stamp.
+	(clean-add-zero-debug): Revert add-zero-debug.stamp.
+	* configure.ac:
+	Bump to 1.12.
+
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_FIND_NUMBER_OF_PROCESSORS): Add
+	new macro which finds out the number of
+	available processors.
+	* configure.ac:
+	Call IT_FIND_NUMBER_OF_PROCESSORS and use
+	result to set default for --with-parallel-jobs.
+
 2009-11-16  Gary Benson  <gbenson at redhat.com>
 
 	* Makefile.am:
diff -r 14aa53fc72ba -r 766972166cea Makefile.am
--- a/Makefile.am	Mon Nov 16 21:34:54 2009 +0000
+++ b/Makefile.am	Tue Nov 17 04:35:14 2009 +0000
@@ -568,6 +568,7 @@ GENERATED_FILES = $(top_srcdir)/generate
 	$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyPackage/*.java \
 	$(top_srcdir)/generated/org/omg/DynamicAny/DynAnyFactoryPackage/*.java \
 	$(top_srcdir)/generated/org/omg/PortableServer/*.java \
+	$(top_srcdir)/generated/org/omg/PortableServer/CurrentPackage/*.java \
 	$(top_srcdir)/generated/org/omg/PortableServer/POAManagerPackage/*.java \
 	$(top_srcdir)/generated/org/omg/PortableServer/POAPackage/*.java \
 	$(top_srcdir)/generated/sun/awt/X11/*.java \
@@ -703,12 +704,13 @@ check-local: jtregcheck
 check-local: jtregcheck
 
 clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
- clean-clone clean-clone-boot clean-plugs clean-extra clean-netx \
- clean-visualvm clean-nbplatform clean-bootstrap-directory-stage1 \
- clean-bootstrap-directory-stage2 clean-bootstrap-directory-symlink-stage1 \
- clean-bootstrap-directory-symlink-stage2 clean-extract clean-generated \
- clean-plugin clean-liveconnect clean-native-ecj clean-hgforest \
- clean-icedtea-stage2 clean-icedtea-debug-stage2
+ clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
+ clean-plugs clean-extra clean-netx clean-visualvm clean-nbplatform \
+ clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
+ clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \
+ clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
+ clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -716,9 +718,6 @@ clean-local: clean-jtreg clean-jtreg-rep
 	  rmdir lib ; \
 	fi
 	rm -f jni-common.o
-if ADD_ZERO_BUILD
-	rm -rf zerovm
-endif
 
 distclean-local: clean-local clean-download
 	if [ -e stamps ] ; then \
@@ -792,7 +791,8 @@ stamps/download.stamp: stamps/download-d
 	mkdir -p stamps
 	touch $@
 
-clean-download: clean-drops clean-download-openjdk
+clean-download: clean-drops clean-download-openjdk clean-download-cacao \
+ clean-download-visualvm
 	rm -f stamps/download.stamp
 
 stamps/download-jaxp-drop.stamp:
@@ -1540,9 +1540,9 @@ stamps/clone-boot.stamp: stamps/overlay.
 	mkdir -p stamps
 	touch $@
 
-clean-clone-boot:
+clean-clone-boot: clean-patch-boot
+	rm -rf openjdk-boot
 	rm -f stamps/clone-boot.stamp
-	rm -rf openjdk-boot
 
 stamps/patch-boot.stamp: stamps/clone-boot.stamp
 	mkdir -p stamps; \
@@ -1854,7 +1854,7 @@ clean-icedtea: stamps/download.stamp
 clean-icedtea: stamps/download.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
-	  -C openjdk/make clobber
+	  -C openjdk clobber
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
 stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
@@ -1908,14 +1908,17 @@ hotspot-helper: stamps/bootstrap-directo
 	  -C openjdk-boot hotspot
 
 clean-icedtea-boot: stamps/clone-boot.stamp
-	rm -f stamps/icedtea-boot.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot clobber
+	rm -f stamps/icedtea-boot.stamp
 
 stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp
 	mkdir -p stamps
 	touch $@
+
+clean-icedtea-stage1:
+	rm -f stamps/icedtea-stage1.stamp
 
 # Plugin
 
@@ -2003,6 +2006,7 @@ stamps/plugin.stamp: $(ICEDTEAPLUGIN_TAR
 	touch $@
 
 clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
+	rm -f stamps/plugin.stamp
 
 liveconnect-source-files.txt:
 	if test "x${LIVECONNECT_DIR}" != x; then \
@@ -2174,6 +2178,9 @@ if ENABLE_PULSE_JAVA
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
 	rm -f pulse-java.jar
 	rm -f libpulse-java.so
+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+	  rmdir $(abs_top_builddir)/pulseaudio ; \
+	fi
 endif
 	rm -f stamps/pulse-java*.stamp
 
@@ -2290,6 +2297,11 @@ endif
 endif
 	touch $@
 
+clean-add-cacao:
+	rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
+	sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+	rm -f stamps/add-cacao.stamp
+
 stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
 if ADD_CACAO_BUILD
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
@@ -2305,6 +2317,11 @@ endif
 endif
 	touch $@
 
+clean-add-cacao-debug:
+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
+	sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+	rm -f stamps/add-cacao-debug.stamp
+
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
@@ -2349,17 +2366,28 @@ if ZERO_BUILD
 	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/shark/
 	printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 else
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
 	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
 else
 	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
 	touch $@
+
+clean-add-zero:
+	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+if ADD_ZERO_BUILD
+	rm -rf zerovm
+endif
+	rm -f stamps/add-zero.stamp
 
 stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
 	mkdir -p stamps
@@ -2389,6 +2417,12 @@ else
 	printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
 	touch $@
+
+clean-add-zero-debug:
+	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
+	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
+	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+	rm -f stamps/add-zero-debug.stamp
 
 # end additional VMs
 
diff -r 14aa53fc72ba -r 766972166cea acinclude.m4
--- a/acinclude.m4	Mon Nov 16 21:34:54 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 04:35:14 2009 +0000
@@ -1558,4 +1558,16 @@ rmdir tmp.$$
 rmdir tmp.$$
 AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
 AC_PROVIDE([$0])dnl
-])
\ No newline at end of file
+])
+
+AC_DEFUN([IT_FIND_NUMBER_OF_PROCESSORS],[
+  FIND_TOOL([GETCONF], [getconf])
+  AC_CACHE_CHECK([the number of online processors], it_cv_proc, [
+    if number=$($GETCONF _NPROCESSORS_ONLN); then
+      it_cv_proc=$number;
+    else
+      it_cv_proc=2;
+    fi
+  ])
+  AC_PROVIDE([$0])dnl
+])
diff -r 14aa53fc72ba -r 766972166cea configure.ac
--- a/configure.ac	Mon Nov 16 21:34:54 2009 +0000
+++ b/configure.ac	Tue Nov 17 04:35:14 2009 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea], [1.11], [distro-pkg-d
-AC_INIT([icedtea], [1.11], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [1.12], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
@@ -47,6 +47,7 @@ AC_CHECK_WITH_HOTSPOT_BUILD
 AC_CHECK_WITH_HOTSPOT_BUILD
 AC_PATH_TOOL([LINUX32],[linux32])
 AC_CHECK_GCC_VERSION
+IT_FIND_NUMBER_OF_PROCESSORS
 
 AC_MSG_CHECKING([for a NetBeans installation])
 AC_ARG_WITH([netbeans-home],
@@ -151,19 +152,20 @@ AC_MSG_RESULT(${ENABLE_NSS})
 AC_MSG_RESULT(${ENABLE_NSS})
 
 AC_MSG_CHECKING([how many parallel build jobs to execute])
+proc_default=$(($it_cv_proc + 1))
 AC_ARG_WITH([parallel-jobs],
 	[AS_HELP_STRING([--with-parallel-jobs],
 			[build IcedTea using the specified number of parallel jobs])],
 	[
           if test "x${withval}" = x
           then
-            PARALLEL_JOBS=2
+            PARALLEL_JOBS=${proc_default}
           else
             PARALLEL_JOBS=${withval}
           fi
         ],
         [
-          PARALLEL_JOBS=2
+          PARALLEL_JOBS=${proc_default}
         ])
 AC_MSG_RESULT(${PARALLEL_JOBS})
 AC_SUBST(PARALLEL_JOBS)


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 16 20:39:48 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 04:39:48 +0000
Subject: [Bug 388] Compile of  gcc hangs at fortran/intrinsic.o
Message-ID: <E1NAFr2-0004gD-83@icedtea.classpath.org>

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


jlpoole at pon.net changed:

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




------- Comment #6 from jlpoole at pon.net  2009-11-17 04:39 -------
I tried configuring make and it worked this time.  I had previously had /usr
/mount linked to /mnt/seagate1, since the last I unsuccessfully tried, I
changed the way I accessed these moved directories and obtained what I needed
in the /etc/fstab.  So I'm guessing my configuration on the system was the
culprit for "configure" not working.  I'm compiling "Makefile" now and will
report.  I will then try the emerge attempt that previously failed as well.


-- 
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 ekrichardson at gmail.com  Mon Nov 16 23:04:15 2009
From: ekrichardson at gmail.com (Eric Richardson)
Date: Mon, 16 Nov 2009 23:04:15 -0800
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
Message-ID: <860cb0120911162304t7d0f7b8vf77a5f0f047ecfef@mail.gmail.com>

Michael,

I made it a bit further by adding  SOURCE_LANGUAGE_VERSION=1.5
TARGET_CLASS_VERSION=1.5 to the make command.

/Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0/bin/java -XX:-PrintVMOptions
-XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xmx896m -Xms128m
-XX:PermSize=32m -XX:MaxPermSize=160m
"-Xbootclasspath/p:/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/dist/bootstrap/lib/javac.jar"
-jar
/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/dist/bootstrap/lib/javac.jar
-g -XDignore.symbol.file=true -source 1.5 -target 1.5 -encoding ascii
-classpath /Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0/lib/tools.jar
-Xprefer:source -sourcepath
"/Users/eric/openjdk/icedtea/generated:../../../../src/share/classes" -d
/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/corba/classes
@/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/corba/tmp/sun/com.sun.tools.corba.se.idl/.classes.list;
\
    fi
../../../../src/share/classes/com/sun/tools/corba/se/idl/Arguments.java
../../../../src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java
--- cut --
../../../../src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java
../../../../src/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java
/Users/eric/openjdk/icedtea/generated/java/nio/HeapCharBuffer.java:225:
cannot find symbol
    discardMark();
    ^
  symbol:   method discardMark()
  location: class HeapCharBuffer
/Users/eric/openjdk/icedtea/generated/java/nio/DirectByteBuffer.java:94:
method unreserveMemory in class Bits cannot be applied to given types
            Bits.unreserveMemory(size, capacity);
                ^
  required: long
  found: long,int

The method is not in this class or the superclass. I found an older post on
this issue.
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-January.txt

Is there a workaround?

Eric



On Sat, Nov 14, 2009 at 9:34 PM, Michael Franz <mvfranz at gmail.com> wrote:

> Eric,
>
> I have encountered this issue before.  I am not sure what I did to fix it.
> I think I used ecj instead of the Apple javac.  Check the javac perl script
> that IcedTea has.  The other option is to apply this patch in the required
> build files.
>
>
> http://cr.openjdk.java.net/~andrew/ecj/01/webrev.01/make/build.xml.udiff.html<http://cr.openjdk.java.net/%7Eandrew/ecj/01/webrev.01/make/build.xml.udiff.html>
>
> Here is my initial post on this
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006857.html
>
> If I remember correctly, there is a tool that is compiled by ant (the two
> in the output), but it is not compiled with Java 5 byte code.  When ant
> tries to run the tool you get that error.
>
> I would switch to using ecj, as you might be able to get past this issue,
> there is another issue that will come up and ecj acts differently than javac
> and you really need the ecj way of doing things.  This is my original email
> on this:
>
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-August/006879.html
>
> Michael
>
>
> On Sat, Nov 14, 2009 at 11:48 PM, Eric Richardson <ekrichardson at gmail.com>wrote:
>
>>
>> -def-pcompile:
>>     [mkdir] Created dir:
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>>     [javac] Compiling 2 source files to
>> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/build/toolclasses
>>
>> BUILD FAILED
>> /Users/eric/openjdk/icedtea/openjdk-boot/langtools/make/build.xml:603:
>> java.lang.UnsupportedClassVersionError: Bad version number in .class file
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091116/8d51643d/attachment.html 

From andrew at icedtea.classpath.org  Tue Nov 17 02:36:54 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 10:36:54 +0000
Subject: /hg/icedtea: 2 new changesets
Message-ID: <hg.585267f8c6f2.1258454214.-6899778133799504387@icedtea.classpath.org>

changeset 585267f8c6f2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=585267f8c6f2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 10:37:37 2009 +0000

	Removed tag icedtea-1.12


changeset d88d89a06c5e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d88d89a06c5e
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 10:41:27 2009 +0000

	Fix use of IT_CHECK_FOR_CLASS method on Fedora.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (IT_CHECK_FOR_CLASS): Call
	toString() on the class constant so Sun's javac doesn't
	optimise out the line. Drop the -source 5 option as this
	isn't needed if Class<?> is not used.


diffstat:

3 files changed, 12 insertions(+), 2 deletions(-)
.hgtags      |    2 ++
ChangeLog    |    8 ++++++++
acinclude.m4 |    4 ++--

diffs (42 lines):

diff -r 766972166cea -r d88d89a06c5e .hgtags
--- a/.hgtags	Tue Nov 17 04:35:14 2009 +0000
+++ b/.hgtags	Tue Nov 17 10:41:27 2009 +0000
@@ -22,3 +22,5 @@ 0000000000000000000000000000000000000000
 0000000000000000000000000000000000000000 icedtea-1.11
 df574d432c00e6ad570cc9d92eb4dcd51d31eb7a icedtea-1.11
 3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
+3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
+0000000000000000000000000000000000000000 icedtea-1.12
diff -r 766972166cea -r d88d89a06c5e ChangeLog
--- a/ChangeLog	Tue Nov 17 04:35:14 2009 +0000
+++ b/ChangeLog	Tue Nov 17 10:41:27 2009 +0000
@@ -1,3 +1,11 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_FOR_CLASS): Call toString() on the
+	class constant so Sun's javac doesn't optimise
+	out the line.  Drop the -source 5 option as this
+	isn't needed if Class<?> is not used.
+	
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 766972166cea -r d88d89a06c5e acinclude.m4
--- a/acinclude.m4	Tue Nov 17 04:35:14 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 10:41:27 2009 +0000
@@ -1538,12 +1538,12 @@ public class Test
 {
   public static void main(String[] args)
   {
-    Class<?> cls = $2.class;
+    $2.class.toString();
   }
 }
 ]
 EOF
-if $JAVAC -cp . $JAVACFLAGS -nowarn -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
   if $JAVA -classpath . $BYTECODE; >&AS_MESSAGE_LOG_FD 2>&1; then
       it_cv_$1=no;
   else


From andrew at icedtea.classpath.org  Tue Nov 17 02:58:45 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 10:58:45 +0000
Subject: /hg/icedtea: Remove errant semi-colon in call to $JAVA.
Message-ID: <hg.d8ab104c788d.1258455525.-6899778133799504387@icedtea.classpath.org>

changeset d8ab104c788d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8ab104c788d
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 11:02:43 2009 +0000

	Remove errant semi-colon in call to $JAVA.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (IT_CHECK_FOR_CLASS): Remove errant
	semi-colon.


diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog    |    5 +++++
acinclude.m4 |    2 +-

diffs (24 lines):

diff -r d88d89a06c5e -r d8ab104c788d ChangeLog
--- a/ChangeLog	Tue Nov 17 10:41:27 2009 +0000
+++ b/ChangeLog	Tue Nov 17 11:02:43 2009 +0000
@@ -1,3 +1,8 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_FOR_CLASS): Remove errant semi-colon.
+	
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r d88d89a06c5e -r d8ab104c788d acinclude.m4
--- a/acinclude.m4	Tue Nov 17 10:41:27 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 11:02:43 2009 +0000
@@ -1544,7 +1544,7 @@ public class Test
 ]
 EOF
 if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-  if $JAVA -classpath . $BYTECODE; >&AS_MESSAGE_LOG_FD 2>&1; then
+  if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
       it_cv_$1=no;
   else
       it_cv_$1=yes;


From gnu_andrew at member.fsf.org  Tue Nov 17 03:17:53 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 17 Nov 2009 11:17:53 +0000
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <860cb0120911162004s1f95c11cu6d0cc2f3bc56771f@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<17c6771e0911150700v2523c001r370a8debcdd125df@mail.gmail.com>
	<860cb0120911160916w4e359c4bo638b5da1fa69575e@mail.gmail.com>
	<17c6771e0911161421ud8d783fkb2f0b6899311076f@mail.gmail.com>
	<4B01F8E7.90803@intricatesoftware.com>
	<17c6771e0911161740w15ca90c4x53d1489f9830d02@mail.gmail.com>
	<4B021560.2070805@intricatesoftware.com>
	<860cb0120911162004s1f95c11cu6d0cc2f3bc56771f@mail.gmail.com>
Message-ID: <17c6771e0911170317ncf6e838pe99c05b0c7130542@mail.gmail.com>

2009/11/17 Eric Richardson <ekrichardson at gmail.com>:
> All,
>
> Just wanted to post the patches and the portions that I hand merged. I
> didn't pay much attention to what I needed but I didn't select shark (yet)
> or cacao (unless it is default) and also the solaris patch doesn't seem
> appropriate. Some of these portions of the patches may have succeeded but I
> was on autopilot and may not have tried to rerun the patch after removing
> the portion that didn't work.
>
> I can run diffs on any of these if needed - my previous experience a few
> months back had me patching and re-patching the same file from different
> patches so this version is much more streamlined.
>

Each build drop results in a similar process for the normal build;
some file will change and the patch will need to be recreated against
the new version.  This is one of the reasons why, long-term, we want
as many patches upstream as possible.  It's obviously going to happen
with BSD too as files have changed compared with the main JDK7
versions, and likewise the solution to this is to start getting the
BSD changes into the main tree.  Some files will always be different
until this happens and it's going to mean maintaining separate
patches.  So things will get easier as we both get patches upstream.

> patches/icedtea-version.patch
>
> openjdk/jdk/make/common/shared/Defs.gmk
> openjdk/jdk/src/share/classes/sun/misc/Version.java.template? **but named
> Version-template.java**
> openjdk/jdk/make/java/version/Makefile
>

This is just an out-of-date BSD tree compared with JDK7.  Kelly's
patch changed the name of the template.  I didn't hit this when trying
bsd-port yesterday so it seems to be up-to-date now.  So you should be
able to use the standard version if you update your copy of the
bsd-port tree.

> patches/icedtea-copy-plugs.patch
>
> openjdk/jdk/make/common/internal/BinaryPlugs.gmk
> openjdk/jdk/src/share/classes/java/beans/MetaData.java
>

I saw this one too.  I think the entire patch may just be able to be
dropped now.

> patches/icedtea-headers.patch
>
> openjdk/jdk/make/common/Defs.gmk
> openjdk/jdk/make/sun/font/Makefile
> openjdk/jdk/make/tools/freetypecheck/Makefile
>

This is a weird one, I think the ability to set the name of the
freetype library would need to go upstream, though I've never heard of
a system calling it anything else.
We could just pass in the header location properly and not patch that part.
I don't think this is hugely essential, I know I have no problems
linking freetype with a normal OpenJDK build.

> patches/icedtea-gcc-suffix.patch
>
> openjdk/corba/make/common/shared/Compiler-gcc.gmk
> openjdk/jdk/make/common/shared/Compiler-gcc.gmk
>

Handles binaries like gcc-4.4 used by Debian.

> patches/icedtea-libraries.patch
>
> *** I may have over patched but some of these have to do with ZLIB ***
> openjdk/jdk/make/com/sun/java/pack/Makefile
> openjdk/jdk/make/common/Program.gmk
> openjdk/jdk/make/java/jli/Makefile
> openjdk/jdk/make/java/zip/Makefile
> openjdk/jdk/make/sun/jpeg/FILES_c.gmk
> openjdk/jdk/make/sun/jpeg/Makefile
> openjdk/jdk/make/sun/splashscreen/FILES_c.gmk
> openjdk/jdk/make/sun/splashscreen/Makefile
> openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
> openjdk/jdk/src/share/native/java/util/zip/Adler32.c
> openjdk/jdk/src/share/native/java/util/zip/CRC32.c
> openjdk/jdk/src/share/native/java/util/zip/Deflater.c
> openjdk/jdk/src/share/native/java/util/zip/Inflater.c
> openjdk/jdk/src/share/native/java/util/zip/zip_util.c
> openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
> openjdk/jdk/src/share/native/sun/awt/image/jpeg/jcapimin.c
>

Allows the system libraries to be used instead of intree ones.

> patches/icedtea-shark-build.patch
>
> openjdk/jdk/make/java/redist/Makefile
> openjdk/make/hotspot-rules.gmk
> ** added both zero and shark code **
>
> patches/hotspot/default/icedtea-shark-build.patch
>
> openjdk/hotspot/make/Makefile
>

These are likely both due to BSD changes to the Makefiles for HotSpot.

> patches/cacao/arch.patch
>
> openjdk/jdk/make/javax/sound/SoundDefs.gmk
> openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
>

Additional architecture support.

> patches/icedtea-lc_ctype.patch
>
> openjdk/jdk/src/solaris/native/java/lang/java_props_md.c
>

Seems to have been pushed upstream with little response.

> patches/icedtea-linker-libs-order.patch
>
> openjdk/jdk/make/com/sun/java/pack/Makefile --tricky--
>

No idea on this one.  It's apparently to be upstreamed --
http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches

> ************************************
> did overlays
> start java build
>
> patches/boot/icedtea.patch
>
> openjdk-boot/corba/make/common/Defs.gmk
>

Not sure about why we do this, need to look into it.

> Eric
>
> On Mon, Nov 16, 2009 at 7:15 PM, Kurt Miller <kurt at intricatesoftware.com>
> wrote:
>>
>> Hi Andrew,
>>
>> Andrew John Hughes wrote:
>> > 2009/11/17 Kurt Miller <kurt at intricatesoftware.com>:
>> >> Andrew John Hughes wrote:
>> >>> I'm currently trying to build the BSD tree on linux-amd64 and am
>> >>> confused by:
>> >>>
>> >>>
>> >>> http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/diff/4fef42eb432c/make/common/internal/BinaryPlugs.gmk
>> >>>
>> >>> Why were these additions made? ?They aren't in either tl or the
>> >>> icedtea forests.
>> >>>
>> >>> I spotted this because icedtea-copy-plugs.patch won't apply. ?I may
>> >>> just drop the copy-plugs patch altogether unless it's actually being
>> >>> used; I think it may be dead.
>> >> This was added to support building with binary plugs from when it
>> >> was required to have them. It was left in so that people still
>> >> building ALT_BINARY_PLUGS_PATH set would work. Enough time has
>> >> passed so I'm ok with removing it now if other project members
>> >> agree.
>> >
>> > Strangely, it's part of
>> > http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/4fef42eb432c
>> > which was added _after_ the binary plug dependency was removed.
>>
>> If you look at the full history, you will see it was there from the
>> beginning. When the binary plugs became optional, Greg removed it.
>> I wasn't aware the binary plugs were no longer required and added it
>> back in the update to b59.
>>
>> Regards,
>> -Kurt
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gbenson at redhat.com  Tue Nov 17 03:44:51 2009
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 17 Nov 2009 11:44:51 +0000
Subject: IcedTea7 Zero/Shark build patch, take 2
Message-ID: <20091117114450.GA3239@redhat.com>

Hi all,

Given that my previous patch turned out to be not such a good idea,
how about this one?  It removes the core build stuff, which isn't
required for upstream Zero and was causing some files (jvm.cfg and
ergo_$arch.c) to be created that are now handled upstream.  It also
removes a patch that seems to have been left behind from somewhere.
Ok to commit?

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 766972166cea Makefile.am
--- a/Makefile.am	Tue Nov 17 04:35:14 2009 +0000
+++ b/Makefile.am	Tue Nov 17 11:35:37 2009 +0000
@@ -427,11 +427,6 @@
 endif
 
 # OpenJDK build environment.
-if CORE_BUILD
-  ICEDTEA_CORE_BUILD = true
-else
-  ICEDTEA_CORE_BUILD =
-endif
 if ZERO_BUILD
   ICEDTEA_ZERO_BUILD = true
 else
@@ -462,7 +457,6 @@
 	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
-	CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
 	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
@@ -1315,13 +1309,12 @@
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
 	  ln -sfv $$target $$link; \
 	done
-	if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
-	  = "xno" ; then \
+	if ! test "x$(WITH_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 ; \
 	fi
-	if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(WITH_CACAO)" = "xno"; then \
 	  ln -sf $(abs_top_builddir)/ergo.c \
 	    openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
diff -r 766972166cea acinclude.m4
--- a/acinclude.m4	Tue Nov 17 04:35:14 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 11:35:37 2009 +0000
@@ -718,16 +718,6 @@
   AC_MSG_RESULT($use_zero)
   AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
 
-  use_core=no
-  if test "x${WITH_CACAO}" != "xno"; then
-    use_core=yes;
-  elif test "x${use_zero}" = "xyes"; then
-    if test "x${use_shark}" = "xno"; then
-      use_core=yes;
-    fi
-  fi
-  AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
-
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in
diff -r 766972166cea patches/hotspot/default/icedtea-core-zero-build.patch
--- a/patches/hotspot/default/icedtea-core-zero-build.patch	Tue Nov 17 04:35:14 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
---- openjdk/hotspot/make/Makefile.orig	2008-11-25 09:11:57.000000000 +0000
-+++ openjdk/hotspot/make/Makefile	2008-12-05 16:54:54.000000000 +0000
-@@ -91,6 +91,15 @@
- all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
- 
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore:           all_productcore all_fastdebugcore
-+all_productcore:   productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore:     jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world:         all create_jdk
- 
-@@ -113,6 +122,10 @@
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
- 
-+$(CORE_VM_TARGETS):
-+	$(CD) $(GAMMADIR)/make; \
-+	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- 		      $(MAKE_ARGS) $(VM_TARGET)
- endif
- 
-+generic_buildcore:
-+	$(MKDIR) -p $(OUTPUTDIR)
-+	$(CD) $(OUTPUTDIR); \
-+		$(MAKE) -f $(ABS_OS_MAKEFILE) \
-+			$(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- 	$(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
- 
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef CORE_BUILD
-+  MISC_DIR=$(C2_DIR)
-+  GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
-   MISC_DIR=$(C1_DIR)
-   GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
-   MISC_DIR=$(C2_DIR)
-   GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
- 
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-12-05 16:54:13.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-12-05 16:54:54.000000000 +0000
-@@ -89,8 +89,12 @@
- #ifdef TIERED
-   #define VMTYPE "Server"
- #else
--  #define VMTYPE COMPILER1_PRESENT("Client")   \
--                 COMPILER2_PRESENT("Server")   
-+#if defined(COMPILER1) || defined(COMPILER2)
-+   #define VMTYPE COMPILER1_PRESENT("Client")   \
-+                  COMPILER2_PRESENT("Server")
-+#else
-+  #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
- 
- #ifndef HOTSPOT_VM_DISTRO
---- openjdk/hotspot/build/linux/makefiles/defs.make.orig	2008-11-25 09:11:51.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-12-05 16:54:54.000000000 +0000
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
-   EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
-       EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-     endif
- endif
-+endif

From gnu_andrew at member.fsf.org  Tue Nov 17 04:44:33 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 17 Nov 2009 12:44:33 +0000
Subject: IcedTea7 Zero/Shark build patch, take 2
In-Reply-To: <20091117114450.GA3239@redhat.com>
References: <20091117114450.GA3239@redhat.com>
Message-ID: <17c6771e0911170444u6e1ebae6pb676124ce13733a4@mail.gmail.com>

2009/11/17 Gary Benson <gbenson at redhat.com>:
> Hi all,
>
> Given that my previous patch turned out to be not such a good idea,
> how about this one? ?It removes the core build stuff, which isn't
> required for upstream Zero and was causing some files (jvm.cfg and
> ergo_$arch.c) to be created that are now handled upstream. ?It also
> removes a patch that seems to have been left behind from somewhere.
> Ok to commit?
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

Hi Gary,

It wasn't that the last patch wasn't a good idea, I'm just wary about
disrupting the build too much just before the release.  I hoped to
have 1.12 out by now but keep finding more and more issues :(

This patch looks fine, just dropping dead options, so please commit.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From mvfranz at gmail.com  Tue Nov 17 05:17:54 2009
From: mvfranz at gmail.com (Michael Franz)
Date: Tue, 17 Nov 2009 08:17:54 -0500
Subject: Build progress on Mac OS X PowerPC
In-Reply-To: <860cb0120911162304t7d0f7b8vf77a5f0f047ecfef@mail.gmail.com>
References: <860cb0120911142048s58c4e19ewb4faef9293962ab5@mail.gmail.com>
	<fee4d890911142134n6be47b93had5c9ae54e30dd8e@mail.gmail.com>
	<860cb0120911162304t7d0f7b8vf77a5f0f047ecfef@mail.gmail.com>
Message-ID: <fee4d890911170517n3a222b83vb728f2d34ce6f9aa@mail.gmail.com>

On Tue, Nov 17, 2009 at 2:04 AM, Eric Richardson <ekrichardson at gmail.com>wrote:

> Michael,
>
> I made it a bit further by adding  SOURCE_LANGUAGE_VERSION=1.5
> TARGET_CLASS_VERSION=1.5 to the make command.
>
> /Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0/bin/java -XX:-PrintVMOptions
> -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput -Xmx896m -Xms128m
> -XX:PermSize=32m -XX:MaxPermSize=160m
> "-Xbootclasspath/p:/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/dist/bootstrap/lib/javac.jar"
> -jar
> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/langtools/dist/bootstrap/lib/javac.jar
> -g -XDignore.symbol.file=true -source 1.5 -target 1.5 -encoding ascii
> -classpath /Users/eric/openjdk/icedtea/bootstrap/jdk1.6.0/lib/tools.jar
> -Xprefer:source -sourcepath
> "/Users/eric/openjdk/icedtea/generated:../../../../src/share/classes" -d
> /Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/corba/classes
> @/Users/eric/openjdk/icedtea/openjdk-boot/build/bsd-ppc/corba/tmp/sun/com.sun.tools.corba.se.idl/.classes.list;
> \
>     fi
> ../../../../src/share/classes/com/sun/tools/corba/se/idl/Arguments.java
>
> ../../../../src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java
> --- cut --
>
> ../../../../src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java
>
> ../../../../src/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java
> /Users/eric/openjdk/icedtea/generated/java/nio/HeapCharBuffer.java:225:
> cannot find symbol
>     discardMark();
>     ^
>   symbol:   method discardMark()
>   location: class HeapCharBuffer
>

I think this was added to the BSD port back when I had the problem.  Maybe
it was removed.  If you are applying this patch,
patches/icedtea-bytebuffer-compact.patch, maybe remove it.


> /Users/eric/openjdk/icedtea/generated/java/nio/DirectByteBuffer.java:94:
> method unreserveMemory in class Bits cannot be applied to given types
>             Bits.unreserveMemory(size, capacity);
>                 ^
>   required: long
>   found: long,int
>
> I don't remember this issue, but I will look later, have to run.


> The method is not in this class or the superclass. I found an older post on
> this issue.
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-January.txt
>
> Is there a workaround?
>
> Eric
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091117/870d2aae/attachment.html 

From gbenson at icedtea.classpath.org  Tue Nov 17 05:23:14 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 13:23:14 +0000
Subject: /hg/icedtea: 2009-11-17  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.bd1accbb0f3b.1258464194.-6899778133799504387@icedtea.classpath.org>

changeset bd1accbb0f3b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bd1accbb0f3b
author: Gary Benson <gbenson at redhat.com>
date: Tue Nov 17 13:27:54 2009 +0000

	2009-11-17 Gary Benson <gbenson at redhat.com>

	 * acinclude.m4: (ENABLE_ZERO_BUILD): Do not set
	CORE_BUILD.

	 * Makefile.am: (ICEDTEA_CORE_BUILD): Do not set.
	(ICEDTEA_ENV): Do not set CORE_BUILD. (stamps/ports.stamp):
	Do not create jvm.cfg or ergo_$arch.c for Zero or Shark
	builds.

	 * patches/hotspot/default/icedtea-core-zero-build.patch:
	Removed unused file.


diffstat:

4 files changed, 16 insertions(+), 123 deletions(-)
ChangeLog                                             |   14 ++
Makefile.am                                           |   11 -
acinclude.m4                                          |   10 -
patches/hotspot/default/icedtea-core-zero-build.patch |  104 -----------------

diffs (188 lines):

diff -r d8ab104c788d -r bd1accbb0f3b ChangeLog
--- a/ChangeLog	Tue Nov 17 11:02:43 2009 +0000
+++ b/ChangeLog	Tue Nov 17 13:27:54 2009 +0000
@@ -1,3 +1,17 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Gary Benson  <gbenson at redhat.com>
+
+	* acinclude.m4:
+	(ENABLE_ZERO_BUILD): Do not set CORE_BUILD.
+
+	* Makefile.am:
+	(ICEDTEA_CORE_BUILD): Do not set.
+	(ICEDTEA_ENV): Do not set CORE_BUILD.
+	(stamps/ports.stamp): Do not create jvm.cfg or
+	ergo_$arch.c for Zero or Shark builds.
+
+	* patches/hotspot/default/icedtea-core-zero-build.patch:
+	Removed unused file.
+
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r d8ab104c788d -r bd1accbb0f3b Makefile.am
--- a/Makefile.am	Tue Nov 17 11:02:43 2009 +0000
+++ b/Makefile.am	Tue Nov 17 13:27:54 2009 +0000
@@ -427,11 +427,6 @@ endif
 endif
 
 # OpenJDK build environment.
-if CORE_BUILD
-  ICEDTEA_CORE_BUILD = true
-else
-  ICEDTEA_CORE_BUILD =
-endif
 if ZERO_BUILD
   ICEDTEA_ZERO_BUILD = true
 else
@@ -462,7 +457,6 @@ ICEDTEA_ENV = \
 	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
 	CLASSPATH="" \
 	LD_LIBRARY_PATH="" \
-	CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
 	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
 	ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
 	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
@@ -1315,13 +1309,12 @@ stamps/ports.stamp: stamps/extract.stamp
 	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
 	  ln -sfv $$target $$link; \
 	done
-	if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
-	  = "xno" ; then \
+	if ! test "x$(WITH_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 ; \
 	fi
-	if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
+	if ! test "x$(WITH_CACAO)" = "xno"; then \
 	  ln -sf $(abs_top_builddir)/ergo.c \
 	    openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
diff -r d8ab104c788d -r bd1accbb0f3b acinclude.m4
--- a/acinclude.m4	Tue Nov 17 11:02:43 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 13:27:54 2009 +0000
@@ -718,16 +718,6 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
   AC_MSG_RESULT($use_zero)
   AM_CONDITIONAL(ZERO_BUILD, test "x${use_zero}" = xyes)
 
-  use_core=no
-  if test "x${WITH_CACAO}" != "xno"; then
-    use_core=yes;
-  elif test "x${use_zero}" = "xyes"; then
-    if test "x${use_shark}" = "xno"; then
-      use_core=yes;
-    fi
-  fi
-  AM_CONDITIONAL(CORE_BUILD, test "x${use_core}" = xyes)
-
   ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
   dnl can't use AC_CHECK_SIZEOF on multilib
   case "${ZERO_LIBARCH}" in
diff -r d8ab104c788d -r bd1accbb0f3b patches/hotspot/default/icedtea-core-zero-build.patch
--- a/patches/hotspot/default/icedtea-core-zero-build.patch	Tue Nov 17 11:02:43 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
---- openjdk/hotspot/make/Makefile.orig	2008-11-25 09:11:57.000000000 +0000
-+++ openjdk/hotspot/make/Makefile	2008-12-05 16:54:54.000000000 +0000
-@@ -91,6 +91,15 @@
- all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
- 
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore:           all_productcore all_fastdebugcore
-+all_productcore:   productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore:     jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world:         all create_jdk
- 
-@@ -113,6 +122,10 @@
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
- 
-+$(CORE_VM_TARGETS):
-+	$(CD) $(GAMMADIR)/make; \
-+	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- 		      $(MAKE_ARGS) $(VM_TARGET)
- endif
- 
-+generic_buildcore:
-+	$(MKDIR) -p $(OUTPUTDIR)
-+	$(CD) $(OUTPUTDIR); \
-+		$(MAKE) -f $(ABS_OS_MAKEFILE) \
-+			$(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- 	$(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
- 
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef CORE_BUILD
-+  MISC_DIR=$(C2_DIR)
-+  GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
-   MISC_DIR=$(C1_DIR)
-   GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
-   MISC_DIR=$(C2_DIR)
-   GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
- 
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-12-05 16:54:13.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-12-05 16:54:54.000000000 +0000
-@@ -89,8 +89,12 @@
- #ifdef TIERED
-   #define VMTYPE "Server"
- #else
--  #define VMTYPE COMPILER1_PRESENT("Client")   \
--                 COMPILER2_PRESENT("Server")   
-+#if defined(COMPILER1) || defined(COMPILER2)
-+   #define VMTYPE COMPILER1_PRESENT("Client")   \
-+                  COMPILER2_PRESENT("Server")
-+#else
-+  #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
- 
- #ifndef HOTSPOT_VM_DISTRO
---- openjdk/hotspot/build/linux/makefiles/defs.make.orig	2008-11-25 09:11:51.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-12-05 16:54:54.000000000 +0000
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
-   EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
-       EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-     endif
- endif
-+endif


From gbenson at redhat.com  Tue Nov 17 05:29:49 2009
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 17 Nov 2009 13:29:49 +0000
Subject: IcedTea7 Zero/Shark build patch, take 2
In-Reply-To: <17c6771e0911170444u6e1ebae6pb676124ce13733a4@mail.gmail.com>
References: <20091117114450.GA3239@redhat.com>
	<17c6771e0911170444u6e1ebae6pb676124ce13733a4@mail.gmail.com>
Message-ID: <20091117132949.GB3239@redhat.com>

Andrew John Hughes wrote:
> 2009/11/17 Gary Benson <gbenson at redhat.com>:
> > Given that my previous patch turned out to be not such a good
> > idea, how about this one? ?It removes the core build stuff, which
> > isn't required for upstream Zero and was causing some files
> > (jvm.cfg and ergo_$arch.c) to be created that are now handled
> > upstream. ?It also removes a patch that seems to have been left
> > behind from somewhere.  Ok to commit?
> 
> It wasn't that the last patch wasn't a good idea, I'm just wary
> about disrupting the build too much just before the release.  I
> hoped to have 1.12 out by now but keep finding more and more issues
> :(
> 
> This patch looks fine, just dropping dead options, so please commit.

Cool, committed.

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 17 05:52:33 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 13:52:33 +0000
Subject: [Bug 388] Compile of  gcc hangs at fortran/intrinsic.o
Message-ID: <E1NAOTx-0006Eu-Ba@icedtea.classpath.org>

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


jlpoole at pon.net changed:

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




------- Comment #7 from jlpoole at pon.net  2009-11-17 13:52 -------
Problem is still there, the make hangs at:

/mnt/seagate2/download/gnu/./prev-gcc/xgcc
-B/mnt/seagate2/download/gnu/./prev-gcc/
-B/usr/local/armv5tel-unknown-linux-gnueabi/bin/
-B/usr/local/armv5tel-unknown-linux-gnueabi/bin/
-B/usr/local/armv5tel-unknown-linux-gnueabi/lib/ -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/include -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/sys-include    -c  -g -O2 -gtoggle
-DIN_GCC   -W -Wall -Wwrite-strings -Wcast-qual -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-format-attribute -pedantic -Wno-long-long
-Wno-variadic-macros -Wno-overlength-strings -Werror -Wold-style-definition
-Wc++-compat -fno-common  -DHAVE_CONFIG_H -I. -Ifortran -I.././trunk/gcc
-I.././trunk/gcc/fortran -I.././trunk/gcc/../include
-I.././trunk/gcc/../libcpp/include  -I.././trunk/gcc/../libdecnumber
-I.././trunk/gcc/../libdecnumber/dpd -I../libdecnumber   
.././trunk/gcc/fortran/intrinsic.c -o fortran/intrinsic.o

It looks like the whole box is frozen, I can ping to it, but I cannot connect
via SSH and the web server on it doesn't reply.


-- 
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 Nov 17 07:52:44 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 15:52:44 +0000
Subject: [Bug 408] New: SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NAQMG-0006NN-Nz@icedtea.classpath.org>

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

           Summary: SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: critical
          Priority: P1
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: stefan.riepenhausen at edicos.de


Hello!

Almost once an hour tomcat 5.5.23 crashes with a SIGSEGV on our production
server. 
We've updates the OS (RHEL5), Livelink WCMS application and JVM
(java-1.6.0-openjdk.i386 Release 1.7.b09.el5) to the latest version available
on RHEL5. No changes with this error so far so.

Unfortunately we don't know which part of the java web-application causes the
error, so we can't provide example code.

Any hints or workarounds are welcome.

#
# An unexpected error has been detected by Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x01075c70, pid=5620, tid=701340560
#
# Java VM: OpenJDK Server VM (1.6.0-b09 mixed mode linux-x86)
# Problematic frame:
# V  [libjvm.so+0x325c70]
#
# An error report file with more information is saved as:
# /tmp/hs_err_pid5620.log
#
# If you would like to submit a bug report, please visit:
#   http://icedtea.classpath.org/bugzilla
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

Here is the 

#
# An unexpected error has been detected by Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x01075c70, pid=5620, tid=701340560
#
# Java VM: OpenJDK Server VM (1.6.0-b09 mixed mode linux-x86)
# Problematic frame:
# V  [libjvm.so+0x325c70]
#
# If you would like to submit a bug report, please visit:
#   http://icedtea.classpath.org/bugzilla
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

---------------  T H R E A D  ---------------

Current thread (0x2981cc00):  JavaThread "Java2D Disposer" daemon
[_thread_in_native, id=5944, stack(0x29c89000,0x29cda000)]

siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR),
si_addr=0x0000000b

Registers:
EAX=0x013ad1bd, EBX=0x01391ad4, ECX=0xb7f51000, EDX=0x00000007
ESP=0x29cd8d00, EBP=0x29cd8d28, ESI=0x000000b2, EDI=0x09827000
EIP=0x01075c70, CR2=0x0000000b, EFLAGS=0x00010246

Top of Stack: (sp=0x29cd8d00)
0x29cd8d00:   00000000 09827000 2e5ad5ac 09827000
0x29cd8d10:   00000000 29cd8d50 00b98ca8 008cb398
0x29cd8d20:   098270f4 297f39a0 29cd8d58 00891b3d
0x29cd8d30:   098270f4 29fb12e4 000000b2 008aff42
0x29cd8d40:   004c00a0 0053ec18 2b329478 0053ec18
0x29cd8d50:   2b329478 2d8c11d8 29cd8d68 004c6379
0x29cd8d60:   2b329478 299ddcd8 29cd8d88 004c868c
0x29cd8d70:   2b329478 00b9e4b0 2d8c0c58 0053ec18 

Instructions: (pc=0x01075c70)
0x01075c60:   85 0b 01 00 00 8b 45 0c 8b 10 8b 83 ec ee ff ff
0x01075c70:   8b 4a 04 80 38 00 0f 85 38 01 00 00 c1 ee 02 50 

Stack: [0x29c89000,0x29cda000],  sp=0x29cd8d00,  free space=319k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
V  [libjvm.so+0x325c70]
C  [libfontmanager.so+0x9b3d]
C  [libfreetype.so.6+0x7379]  FT_Stream_Close+0x19
C  [libfreetype.so.6+0x968c]  FT_Stream_Free+0x2c
C  [libfreetype.so.6+0xa2c6]
C  [libfreetype.so.6+0xa393]  FT_Done_Face+0x83
C  [libfontmanager.so+0xab1a] 
Java_sun_font_FreetypeFontScaler_disposeNativeScaler+0x3a
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::StubRoutines (1)
V  [libjvm.so+0x2ffcf1]
V  [libjvm.so+0x485e79]
V  [libjvm.so+0x2fee1f]
V  [libjvm.so+0x2fef25]
V  [libjvm.so+0x2ff7ea]
V  [libjvm.so+0x352556]
V  [libjvm.so+0x557fdc]
V  [libjvm.so+0x5580b4]
V  [libjvm.so+0x48c1b8]
C  [libpthread.so.0+0x55e2]

Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::StubRoutines (1)

---------------  P R O C E S S  ---------------

Java Threads: ( => current thread )
  0x2e532400 JavaThread "process reaper" daemon [_thread_in_native, id=8179,
stack(0x28b0d000,0x28b5e000)]
  0x0a592800 JavaThread "VipThread-68" daemon [_thread_blocked, id=8176,
stack(0x28baf000,0x28c00000)]
  0x09b9d400 JavaThread "CmdProcessor-1" daemon [_thread_blocked, id=6021,
stack(0x2900d000,0x2905e000)]
  0x09570000 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at 1e4b53d[/192.168.1.4:5008<-/192.168.1.5:34642]-receiver"
daemon [_thread_in_native, id=6020, stack(0x2905e000,0x290af000)]
  0x09650800 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at 1e4b53d[/192.168.1.4:5008<-/192.168.1.5:34642]-sender"
daemon [_thread_blocked, id=6019, stack(0x29e1e000,0x29e6f000)]
  0x09a48000 JavaThread "Timer-0" daemon [_thread_blocked, id=5976,
stack(0x290af000,0x29100000)]
  0x09e4d800 JavaThread "TP-Processor24" daemon [_thread_in_native, id=5960,
stack(0x29a0d000,0x29a5e000)]
  0x09e4d000 JavaThread "TP-Processor23" daemon [_thread_in_native, id=5959,
stack(0x29a5e000,0x29aaf000)]
  0x09e4cc00 JavaThread "TP-Processor22" daemon [_thread_blocked, id=5958,
stack(0x29aaf000,0x29b00000)]
  0x0982ec00 JavaThread "TP-Processor21" daemon [_thread_blocked, id=5957,
stack(0x29c38000,0x29c89000)]
=>0x2981cc00 JavaThread "Java2D Disposer" daemon [_thread_in_native, id=5944,
stack(0x29c89000,0x29cda000)]
  0x099c6800 JavaThread "TP-Processor20" daemon [_thread_in_native, id=5922,
stack(0x29cda000,0x29d2b000)]
  0x099c3000 JavaThread "TP-Processor19" daemon [_thread_in_native, id=5921,
stack(0x29d2b000,0x29d7c000)]
  0x099c2800 JavaThread "TP-Processor18" daemon [_thread_in_native, id=5920,
stack(0x29d7c000,0x29dcd000)]
  0x09e52c00 JavaThread "TP-Processor17" daemon [_thread_in_native, id=5919,
stack(0x29dcd000,0x29e1e000)]
  0x09ba2000 JavaThread "TP-Processor16" daemon [_thread_in_native, id=5917,
stack(0x29e6f000,0x29ec0000)]
  0x09ba1800 JavaThread "TP-Processor15" daemon [_thread_in_native, id=5916,
stack(0x29ec0000,0x29f11000)]
  0x09ba1000 JavaThread "TP-Processor14" daemon [_thread_in_native, id=5915,
stack(0x29f11000,0x29f62000)]
  0x09827000 JavaThread "TP-Processor13" daemon [_thread_in_vm, id=5914,
stack(0x29f62000,0x29fb3000)]
  0x09c2e000 JavaThread "TP-Processor12" daemon [_thread_in_native, id=5911,
stack(0x29fb3000,0x2a004000)]
  0x09959c00 JavaThread "TP-Processor11" daemon [_thread_in_Java, id=5910,
stack(0x2a004000,0x2a055000)]
  0x09959000 JavaThread "TP-Processor10" daemon [_thread_in_native, id=5909,
stack(0x2a055000,0x2a0a6000)]
  0x09958c00 JavaThread "TP-Processor9" daemon [_thread_blocked, id=5908,
stack(0x2a0a6000,0x2a0f7000)]
  0x099f3400 JavaThread "DeploymentForward-sitech-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5906, stack(0x2a0f7000,0x2a148000)]
  0x099f2000 JavaThread "sitech_live_JobScheduler" [_thread_blocked, id=5905,
stack(0x2a148000,0x2a199000)]
  0x099f1000 JavaThread "sitech_live_JobDispatcher" [_thread_blocked, id=5904,
stack(0x2a199000,0x2a1ea000)]
  0x09973400 JavaThread "sitech_live_OrderDispatcher" [_thread_blocked,
id=5903, stack(0x2d4d6000,0x2d527000)]
  0x09972000 JavaThread "DeploymentForward-sitebr-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5902, stack(0x2a1ea000,0x2a23b000)]
  0x09971000 JavaThread "sitebr_live_JobScheduler" [_thread_blocked, id=5901,
stack(0x2a23b000,0x2a28c000)]
  0x09970400 JavaThread "sitebr_live_JobDispatcher" [_thread_blocked, id=5900,
stack(0x2a28c000,0x2a2dd000)]
  0x0996fc00 JavaThread "sitebr_live_OrderDispatcher" [_thread_blocked,
id=5899, stack(0x2d527000,0x2d578000)]
  0x0996b800 JavaThread "DeploymentForward-siteau-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5898, stack(0x2a2dd000,0x2a32e000)]
  0x0997f000 JavaThread "siteau_live_JobScheduler" [_thread_blocked, id=5897,
stack(0x2a32e000,0x2a37f000)]
  0x0997dc00 JavaThread "siteau_live_JobDispatcher" [_thread_blocked, id=5896,
stack(0x2a37f000,0x2a3d0000)]
  0x0997d400 JavaThread "siteau_live_OrderDispatcher" [_thread_blocked,
id=5895, stack(0x2d578000,0x2d5c9000)]
  0x0997c000 JavaThread "DeploymentForward-siteat-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5894, stack(0x2a3d0000,0x2a421000)]
  0x09978000 JavaThread "siteat_live_JobScheduler" [_thread_blocked, id=5893,
stack(0x2a421000,0x2a472000)]
  0x096f2c00 JavaThread "siteat_live_JobDispatcher" [_thread_blocked, id=5892,
stack(0x2d61a000,0x2d66b000)]
  0x096f2400 JavaThread "siteat_live_OrderDispatcher" [_thread_blocked,
id=5891, stack(0x2d5c9000,0x2d61a000)]
  0x09976800 JavaThread "DeploymentForward-siteae-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5890, stack(0x2a472000,0x2a4c3000)]
  0x09975400 JavaThread "siteae_live_JobScheduler" [_thread_blocked, id=5889,
stack(0x2a4c3000,0x2a514000)]
  0x09974800 JavaThread "siteae_live_JobDispatcher" [_thread_blocked, id=5888,
stack(0x2a514000,0x2a565000)]
  0x09973c00 JavaThread "siteae_live_OrderDispatcher" [_thread_blocked,
id=5887, stack(0x2a565000,0x2a5b6000)]
  0x096f0000 JavaThread
"DeploymentForward-site_partnerportal-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5886, stack(0x2a5b6000,0x2a607000)]
  0x096ef400 JavaThread "site_partnerportal_live_JobScheduler"
[_thread_blocked, id=5885, stack(0x2a607000,0x2a658000)]
  0x096ee800 JavaThread "site_partnerportal_live_JobDispatcher"
[_thread_blocked, id=5884, stack(0x2a658000,0x2a6a9000)]
  0x096ee000 JavaThread "site_partnerportal_live_OrderDispatcher"
[_thread_blocked, id=5883, stack(0x2d6bc000,0x2d70d000)]
  0x2d82b000 JavaThread
"DeploymentForward-site_admin-Proxy_Content-Proxy_Content" [_thread_blocked,
id=5882, stack(0x2a6a9000,0x2a6fa000)]
  0x2d829c00 JavaThread "site_admin_live_JobScheduler" [_thread_blocked,
id=5881, stack(0x2a6fa000,0x2a74b000)]
  0x2d82c400 JavaThread "site_admin_live_JobDispatcher" [_thread_blocked,
id=5880, stack(0x2a74b000,0x2a79c000)]
  0x2da77400 JavaThread "site_admin_live_OrderDispatcher" [_thread_blocked,
id=5879, stack(0x2d70d000,0x2d75e000)]
  0x096e8000 JavaThread
"DeploymentForward-siteag_report-Proxy_Content-Proxy_Content" [_thread_blocked,
id=5878, stack(0x2d29f000,0x2d2f0000)]
  0x096e3c00 JavaThread "siteag_report_live_JobScheduler" [_thread_blocked,
id=5877, stack(0x2a79c000,0x2a7ed000)]
  0x096e3000 JavaThread "siteag_report_live_JobDispatcher" [_thread_blocked,
id=5876, stack(0x2a7ed000,0x2a83e000)]
  0x09629400 JavaThread "siteag_report_live_OrderDispatcher" [_thread_blocked,
id=5875, stack(0x2d66b000,0x2d6bc000)]
  0x09628800 JavaThread "DeploymentForward-sitees-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5874, stack(0x2a83e000,0x2a88f000)]
  0x09628000 JavaThread
"DeploymentForward-site_marketing-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5873, stack(0x2d10a000,0x2d15b000)]
  0x09623800 JavaThread "sitees_live_JobScheduler" [_thread_blocked, id=5872,
stack(0x2a88f000,0x2a8e0000)]
  0x09622800 JavaThread "sitees_live_JobDispatcher" [_thread_blocked, id=5871,
stack(0x2a8e0000,0x2a931000)]
  0x094e1800 JavaThread "sitees_live_OrderDispatcher" [_thread_blocked,
id=5870, stack(0x2d15b000,0x2d1ac000)]
  0x094e0400 JavaThread "DeploymentForward-sitepl-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5869, stack(0x2a931000,0x2a982000)]
  0x094df000 JavaThread "sitepl_live_JobScheduler" [_thread_blocked, id=5868,
stack(0x2a982000,0x2a9d3000)]
  0x094ddc00 JavaThread "sitepl_live_JobDispatcher" [_thread_blocked, id=5867,
stack(0x2a9d3000,0x2aa24000)]
  0x098cf800 JavaThread "sitepl_live_OrderDispatcher" [_thread_blocked,
id=5866, stack(0x2aa24000,0x2aa75000)]
  0x098ce800 JavaThread "DeploymentForward-sitept-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5865, stack(0x2aa75000,0x2aac6000)]
  0x098cd000 JavaThread "sitept_live_JobScheduler" [_thread_blocked, id=5864,
stack(0x2aac6000,0x2ab17000)]
  0x098cc400 JavaThread "sitept_live_JobDispatcher" [_thread_blocked, id=5863,
stack(0x2ab17000,0x2ab68000)]
  0x098cb800 JavaThread "sitept_live_OrderDispatcher" [_thread_blocked,
id=5862, stack(0x2d1fd000,0x2d24e000)]
  0x0965a400 JavaThread "DeploymentForward-sitein-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5861, stack(0x2ab68000,0x2abb9000)]
  0x09659000 JavaThread "sitein_live_JobScheduler" [_thread_blocked, id=5860,
stack(0x2abb9000,0x2ac0a000)]
  0x09658000 JavaThread "sitein_live_JobDispatcher" [_thread_blocked, id=5859,
stack(0x2ac0a000,0x2ac5b000)]
  0x09657400 JavaThread "sitein_live_OrderDispatcher" [_thread_blocked,
id=5858, stack(0x2d1ac000,0x2d1fd000)]
  0x09656c00 JavaThread "DeploymentForward-siteit-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5857, stack(0x2ac5b000,0x2acac000)]
  0x09649400 JavaThread "siteit_live_JobScheduler" [_thread_blocked, id=5856,
stack(0x2d24e000,0x2d29f000)]
  0x09648c00 JavaThread "siteit_live_JobDispatcher" [_thread_blocked, id=5855,
stack(0x2acac000,0x2acfd000)]
  0x09648400 JavaThread "siteit_live_OrderDispatcher" [_thread_blocked,
id=5854, stack(0x2d2f0000,0x2d341000)]
  0x2d8a2800 JavaThread "DeploymentForward-sitefr-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5853, stack(0x2acfd000,0x2ad4e000)]
  0x2d8a9c00 JavaThread "sitefr_live_JobScheduler" [_thread_blocked, id=5852,
stack(0x2ad4e000,0x2ad9f000)]
  0x2d8ff800 JavaThread "sitefr_live_JobDispatcher" [_thread_blocked, id=5851,
stack(0x2ad9f000,0x2adf0000)]
  0x2d878c00 JavaThread "sitefr_live_OrderDispatcher" [_thread_blocked,
id=5850, stack(0x2adf0000,0x2ae41000)]
  0x2d843c00 JavaThread "DeploymentForward-siteen-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5849, stack(0x2ae41000,0x2ae92000)]
  0x2d822400 JavaThread "siteen_live_JobScheduler" [_thread_blocked, id=5848,
stack(0x2ae92000,0x2aee3000)]
  0x2d826000 JavaThread "siteen_live_JobDispatcher" [_thread_blocked, id=5847,
stack(0x2aee3000,0x2af34000)]
  0x2d825000 JavaThread "siteen_live_OrderDispatcher" [_thread_blocked,
id=5846, stack(0x2d341000,0x2d392000)]
  0x09768800 JavaThread "DeploymentForward-sitedk-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5845, stack(0x2af34000,0x2af85000)]
  0x09767800 JavaThread "sitedk_live_JobScheduler" [_thread_blocked, id=5844,
stack(0x2cfc6000,0x2d017000)]
  0x09766800 JavaThread "sitedk_live_JobDispatcher" [_thread_blocked, id=5843,
stack(0x2d0b9000,0x2d10a000)]
  0x09766000 JavaThread "sitedk_live_OrderDispatcher" [_thread_blocked,
id=5842, stack(0x2d392000,0x2d3e3000)]
  0x2d82f800 JavaThread "DeploymentForward-sitede-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5841, stack(0x2d3e3000,0x2d434000)]
  0x2d83d800 JavaThread "sitede_live_JobScheduler" [_thread_blocked, id=5840,
stack(0x2d017000,0x2d068000)]
  0x2d83f800 JavaThread "sitede_live_JobDispatcher" [_thread_blocked, id=5839,
stack(0x2cf75000,0x2cfc6000)]
  0x2d821400 JavaThread "sitede_live_OrderDispatcher" [_thread_blocked,
id=5838, stack(0x2d434000,0x2d485000)]
  0x2da99800 JavaThread "DeploymentForward-siteru-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5837, stack(0x2d068000,0x2d0b9000)]
  0x09762400 JavaThread "DeploymentForward-sitecz-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5836, stack(0x2cf24000,0x2cf75000)]
  0x09c0fc00 JavaThread "DeploymentForward-sitecn-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5835, stack(0x2ced3000,0x2cf24000)]
  0x09c0f800 JavaThread
"DeploymentForward-siteru_pre-Proxy_Content-Proxy_Content" [_thread_blocked,
id=5834, stack(0x2d75e000,0x2d7af000)]
  0x09c0ec00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5833, stack(0x2af85000,0x2afd6000)]
  0x09f77800 JavaThread "sitecz_live_JobScheduler" [_thread_blocked, id=5832,
stack(0x2afd6000,0x2b027000)]
  0x09f77400 JavaThread "sitecz_live_JobDispatcher" [_thread_blocked, id=5831,
stack(0x2b027000,0x2b078000)]
  0x2d8a3c00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5828, stack(0x2b078000,0x2b0c9000)]
  0x099ed000 JavaThread "sitecz_live_OrderDispatcher" [_thread_blocked,
id=5826, stack(0x2b0c9000,0x2b11a000)]
  0x099ebc00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5825, stack(0x2b11a000,0x2b16b000)]
  0x09c10800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5813, stack(0x2b16b000,0x2b1bc000)]
  0x0a3bb800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5812, stack(0x2b1bc000,0x2b20d000)]
  0x09b68c00 JavaThread "sitecn_live_JobScheduler" [_thread_blocked, id=5808,
stack(0x2b20d000,0x2b25e000)]
  0x09c07800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5807, stack(0x2b25e000,0x2b2af000)]
  0x09ccac00 JavaThread "sitecn_live_JobDispatcher" [_thread_blocked, id=5806,
stack(0x2b2af000,0x2b300000)]
  0x09c08000 JavaThread "sitecn_live_OrderDispatcher" [_thread_blocked,
id=5790, stack(0x2b433000,0x2b484000)]
  0x0a3b9800 JavaThread "TP-Processor8" daemon [_thread_in_native, id=5787,
stack(0x2b484000,0x2b4d5000)]
  0x09f80c00 JavaThread "TP-Processor7" daemon [_thread_in_native, id=5786,
stack(0x2b4d5000,0x2b526000)]
  0x09f80400 JavaThread "TP-Processor6" daemon [_thread_in_native, id=5785,
stack(0x2b526000,0x2b577000)]
  0x09f80000 JavaThread "TP-Processor5" daemon [_thread_in_native, id=5784,
stack(0x2b577000,0x2b5c8000)]
  0x0a3b8400 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5783, stack(0x2b5c8000,0x2b619000)]
  0x0a3b5800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5782, stack(0x2b619000,0x2b66a000)]
  0x2d8a9000 JavaThread "DeploymentForward-siteua-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5781, stack(0x2b66a000,0x2b6bb000)]
  0x0a3bd400 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5780, stack(0x2b6bb000,0x2b70c000)]
  0x0a3bc800 JavaThread "siteua_live_JobScheduler" [_thread_blocked, id=5779,
stack(0x2b70c000,0x2b75d000)]
  0x09f75000 JavaThread "siteua_live_JobDispatcher" [_thread_blocked, id=5778,
stack(0x2b75d000,0x2b7ae000)]
  0x0a3c0800 JavaThread "siteua_live_OrderDispatcher" [_thread_blocked,
id=5776, stack(0x2b7ae000,0x2b7ff000)]
  0x0a3b5000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5775, stack(0x2b7ff000,0x2b850000)]
  0x09baf800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5774, stack(0x2b850000,0x2b8a1000)]
  0x0a3b7800 JavaThread "DeploymentForward-sitesi-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5773, stack(0x2b8a1000,0x2b8f2000)]
  0x09bab800 JavaThread "sitesi_live_JobScheduler" [_thread_blocked, id=5772,
stack(0x2b8f2000,0x2b943000)]
  0x09a0b400 JavaThread "sitesi_live_JobDispatcher" [_thread_blocked, id=5771,
stack(0x2b943000,0x2b994000)]
  0x09a0a800 JavaThread "sitesi_live_OrderDispatcher" [_thread_blocked,
id=5770, stack(0x2b994000,0x2b9e5000)]
  0x2d876c00 JavaThread "TP-Monitor" daemon [_thread_blocked, id=5769,
stack(0x2b9e5000,0x2ba36000)]
  0x2d876000 JavaThread "TP-Processor4" daemon [_thread_in_native, id=5768,
stack(0x2ba36000,0x2ba87000)]
  0x2d879c00 JavaThread "TP-Processor3" daemon [_thread_in_native, id=5767,
stack(0x2ba87000,0x2bad8000)]
  0x2d86b000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5766, stack(0x2bbac000,0x2bbfd000)]
  0x2d869800 JavaThread "TP-Processor2" daemon [_thread_in_native, id=5765,
stack(0x2bad8000,0x2bb29000)]
  0x2d87a800 JavaThread "TP-Processor1" daemon [_thread_in_native, id=5764,
stack(0x2bb29000,0x2bb7a000)]
  0x2d867000 JavaThread "http-8081-Monitor" [_thread_blocked, id=5763,
stack(0x2bbfd000,0x2bc4e000)]
  0x2d865c00 JavaThread "http-8081-Processor25" daemon [_thread_in_native,
id=5762, stack(0x2bc4e000,0x2bc9f000)]
  0x2d864800 JavaThread "http-8081-Processor24" daemon [_thread_blocked,
id=5761, stack(0x2bc9f000,0x2bcf0000)]
  0x2d863800 JavaThread "http-8081-Processor23" daemon [_thread_blocked,
id=5760, stack(0x2bcf0000,0x2bd41000)]
  0x2d862400 JavaThread "http-8081-Processor22" daemon [_thread_blocked,
id=5759, stack(0x2bd41000,0x2bd92000)]
  0x2d861000 JavaThread "http-8081-Processor21" daemon [_thread_blocked,
id=5758, stack(0x2bd92000,0x2bde3000)]
  0x2d860000 JavaThread "http-8081-Processor20" daemon [_thread_blocked,
id=5757, stack(0x2bde3000,0x2be34000)]
  0x2d85b800 JavaThread "http-8081-Processor19" daemon [_thread_blocked,
id=5756, stack(0x2be34000,0x2be85000)]
  0x2d85a800 JavaThread "http-8081-Processor18" daemon [_thread_blocked,
id=5755, stack(0x2be85000,0x2bed6000)]
  0x2d859400 JavaThread "http-8081-Processor17" daemon [_thread_blocked,
id=5754, stack(0x2bed6000,0x2bf27000)]
  0x2d858000 JavaThread "http-8081-Processor16" daemon [_thread_blocked,
id=5753, stack(0x2bf27000,0x2bf78000)]
  0x2d857000 JavaThread "http-8081-Processor15" daemon [_thread_blocked,
id=5752, stack(0x2bf78000,0x2bfc9000)]
  0x2d855c00 JavaThread "http-8081-Processor14" daemon [_thread_blocked,
id=5751, stack(0x2bfc9000,0x2c01a000)]
  0x2d854800 JavaThread "http-8081-Processor13" daemon [_thread_blocked,
id=5750, stack(0x2c01a000,0x2c06b000)]
  0x2d853800 JavaThread "http-8081-Processor12" daemon [_thread_blocked,
id=5748, stack(0x2c06b000,0x2c0bc000)]
  0x2d852400 JavaThread "http-8081-Processor11" daemon [_thread_blocked,
id=5747, stack(0x2c0bc000,0x2c10d000)]
  0x2d851400 JavaThread "http-8081-Processor10" daemon [_thread_blocked,
id=5745, stack(0x2c10d000,0x2c15e000)]
  0x2d81e000 JavaThread "http-8081-Processor9" daemon [_thread_blocked,
id=5744, stack(0x2c15e000,0x2c1af000)]
  0x2d81d000 JavaThread "http-8081-Processor8" daemon [_thread_blocked,
id=5742, stack(0x2c1af000,0x2c200000)]
  0x2d81bc00 JavaThread "http-8081-Processor7" daemon [_thread_blocked,
id=5741, stack(0x2c200000,0x2c251000)]
  0x2d81ac00 JavaThread "http-8081-Processor6" daemon [_thread_blocked,
id=5740, stack(0x2c251000,0x2c2a2000)]
  0x2d819800 JavaThread "http-8081-Processor5" daemon [_thread_blocked,
id=5739, stack(0x2c2a2000,0x2c2f3000)]
  0x2d818c00 JavaThread "http-8081-Processor4" daemon [_thread_blocked,
id=5738, stack(0x2c2f3000,0x2c344000)]
  0x2d818000 JavaThread "http-8081-Processor3" daemon [_thread_blocked,
id=5737, stack(0x2c344000,0x2c395000)]
  0x2da29000 JavaThread "http-8081-Processor2" daemon [_thread_blocked,
id=5736, stack(0x2c395000,0x2c3e6000)]
  0x2da28c00 JavaThread "http-8081-Processor1" daemon [_thread_blocked,
id=5735, stack(0x2c3e6000,0x2c437000)]
  0x2daf0000 JavaThread
"ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon
[_thread_blocked, id=5734, stack(0x2c437000,0x2c488000)]
  0x09660800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5733, stack(0x2c488000,0x2c4d9000)]
  0x2d844c00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5732, stack(0x2c4d9000,0x2c52a000)]
  0x2da1c400 JavaThread "siteru_live_JobScheduler" [_thread_blocked, id=5731,
stack(0x2c52a000,0x2c57b000)]
  0x2da0f000 JavaThread "siteru_live_JobDispatcher" [_thread_blocked, id=5730,
stack(0x2c57b000,0x2c5cc000)]
  0x2d83f000 JavaThread "siteru_live_OrderDispatcher" [_thread_blocked,
id=5729, stack(0x2c5cc000,0x2c61d000)]
  0x09f81800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5728, stack(0x2c61d000,0x2c66e000)]
  0x2d83e800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5727, stack(0x2c66e000,0x2c6bf000)]
  0x09bb4800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5726, stack(0x2c6bf000,0x2c710000)]
  0x098bb000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5723, stack(0x2c710000,0x2c761000)]
  0x09599000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5722, stack(0x2c761000,0x2c7b2000)]
  0x09596800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5721, stack(0x2c7b2000,0x2c803000)]
  0x09fe3800 JavaThread "DeploymentForward-siteza-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5720, stack(0x2c803000,0x2c854000)]
  0x09fe3000 JavaThread "siteza_live_JobScheduler" [_thread_blocked, id=5719,
stack(0x2c854000,0x2c8a5000)]
  0x09c34000 JavaThread "siteza_live_JobDispatcher" [_thread_blocked, id=5718,
stack(0x2c8a5000,0x2c8f6000)]
  0x09c1a400 JavaThread "siteza_live_OrderDispatcher" [_thread_blocked,
id=5717, stack(0x2c8f6000,0x2c947000)]
  0x2dad7400 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5716, stack(0x2c947000,0x2c998000)]
  0x09c34800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5715, stack(0x2ca5d000,0x2caae000)]
  0x2da4c000 JavaThread "DeploymentForward-siteus-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5714, stack(0x2caae000,0x2caff000)]
  0x09c33000 JavaThread "siteus_live_JobScheduler" [_thread_blocked, id=5713,
stack(0x2caff000,0x2cb50000)]
  0x09839000 JavaThread "siteus_live_JobDispatcher" [_thread_blocked, id=5712,
stack(0x2cde0000,0x2ce31000)]
  0x09838000 JavaThread "siteus_live_OrderDispatcher" [_thread_blocked,
id=5711, stack(0x2ce31000,0x2ce82000)]
  0x09b70000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5710, stack(0x2ce82000,0x2ced3000)]
  0x096f8400 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at d28dfa[//192.168.1.4:60507->SERVERNAME:5004/SERVERNAME/192.168.1.5:5004]-receiver"
[_thread_in_native, id=5709, stack(0x2c998000,0x2c9e9000)]
  0x096f7c00 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at d28dfa[//192.168.1.4:60507->SERVERNAME:5004/SERVERNAME/192.168.1.5:5004]-sender"
[_thread_blocked, id=5708, stack(0x2c9e9000,0x2ca3a000)]
  0x09a9b800 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5706, stack(0x2cc65000,0x2ccb6000)]
  0x09c38800 JavaThread
"DeploymentForward-siteuniversity-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5705, stack(0x2ccb6000,0x2cd07000)]
  0x2da90c00 JavaThread "DeploymentForward-siteag-Proxy_Content-Proxy_Content"
[_thread_blocked, id=5704, stack(0x2cd07000,0x2cd58000)]
  0x2ed71800 JavaThread "siteag_live_JobScheduler" [_thread_blocked, id=5703,
stack(0x2cb50000,0x2cba1000)]
  0x2ed71400 JavaThread "siteag_live_JobDispatcher" [_thread_blocked, id=5702,
stack(0x2cba1000,0x2cbf2000)]
  0x2ed71000 JavaThread "siteag_live_OrderDispatcher" [_thread_blocked,
id=5701, stack(0x2cbf2000,0x2cc43000)]
  0x096f3000 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5700, stack(0x2cd58000,0x2cda9000)]
  0x096f7400 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5699, stack(0x2ea5e000,0x2eaaf000)]
  0x09939c00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5698, stack(0x2d95e000,0x2d9af000)]
  0x2e92ac00 JavaThread "ObjectWiperImpl-ReduceCache" daemon [_thread_blocked,
id=5697, stack(0x2f15c000,0x2f1ad000)]
  0x2f067000 JavaThread "VipThread-30" daemon [_thread_blocked, id=5696,
stack(0x2eaaf000,0x2eb00000)]
  0x2f066c00 JavaThread "RequestProcessor(Lucene1)" daemon [_thread_blocked,
id=5695, stack(0x2d90d000,0x2d95e000)]
  0x096fc000 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at df0256[//192.168.1.4:54792->SERVERNAME:5004/SERVERNAME/192.168.1.5:5004]-receiver"
daemon [_thread_in_native, id=5665, stack(0x2d7af000,0x2d800000)]
  0x0983ec00 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at df0256[//192.168.1.4:54792->SERVERNAME:5004/SERVERNAME/192.168.1.5:5004]-sender"
daemon [_thread_blocked, id=5664, stack(0x2db0d000,0x2db5e000)]
  0x2daa2400 JavaThread "VipContentMinerAgent - Timed Indexing Watch" daemon
[_thread_blocked, id=5661, stack(0x2d9af000,0x2da00000)]
  0x2da9e000 JavaThread "RawAcceptor[0.0.0.0/0.0.0.0:5008]" [_thread_in_native,
id=5656, stack(0x2db5e000,0x2dbaf000)]
  0x2da9d800 JavaThread
"SocketQueue[ServerSocket[addr=0.0.0.0/0.0.0.0,port=0,localport=5008]]" daemon
[_thread_blocked, id=5655, stack(0x2dbaf000,0x2dc00000)]
  0x2da75400 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at 1758cd1[*//192.168.1.4:44675->SERVERNAME:5002/SERVERNAME/192.168.1.5:5002]-receiver"
[_thread_in_native, id=5654, stack(0x2df1a000,0x2df6b000)]
  0x2da6f000 JavaThread
"de.gauss.vip.net.raw.RawCommunicationPeer at 1758cd1[*//192.168.1.4:44675->SERVERNAME:5002/SERVERNAME/192.168.1.5:5002]-sender"
[_thread_blocked, id=5653, stack(0x2df6b000,0x2dfbc000)]
  0x2da6e800 JavaThread "ActionWaitRequestManager" daemon [_thread_blocked,
id=5652, stack(0x2dfbc000,0x2e00d000)]
  0x2da6e400 JavaThread "DeploymentWaitRequestManager" daemon [_thread_blocked,
id=5651, stack(0x2e05e000,0x2e0af000)]
  0x2da69800 JavaThread "ThreadManager-TimerThread" daemon [_thread_blocked,
id=5650, stack(0x2e00d000,0x2e05e000)]
  0x2da29c00 JavaThread "NavigationUpdateThread" daemon [_thread_blocked,
id=5648, stack(0x2e0af000,0x2e100000)]
  0x2da03400 JavaThread "InvalidateUrlCacheThread" daemon [_thread_blocked,
id=5646, stack(0x2ec5e000,0x2ecaf000)]
  0x2da03000 JavaThread "ReleaseThread" daemon [_thread_blocked, id=5645,
stack(0x2ec0d000,0x2ec5e000)]
  0x2da08800 JavaThread "CustomPoolManager-CleanUp" daemon [_thread_blocked,
id=5643, stack(0x2f10b000,0x2f15c000)]
  0x2da08000 JavaThread "PoolManager-CleanUp" daemon [_thread_blocked, id=5642,
stack(0x2ecaf000,0x2ed00000)]
  0x0952c400 JavaThread "FileLoggingChannel-Clearer" daemon [_thread_blocked,
id=5638, stack(0x2f1ad000,0x2f1fe000)]
  0x094ea800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=5634,
stack(0x2f715000,0x2f766000)]
  0x094e8c00 JavaThread "CompilerThread1" daemon [_thread_blocked, id=5633,
stack(0x2f766000,0x2f7e7000)]
  0x094e6400 JavaThread "CompilerThread0" daemon [_thread_blocked, id=5632,
stack(0x2f7e7000,0x2f868000)]
  0x094e5000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=5631,
stack(0x2f868000,0x2f8b9000)]
  0x094c8800 JavaThread "Finalizer" daemon [_thread_blocked, id=5630,
stack(0x2faee000,0x2fb3f000)]
  0x094c7800 JavaThread "Reference Handler" daemon [_thread_blocked, id=5629,
stack(0x2fb3f000,0x2fb90000)]
  0x09436000 JavaThread "main" [_thread_in_native, id=5623,
stack(0xb7ef6000,0xb7f47000)]

Other Threads:
  0x094c4400 VMThread [stack: 0x2fb90000,0x2fc11000] [id=5628]
  0x094ec000 WatcherThread [stack: 0x2f694000,0x2f715000] [id=5635]

VM state:not at safepoint (normal execution)

VM Mutex/Monitor currently owned by a thread: None

Heap
 PSYoungGen      total 168960K, used 1505K [0xa9b70000, 0xb4610000, 0xb7ef0000)
  eden space 163328K, 0% used [0xa9b70000,0xa9ce87d8,0xb3af0000)
  from space 5632K, 0% used [0xb4090000,0xb4090000,0xb4610000)
  to   space 5696K, 0% used [0xb3af0000,0xb3af0000,0xb4080000)
 PSOldGen        total 1398144K, used 266606K [0x37ef0000, 0x8d450000,
0xa9b70000)
  object space 1398144K, 19% used [0x37ef0000,0x4834baa0,0x8d450000)
 PSPermGen       total 90368K, used 69015K [0x2fef0000, 0x35730000, 0x37ef0000)
  object space 90368K, 76% used [0x2fef0000,0x34255f28,0x35730000)

Dynamic libraries:
00110000-00252000 r-xp 00000000 03:03 520761     /lib/i686/nosegneg/libc-2.5.so
00252000-00253000 --xp 00142000 03:03 520761     /lib/i686/nosegneg/libc-2.5.so
00253000-00255000 r-xp 00142000 03:03 520761     /lib/i686/nosegneg/libc-2.5.so
00255000-00256000 rwxp 00144000 03:03 520761     /lib/i686/nosegneg/libc-2.5.so
00256000-00259000 rwxp 00256000 00:00 0 
00259000-00260000 r-xp 00000000 03:03 520929    
/lib/i686/nosegneg/librt-2.5.so
00260000-00261000 r-xp 00006000 03:03 520929    
/lib/i686/nosegneg/librt-2.5.so
00261000-00262000 rwxp 00007000 03:03 520929    
/lib/i686/nosegneg/librt-2.5.so
00262000-00268000 r-xp 00000000 03:03 651567    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/native_threads/libhpi.so
00268000-00269000 rwxp 00006000 03:03 651567    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/native_threads/libhpi.so
00269000-0027c000 r-xp 00000000 03:03 520944     /lib/libnsl-2.5.so
0027c000-0027d000 r-xp 00012000 03:03 520944     /lib/libnsl-2.5.so
0027d000-0027e000 rwxp 00013000 03:03 520944     /lib/libnsl-2.5.so
0027e000-00280000 rwxp 0027e000 00:00 0 
00280000-00284000 r-xp 00000000 03:03 520740     /lib/libnss_dns-2.5.so
00284000-00285000 r-xp 00003000 03:03 520740     /lib/libnss_dns-2.5.so
00285000-00286000 rwxp 00004000 03:03 520740     /lib/libnss_dns-2.5.so
...
0038a000-00391000 r-xp 00000000 03:03 651564    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnio.so
00391000-00392000 rwxp 00006000 03:03 651564    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnio.so
00393000-003b5000 r-xp 00000000 03:03 650906    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjava.so
003b5000-003b7000 rwxp 00022000 03:03 650906    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjava.so
003b7000-003ca000 r-xp 00000000 03:03 651108    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnet.so
003ca000-003cb000 rwxp 00012000 03:03 651108    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnet.so
003cb000-0044b000 r-xp 00000000 03:03 650897    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libawt.so
0044b000-00452000 rwxp 0007f000 03:03 650897    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libawt.so
00452000-00476000 rwxp 00452000 00:00 0 
00476000-0049f000 r-xp 00000000 03:03 650955    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/liblcms.so
0049f000-004a1000 rwxp 00028000 03:03 650955    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/liblcms.so
004a1000-004a3000 rwxp 004a1000 00:00 0 
004ac000-004bb000 r-xp 00000000 03:03 520964     /lib/libresolv-2.5.so
004bb000-004bc000 r-xp 0000e000 03:03 520964     /lib/libresolv-2.5.so
004bc000-004bd000 rwxp 0000f000 03:03 520964     /lib/libresolv-2.5.so
004bd000-004bf000 rwxp 004bd000 00:00 0 
004bf000-0053c000 r-xp 00000000 03:03 3635656    /usr/lib/libfreetype.so.6.3.10
0053c000-0053f000 rwxp 0007d000 03:03 3635656    /usr/lib/libfreetype.so.6.3.10
0053f000-00548000 r-xp 00000000 03:03 650950    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjpeg.so
00548000-00549000 rwxp 00008000 03:03 650950    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjpeg.so
00661000-00682000 r-xp 00000000 03:03 3621468    /usr/lib/libjpeg.so.62.0.0
00682000-00683000 rwxp 00020000 03:03 3621468    /usr/lib/libjpeg.so.62.0.0
006ff000-00708000 r-xp 00000000 03:03 520923     /lib/libnss_files-2.5.so
00708000-00709000 r-xp 00008000 03:03 520923     /lib/libnss_files-2.5.so
00709000-0070a000 rwxp 00009000 03:03 520923     /lib/libnss_files-2.5.so
007d3000-007df000 r-xp 00000000 03:03 650965    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libverify.so
007df000-007e0000 rwxp 0000b000 03:03 650965    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libverify.so
00888000-008ca000 r-xp 00000000 03:03 650899    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libfontmanager.so
008ca000-008cc000 rwxp 00042000 03:03 650899    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libfontmanager.so
008cc000-008d0000 rwxp 008cc000 00:00 0 
00905000-00909000 r-xp 00000000 03:03 650893    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/headless/libmawt.so
00909000-0090a000 rwxp 00003000 03:03 650893    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/headless/libmawt.so
0093b000-00941000 r-xp 00000000 03:03 651566    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libzip.so
00941000-00942000 rwxp 00006000 03:03 651566    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libzip.so
009d6000-009e1000 r-xp 00000000 03:03 520887    
/lib/libgcc_s-4.1.2-20080825.so.1
009e1000-009e2000 rwxp 0000a000 03:03 520887    
/lib/libgcc_s-4.1.2-20080825.so.1
00b8b000-00ba5000 r-xp 00000000 03:03 520741     /lib/ld-2.5.so
00ba5000-00ba6000 r-xp 00019000 03:03 520741     /lib/ld-2.5.so
00ba6000-00ba7000 rwxp 0001a000 03:03 520741     /lib/ld-2.5.so
00c25000-00c28000 r-xp 00000000 03:03 651500    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/jli/libjli.so
00c28000-00c29000 rwxp 00003000 03:03 651500    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/jli/libjli.so
00cf4000-00d19000 r-xp 00000000 03:03 520956     /lib/i686/nosegneg/libm-2.5.so
00d19000-00d1a000 r-xp 00024000 03:03 520956     /lib/i686/nosegneg/libm-2.5.so
00d1a000-00d1b000 rwxp 00025000 03:03 520956     /lib/i686/nosegneg/libm-2.5.so
00d1d000-00d1f000 r-xp 00000000 03:03 520946     /lib/libdl-2.5.so
00d1f000-00d20000 r-xp 00001000 03:03 520946     /lib/libdl-2.5.so
00d20000-00d21000 rwxp 00002000 03:03 520946     /lib/libdl-2.5.so
00d23000-00d37000 r-xp 00000000 03:03 520928    
/lib/i686/nosegneg/libpthread-2.5.so
00d37000-00d38000 r-xp 00013000 03:03 520928    
/lib/i686/nosegneg/libpthread-2.5.so
00d38000-00d39000 rwxp 00014000 03:03 520928    
/lib/i686/nosegneg/libpthread-2.5.so
00d39000-00d3b000 rwxp 00d39000 00:00 0 
00d3d000-00d4f000 r-xp 00000000 03:03 3618870    /usr/lib/libz.so.1.2.3
00d4f000-00d50000 rwxp 00011000 03:03 3618870    /usr/lib/libz.so.1.2.3
00d50000-01355000 r-xp 00000000 03:03 650970    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server/libjvm.so
01355000-013a0000 rwxp 00604000 03:03 650970    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server/libjvm.so
...
08048000-08051000 r-xp 00000000 03:03 650911    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/bin/java
08051000-08052000 rwxp 00008000 03:03 650911    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/bin/java
...
2ea49000-2ea50000 r-xs 000f8000 03:03 553737    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/resources.jar
...
2f1fe000-2f1ff000 r-xs 00004000 03:03 683642    
/usr/share/java/tomcat5/servlets-default-5.5.23.jar
2f1ff000-2f200000 r-xs 00001000 03:03 683644    
/usr/share/java/tomcat5/servlets-invoker-5.5.23.jar
...
2f315000-2f317000 r-xs 00000000 03:03 260621    
/var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86.cache-2
2f317000-2f31d000 r-xs 00000000 03:03 261271    
/var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-x86.cache-2
2f31d000-2f31e000 r-xs 00000000 03:03 261507    
/var/cache/fontconfig/aa29b0505d5832941fcb0251512e8b2d-x86.cache-2
2f31e000-2f321000 r-xs 00000000 03:03 260618    
/var/cache/fontconfig/b67b32625a2bb51b023d3814a918f351-x86.cache-2
2f321000-2f327000 r-xs 00000000 03:03 260619    
/var/cache/fontconfig/7ddba6133ef499da58de5e8c586d3b75-x86.cache-2
2f327000-2f329000 r-xs 00000000 03:03 260404    
/var/cache/fontconfig/e3ead4b767b8819993a6fa3ae306afa9-x86.cache-2
2f329000-2f331000 r-xs 00000000 03:03 260443    
/var/cache/fontconfig/e19de935dec46bbf3ed114ee4965548a-x86.cache-2
2f331000-2f336000 r-xs 00000000 03:03 261359    
/var/cache/fontconfig/beeeeb3dfe132a8a0633a017c99ce0c0-x86.cache-2
2f348000-2f34a000 r-xs 00023000 03:03 683648    
/usr/share/java/tomcat5/tomcat-ajp-5.5.23.jar
2f34a000-2f34b000 r-xs 00004000 03:03 683652    
/usr/share/java/tomcat5/tomcat-coyote-5.5.23.jar
2f34b000-2f34d000 r-xs 0001a000 03:03 169519    
/usr/share/java/jakarta-commons-modeler-1.1.jar
2f34d000-2f34e000 r-xs 0000b000 03:03 683602    
/usr/share/java/tomcat5/naming-resources-5.5.23.jar
2f34e000-2f350000 r-xs 00008000 03:03 683687    
/usr/share/java/tomcat5/naming-factory-5.5.23.jar
2f350000-2f352000 r-xs 00005000 03:03 683650    
/usr/share/java/tomcat5/tomcat-apr-5.5.23.jar
2f352000-2f353000 r-xs 00004000 03:03 683642    
/usr/share/java/tomcat5/servlets-default-5.5.23.jar
2f353000-2f357000 r-xs 0002a000 03:03 168569    
/usr/share/java/jakarta-commons-beanutils-1.7.0.jar
2f357000-2f359000 r-xs 00023000 03:03 683648    
/usr/share/java/tomcat5/tomcat-ajp-5.5.23.jar
2f359000-2f35a000 r-xs 00005000 03:03 684024    
/usr/share/java/tomcat5/catalina-ant-jmx-5.5.23.jar
2f35a000-2f35f000 r-xs 0003b000 03:03 683658    
/usr/share/java/tomcat5/tomcat-util-5.5.23.jar
2f35f000-2f360000 r-xs 00004000 03:03 683652    
/usr/share/java/tomcat5/tomcat-coyote-5.5.23.jar
2f360000-2f364000 r-xs 00032000 03:03 683635    
/usr/share/java/tomcat5/catalina-cluster-5.5.23.jar
2f364000-2f366000 r-xs 0001b000 03:03 683637    
/usr/share/java/tomcat5/catalina-optional-5.5.23.jar
2f366000-2f368000 r-xs 00005000 03:03 683650    
/usr/share/java/tomcat5/tomcat-apr-5.5.23.jar
2f368000-2f36a000 r-xs 00005000 03:03 168586    
/usr/share/java/catalina-ant-5.5.23.jar
2f36a000-2f36b000 r-xs 00001000 03:03 683644    
/usr/share/java/tomcat5/servlets-invoker-5.5.23.jar
2f36b000-2f36f000 r-xs 00026000 03:03 168580    
/usr/share/java/jakarta-commons-digester-1.7.jar
2f36f000-2f371000 r-xs 00006000 03:03 168587     /usr/share/java/regexp-1.4.jar
2f371000-2f373000 r-xs 00009000 03:03 683646    
/usr/share/java/tomcat5/servlets-webdav-5.5.23.jar
2f373000-2f37c000 r-xs 0009b000 03:03 684015    
/usr/share/java/tomcat5/catalina-5.5.23.jar
2f37c000-2f37e000 r-xs 0001a000 03:03 169519    
/usr/share/java/jakarta-commons-modeler-1.1.jar
2f37e000-2f380000 r-xs 00009000 03:03 683646    
/usr/share/java/tomcat5/servlets-webdav-5.5.23.jar
2f380000-2f382000 r-xs 0000e000 03:03 683639    
/usr/share/java/tomcat5/catalina-storeconfig-5.5.23.jar
2f382000-2f383000 r-xs 00007000 03:03 683656    
/usr/share/java/tomcat5/tomcat-jkstatus-ant-5.5.23.jar
2f383000-2f385000 r-xs 00014000 03:03 683654    
/usr/share/java/tomcat5/tomcat-http-5.5.23.jar
2f385000-2f387000 r-xs 00002000 03:03 683584    
/usr/share/java/geronimo/spec-jta-1.0.1B-rc2.jar
2f387000-2f3ac000 r-xs 003ab000 03:03 683434    
/usr/share/eclipse/plugins/org.eclipse.jdt.core_3.2.1.v_677_R32x.jar
2f3ac000-2f3b2000 r-xs 0005c000 03:03 168555    
/usr/share/java/classpathx-mail-1.3.1-monolithic-1.1.1.jar
2f3b2000-2f3b8000 r-xs 0005f000 03:03 169705    
/usr/share/java/jasper5-compiler-5.5.23.jar
2f3b8000-2f3b9000 r-xs 0000b000 03:03 683602    
/usr/share/java/tomcat5/naming-resources-5.5.23.jar
2f3b9000-2f3bb000 r-xs 0001a000 03:03 684162    
/var/lib/tomcat5/common/lib/K2_FoF-051213-2323.jar
2f3bb000-2f3ca000 r-xs 000ef000 03:03 168841     /usr/share/java/ant-1.6.5.jar
2f3ca000-2f3cf000 r-xs 00042000 03:03 684161    
/var/lib/tomcat5/common/lib/K2_Core-051213-2324.jar
2f3cf000-2f3d1000 r-xs 0000a000 03:03 168556    
/usr/share/java/classpathx-jaf-1.0.jar
2f3d1000-2f3de000 r-xs 0007e000 03:03 168553    
/usr/share/java/jakarta-commons-collections-3.2.jar
2f3de000-2f3e0000 r-xs 00008000 03:03 683687    
/usr/share/java/tomcat5/naming-factory-5.5.23.jar
2f3e0000-2f3e2000 r-xs 00005000 03:03 168543    
/usr/share/java/jakarta-commons-logging-api-1.0.4.jar
2f3e2000-2f3ea000 r-xs 0005c000 03:03 683554    
/usr/share/java/mx4j/mx4j-3.0.1.jar
2f3ea000-2f3ed000 r-xs 0002d000 03:03 168852    
/usr/share/java/xalan-j2-serializer-2.7.0.jar
2f3ed000-2f400000 r-xs 001a8000 03:03 168851    
/usr/share/java/xalan-j2-2.7.0.jar
2f400000-2f4fe000 rwxp 2f400000 00:00 0 
2f4fe000-2f500000 --xp 2f4fe000 00:00 0 
2f500000-2f505000 r-xs 0003b000 03:03 683658    
/usr/share/java/tomcat5/tomcat-util-5.5.23.jar
2f505000-2f507000 r-xs 00014000 03:03 683654    
/usr/share/java/tomcat5/tomcat-http-5.5.23.jar
2f507000-2f509000 r-xs 00006000 03:03 684056    
/var/lib/tomcat5/common/i18n/tomcat-i18n-fr.jar
2f509000-2f50b000 r-xs 00007000 03:03 684057    
/var/lib/tomcat5/common/i18n/tomcat-i18n-ja.jar
2f50b000-2f50d000 r-xs 00008000 03:03 683736    
/var/lib/tomcat5/common/i18n/tomcat-i18n-en.jar
2f50d000-2f510000 r-xs 00006000 03:03 684046    
/var/lib/tomcat5/common/i18n/tomcat-i18n-es.jar
2f510000-2f516000 r-xs 0003b000 03:03 683557    
/usr/share/java/mx4j/mx4j-jmx-3.0.1.jar
2f516000-2f51a000 r-xs 00020000 03:03 683555    
/usr/share/java/mx4j/mx4j-impl-3.0.1.jar
2f51a000-2f51c000 r-xs 00005000 03:03 684044    
/usr/share/tomcat5/bin/commons-logging-api.jar
2f51c000-2f51e000 r-xs 00001000 03:03 683721    
/usr/share/tomcat5/bin/commons-daemon.jar
2f51e000-2f522000 r-xs 00079000 03:03 553250    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/jsse.jar
2f522000-2f523000 r-xs 00005000 03:03 683717    
/usr/share/tomcat5/bin/bootstrap.jar
2f523000-2f524000 r-xs 0000b000 03:03 717823    
/var/lib/tomcat5/vip/lib/cos.jar
2f524000-2f52a000 r-xs 00041000 03:03 717954    
/var/lib/tomcat5/vip/lib/htmlparser.jar
2f52a000-2f52c000 r-xs 00019000 03:03 717521    
/var/lib/tomcat5/vip/lib/webapplications-v0.9.4.0-061206-1650.jar
2f52c000-2f52e000 r-xs 0000d000 03:03 168595    
/usr/share/java/jakarta-commons-pool-1.3.jar
2f52e000-2f531000 r-xs 00061000 03:03 717952    
/var/lib/tomcat5/vip/lib/mysql-connector-java-3.1.8-bin.jar
2f531000-2f534000 r-xs 00023000 03:03 684173    
/var/lib/tomcat5/common/lib/naming-factory-dbcp.jar
2f534000-2f537000 r-xs 00018000 03:03 168599    
/usr/share/java/jakarta-commons-dbcp-1.2.1.jar
2f537000-2f53a000 r-xs 00021000 03:03 717951    
/var/lib/tomcat5/vip/lib/bsh-core-2.0b4.jar
2f53a000-2f53c000 r-xs 00004000 03:03 168610    
/usr/share/java/jakarta-commons-fileupload-1.0.jar
2f53c000-2f53d000 r-xs 00009000 03:03 168542    
/usr/share/java/jakarta-commons-logging-1.0.4.jar
2f53d000-2f545000 r-xs 00048000 03:03 168834    
/usr/share/java/log4j-1.2.13.jar
2f545000-2f547000 r-xs 0001a000 03:03 168591    
/usr/share/java/jakarta-commons-el-1.0.jar
2f547000-2f549000 r-xs 0000b000 03:03 168602    
/usr/share/java/tomcat5-jsp-2.0-api-5.5.23.jar
2f549000-2f54b000 r-xs 00011000 03:03 168584    
/usr/share/java/jasper5-runtime-5.5.23.jar
2f54b000-2f54e000 r-xs 00016000 03:03 168547    
/usr/share/java/tomcat5-servlet-2.4-api-5.5.23.jar
2f54e000-2f553000 r-xs 00048000 03:03 717956    
/var/lib/tomcat5/vip/lib/dom4j-1.5.2.jar
2f553000-2f55c000 r-xs 00058000 03:03 717955    
/var/lib/tomcat5/vip/lib/standard.jar
2f55c000-2f55e000 r-xs 00004000 03:03 717953    
/var/lib/tomcat5/vip/lib/jstl.jar
2f55e000-2f560000 r-xs 00003000 00:15 4775963   
/usr/local/livelink/lib/saaj.jar
2f560000-2f563000 r-xs 0000d000 00:15 4775969   
/usr/local/livelink/lib/commons-discovery.jar
2f563000-2f56e000 r-xs 00116000 00:15 4531628   
/usr/local/livelink/external_lib/ojdbc14.jar
2f56e000-2f571000 r-xs 00022000 00:15 4775971   
/usr/local/livelink/lib/jgraph.jar
2f571000-2f574000 r-xs 00014000 00:15 4775980   
/usr/local/livelink/lib/lucene-highlighter-2.4.1.jar
2f574000-2f578000 r-xs 00020000 00:15 4775974   
/usr/local/livelink/lib/lucene-analyzers-2.4.1.jar
2f578000-2f586000 r-xs 000bb000 00:15 4775964   
/usr/local/livelink/lib/lucene-core-2.4.1.jar
2f586000-2f587000 r-xs 00006000 00:15 4775981   
/usr/local/livelink/lib/commons-logging.jar
2f587000-2f589000 r-xs 00007000 00:15 4775966   
/usr/local/livelink/lib/jaxrpc.jar
2f589000-2f598000 r-xs 000fe000 00:15 4775975   
/usr/local/livelink/lib/axis.jar
2f598000-2f599000 r-xs 00002000 00:15 4775970   
/usr/local/livelink/lib/javacupruntime.jar
2f599000-2f5a0000 r-xs 00051000 00:15 4775968   
/usr/local/livelink/lib/mail.jar
2f5a0000-2f5a2000 r-xs 0000c000 00:15 4775978   
/usr/local/livelink/lib/activation.jar
2f5a2000-2f5a7000 r-xs 00016000 00:15 4775979   
/usr/local/livelink/lib/xml-apis.jar
2f5a7000-2f5b5000 r-xs 000e6000 00:15 4775973   
/usr/local/livelink/lib/xalan.jar
2f5b5000-2f5bb000 r-xs 00019000 00:15 4775972   
/usr/local/livelink/lib/xmlParserAPIs.jar
2f5bb000-2f5ce000 r-xs 000d8000 00:15 4775976   
/usr/local/livelink/lib/xercesImpl.jar
2f5ce000-2f5d1000 r-xs 00023000 00:15 4775977   
/usr/local/livelink/lib/jdom.jar
2f5d1000-2f5d9000 r-xs 0007a000 00:15 4775967    /usr/local/livelink/lib/jh.jar
2f5d9000-2f5dc000 r-xs 00015000 00:15 4775958   
/usr/local/livelink/lib/vipapi.jar
2f5dc000-2f604000 r-xs 0028f000 00:15 4775962   
/usr/local/livelink/lib/vipacs.jar
2f604000-2f689000 r-xs 008dc000 00:15 4775959   
/usr/local/livelink/lib/vipcore.jar
2f689000-2f68a000 r-xs 00002000 00:15 4775956   
/usr/local/livelink/lib/startup.jar
2f68a000-2f68b000 r-xs 00000000 00:15 4775957   
/usr/local/livelink/lib/patch.jar
2f68b000-2f68c000 r-xs 00000000 00:15 4775961   
/usr/local/livelink/lib/trace.jar
2f68c000-2f694000 r-xs 00061000 03:03 650885    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/ext/gnome-java-bridge.jar
...
2f8b9000-2f8ba000 r-xp 031dd000 03:03 3635652    /usr/lib/locale/locale-archive
2f8ba000-2f8ee000 r-xp 0129b000 03:03 3635652    /usr/lib/locale/locale-archive
2f8ee000-2faee000 r-xp 00000000 03:03 3635652    /usr/lib/locale/locale-archive
...
2fc43000-2fdd0000 r-xs 03385000 03:03 553738    
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/rt.jar
2fdd0000-2fdd8000 r-xs 00028000 03:03 168627    
/usr/share/java/xml-commons-apis-1.3.02.jar
2fdd8000-2fdee000 r-xs 0010e000 03:03 168836    
/usr/share/java/xerces-j2-2.7.1.jar
...
b7ef0000-b7ef6000 r-xp 011fc000 03:03 3635652    /usr/lib/locale/locale-archive
...
b7f49000-b7f51000 rw-s 00000000 03:03 2118427    /tmp/hsperfdata_tomcat/5620
...

VM Arguments:
jvm_args: -Xms1536m -Xmx2048m -Dfile.encoding=UTF-8 -Duser.language=de
-Duser.country=DE
-Dcatalina.ext.dirs=/usr/share/tomcat5/shared/lib:/usr/share/tomcat5/common/lib
-Djava.endorsed.dirs=/usr/share/tomcat5/common/endorsed
-Dcatalina.base=/usr/share/tomcat5 -Dcatalina.home=/usr/share/tomcat5
-Djava.io.tmpdir=/usr/share/tomcat5/temp 
java_command: org.apache.catalina.startup.Bootstrap start
Launcher Type: SUN_STANDARD

Environment Variables:
JAVA_HOME=/usr/lib/jvm/java
PATH=/usr/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin
LD_LIBRARY_PATH=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/../lib/i386
SHELL=/bin/sh

Signal Handlers:
SIGSEGV: [libjvm.so+0x598c70], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGBUS: [libjvm.so+0x598c70], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGFPE: [libjvm.so+0x4870a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGPIPE: [libjvm.so+0x4870a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGXFSZ: [libjvm.so+0x4870a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGILL: [libjvm.so+0x4870a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGUSR2: [libjvm.so+0x489960], sa_mask[0]=0x00000000, sa_flags=0x10000004
SIGHUP: [libjvm.so+0x488670], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGINT: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGTERM: [libjvm.so+0x488670], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGQUIT: [libjvm.so+0x488670], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004


---------------  S Y S T E M  ---------------

OS:Red Hat Enterprise Linux Server release 5.4 (Tikanga)

uname:Linux 2.6.18-164.el5xen #1 SMP Tue Aug 18 16:06:30 EDT 2009 i686
libc:glibc 2.5 NPTL 2.5 
rlimit: STACK 10240k, CORE 0k, NPROC 65664, NOFILE 1024, AS infinity
load average:0.07 0.08 0.08

CPU:total 2 (4 cores per cpu, 1 threads per core) family 6 model 15 stepping 7,
cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3

Memory: 4k page, physical 4194480k(22980k free), swap 1052248k(1052212k free)

vm_info: OpenJDK Server VM (1.6.0-b09) for linux-x86 JRE (1.6.0-b09), built on
Nov 12 2009 07:39:38 by "mockbuild" with gcc 4.1.2 20080704 (Red Hat 4.1.2-46)

time: Tue Nov 17 15:34:32 2009
elapsed time: 2427 seconds


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


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 17 08:23:47 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 16:23:47 +0000
Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NAQqJ-0006Ow-JD@icedtea.classpath.org>

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





------- Comment #1 from aph at redhat.com  2009-11-17 16:23 -------
We need to update the OpenJDK release used on RHEL 5.  I don't know if this
will fix your problem, but it's worth doing first.

However, it'll take a little while to put a new release through the QA process.


-- 
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 Nov 17 08:29:46 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 16:29:46 +0000
Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NAQw6-0006PO-8J@icedtea.classpath.org>

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





------- Comment #2 from gbenson at redhat.com  2009-11-17 16:29 -------
Hi Stefan,

Can you tell me what "rpm -q freetype" says on your machine?

Cheers,
Gary


-- 
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 Nov 17 08:51:21 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 16:51:21 +0000
Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NARGz-0006QP-79@icedtea.classpath.org>

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





------- Comment #3 from gbenson at redhat.com  2009-11-17 16:51 -------
I don't know anything about freetype, but I had a quick look and re

openjdk-ecj/jdk/src/share/native/sun/font/freetypeScaler.c:

  static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) {
      if (scalerInfo == NULL)
          return;

=>    FT_Done_Face(scalerInfo->face);
      FT_Done_FreeType(scalerInfo->library);

      if (scalerInfo->directBuffer != NULL) {
          (*env)->DeleteGlobalRef(env, scalerInfo->directBuffer);
      }

      if (scalerInfo->fontData != NULL) {
          free(scalerInfo->fontData);
      }

      free(scalerInfo);
  }

freetype-2.2.1/src/base/ftobjs.c, from freetype-2.2.1-21.el5_3.src.rpm:

  FT_EXPORT_DEF( FT_Error )
  FT_Done_Face( FT_Face  face )
  {
    FT_Error     error;
    FT_Driver    driver;
    FT_Memory    memory;
    FT_ListNode  node;

    error = FT_Err_Invalid_Face_Handle;
    if ( face && face->driver )
    {
      driver = face->driver;
      memory = driver->root.memory;

      /* find face in driver's list */
      node = FT_List_Find( &driver->faces_list, face );
      if ( node )
      {
        /* remove face object from the driver's list */
        FT_List_Remove( &driver->faces_list, node );
        FT_FREE( node );

        /* now destroy the object proper */
=>      destroy_face( memory, face, driver );
        error = FT_Err_Ok;
      }
    }
    return error;
  }

Note that it has checked that face != NULL.

  static void
  destroy_face( FT_Memory  memory,
                FT_Face    face,
                FT_Driver  driver )
  {
    FT_Driver_Class  clazz = driver->clazz;


    /* discard auto-hinting data */
    if ( face->autohint.finalizer )
      face->autohint.finalizer( face->autohint.data );

    /* Discard glyph slots for this face.                           */
    /* Beware!  FT_Done_GlyphSlot() changes the field `face->glyph' */
    while ( face->glyph )
      FT_Done_GlyphSlot( face->glyph );

    /* discard all sizes for this face */
    FT_List_Finalize( &face->sizes_list,
                      (FT_List_Destructor)destroy_size,
                      memory,
                      driver );
    face->size = 0;

    /* now discard client data */
    if ( face->generic.finalizer )
      face->generic.finalizer( face );

    /* discard charmaps */
    destroy_charmaps( face, memory );

    /* finalize format-specific stuff */
    if ( clazz->done_face )
      clazz->done_face( face );

    /* close the stream for this face if needed */
=>  FT_Stream_Free(
      face->stream,
      ( face->face_flags & FT_FACE_FLAG_EXTERNAL_STREAM ) != 0 );

    face->stream = 0;

    /* get rid of it */
    if ( face->internal )
    {
      FT_FREE( face->internal );
    }
    FT_FREE( face );
  }

...

  FT_BASE_DEF( void )
  FT_Stream_Free( FT_Stream  stream,
                  FT_Int     external )
  {
    if ( stream )
    {
      FT_Memory  memory = stream->memory;


=>    FT_Stream_Close( stream );

      if ( !external )
        FT_FREE( stream );
    }
  }

Note that it has checked that stream != NULL.

src/base/ftstream.c:

  FT_BASE_DEF( void )
  FT_Stream_Close( FT_Stream  stream )
  {
    if ( stream && stream->close )
=>    stream->close( stream );
  }

The segfault is occurring in whatever function stream->close is referencing. 
It could be that stream->close is junk, it could be that stream itself is junk,
or it could be that some other member of stream that stream->close references
is junk.  stream->close is pointing somewhere in libfontmanager.so, but I don't
know what rpm that comes from.


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


From andrew at icedtea.classpath.org  Tue Nov 17 08:55:59 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 16:55:59 +0000
Subject: /hg/icedtea: Patch the JAXWS source if getDTDType() has the wron...
Message-ID: <hg.3a12a790af72.1258476959.-6899778133799504387@icedtea.classpath.org>

changeset 3a12a790af72 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3a12a790af72
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 17:00:32 2009 +0000

	Patch the JAXWS source if getDTDType() has the wrong return type
	(gcj 4.3 and earlier)

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Make use of JAXWS dependent on
	absence of javax.annotation.Resource and/or getDTDType()
	bug. Add new JAXWS patch. (extract-jaxws.stamp): Apply
	getDTDType() patch if bug found.
		* acinclude.m4: (IT_GETDTDTYPE_CHECK): Check for old versions
	of gcj/Classpath which have
	javax.xml.stream.events.Attribute.getDTDType() with a return
	type of QName not String.
		* configure.ac: Invoke new IT_GETDTDTYPE_CHECK macro.
		* patches/icedtea-jaxws-getdtdtype.patch: New patch to work
	around the getDTDType() bug.


diffstat:

5 files changed, 155 insertions(+), 9 deletions(-)
ChangeLog                              |   18 +++++++
Makefile.am                            |   60 ++++++++++++++++++++++---
acinclude.m4                           |   74 ++++++++++++++++++++++++++++++++
configure.ac                           |    1 
patches/icedtea-jaxws-getdtdtype.patch |   11 ++++

diffs (229 lines):

diff -r bd1accbb0f3b -r 3a12a790af72 ChangeLog
--- a/ChangeLog	Tue Nov 17 13:27:54 2009 +0000
+++ b/ChangeLog	Tue Nov 17 17:00:32 2009 +0000
@@ -1,3 +1,21 @@ 2009-11-17  Gary Benson  <gbenson at redhat
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Make use of JAXWS dependent on absence of
+	javax.annotation.Resource and/or getDTDType()
+	bug.  Add new JAXWS patch.
+	(extract-jaxws.stamp): Apply getDTDType() patch
+	if bug found.
+	* acinclude.m4:
+	(IT_GETDTDTYPE_CHECK): Check for old versions of
+	gcj/Classpath which have
+	javax.xml.stream.events.Attribute.getDTDType()
+	with a return type of QName not String.
+	* configure.ac:
+	Invoke new IT_GETDTDTYPE_CHECK macro.
+	* patches/icedtea-jaxws-getdtdtype.patch:
+	New patch to work around the getDTDType() bug.
+	
 2009-11-17  Gary Benson  <gbenson at redhat.com>
 
 	* acinclude.m4:
diff -r bd1accbb0f3b -r 3a12a790af72 Makefile.am
--- a/Makefile.am	Tue Nov 17 13:27:54 2009 +0000
+++ b/Makefile.am	Tue Nov 17 17:00:32 2009 +0000
@@ -85,15 +85,23 @@ JDK_SOLARIS = openjdk/jdk/src/solaris/cl
 JDK_SOLARIS = openjdk/jdk/src/solaris/classes
 LANGTOOLS = openjdk/langtools/src/share/classes
 CORBA = openjdk/corba/src/share/classes
-if LACKS_JAVAX_ANNOTATION_RESOURCE
 JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/jaxws_src/src
-endif
 
 NETX_SRCDIR = $(abs_top_srcdir)/netx
 NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
 
+if DTDTYPE_QNAME
+NEED_JAXWS_SRC = true
+JAXWS_COND = $(JAXWS)
+endif
+
+if LACKS_JAVAX_ANNOTATION_RESOURCE
+NEED_JAXWS_SRC = true
+JAXWS_COND = $(JAXWS)
+endif
+
 OPENJDK_SOURCEPATH_DIRS = \
-        $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
+        $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS_COND)
 
 SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS):$(NETX_SRCDIR)
 
@@ -425,6 +433,10 @@ ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHE
 ICEDTEA_BOOT_PATCHES += $(SCANNER_PATCHES)
 endif
 endif
+
+# Patches for JAXWS
+
+JAXWS_PATCHES = patches/icedtea-jaxws-getdtdtype.patch
 
 # OpenJDK build environment.
 if ZERO_BUILD
@@ -1283,12 +1295,41 @@ clean-extract-cacao: clean-cacao
 	rm -f stamps/extract-cacao.stamp
 
 stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp
-if LACKS_JAVAX_ANNOTATION_RESOURCE
-	(cd openjdk/jaxws ; \
-	 $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \
-	  -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \
-	  source ; \
-	 cd ../..)
+	if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \
+	  (cd openjdk/jaxws ; \
+	   $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \
+	   -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \
+	   source ; \
+	   cd $(abs_top_builddir)) ; \
+	fi
+if DTDTYPE_QNAME
+	(cd $(BUILD_OUTPUT_DIR)/jaxws; \
+	 all_patches_ok=yes; \
+	 for p in $(JAXWS_PATCHES) ; \
+	 do \
+	   if test x$${all_patches_ok} = "xyes" \
+	     && echo Checking $$p \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f \
+	       -F 0 < $(abs_top_srcdir)/$$p ; \
+	   then \
+	    echo Applying $$p ; \
+	    $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
+	    if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
+	      >> stamps/extract-jaxws.stamp.tmp ; \
+	    then \
+	      echo "* $$(basename $$p): UNDOCUMENTED" \
+	        >> stamps/extract-jaxws.stamp.tmp ; \
+	    fi ; \
+	   else \
+	     test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
+	   fi ; \
+	 done ; \
+	 if ! test x$${all_patches_ok} = "xyes"; then \
+	   echo ERROR patch $${all_patches_ok} FAILED! ; \
+	   echo WARNING make clean-extract-jaxws before retrying a fix ; \
+	   exit 2; \
+	 fi ; \
+	 cd $(abs_top_builddir)) ;
 endif
 	mkdir -p stamps
 	touch $@
@@ -1299,6 +1340,7 @@ clean-extract-jaxws:
 	   $(ANT) -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws clobber ; \
 	   cd ../../); \
         fi
+	mkdir -p stamps
 	rm -f stamps/extract-jaxws.stamp
 
 # Link ports sources into tree
diff -r bd1accbb0f3b -r 3a12a790af72 acinclude.m4
--- a/acinclude.m4	Tue Nov 17 13:27:54 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 17:00:32 2009 +0000
@@ -1561,3 +1561,77 @@ AC_DEFUN([IT_FIND_NUMBER_OF_PROCESSORS],
   ])
   AC_PROVIDE([$0])dnl
 ])
+
+AC_DEFUN([IT_GETDTDTYPE_CHECK],[
+  AC_CACHE_CHECK([if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName], it_cv_dtdtype, [
+  CLASS=Test.java
+  BYTECODE=$(echo $CLASS|sed 's#\.java##')
+  mkdir tmp.$$
+  cd tmp.$$
+  cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.EndElement;
+import javax.xml.stream.events.StartElement;
+
+import java.lang.reflect.Method;
+
+public class Test
+    implements Attribute
+{
+    // This method will not qualify if using an
+    // old version of Classpath where it returns
+    // a QName.
+    public String getDTDType() { return "Boom"; }
+
+    // Other Attribute methods
+    public QName getName() { return null; }
+    public String getValue() { return "Bang"; }
+    public boolean isSpecified() { return false; }
+
+    // XMLEvent methods
+    public Characters asCharacters() { return null; }
+    public EndElement asEndElement() { return null; }
+    public StartElement asStartElement() { return null; }
+    public int getEventType() { return 42; }
+    public Location getLocation() { return null; }
+    public QName getSchemaType() { return null; }
+    public boolean isAttribute() { return true; }
+    public boolean isCharacters() { return false; }
+    public boolean isEndDocument() { return false; }
+    public boolean isEndElement() { return false; }
+    public boolean isEntityReference() { return false; }
+    public boolean isNamespace() { return false; }
+    public boolean isProcessingInstruction() { return false; }
+    public boolean isStartDocument() { return false; }
+    public boolean isStartElement() { return false; }
+    public void writeAsEncodedUnicode(java.io.Writer w) {}
+
+    public static void main(String[] args)
+    {
+        for (Method m : Attribute.class.getMethods())
+            if (m.getName().equals("getDTDType"))
+                if (m.getReturnType().equals(QName.class))
+                    System.exit(1);
+    }
+}]
+EOF
+  if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+    if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+      it_cv_dtdtype=no;
+    else
+      it_cv_dtdtype=yes;
+    fi
+  else
+    it_cv_dtdtype=yes;
+  fi
+  rm -f $CLASS *.class
+  cd ..
+  rmdir tmp.$$
+  ])
+AM_CONDITIONAL([DTDTYPE_QNAME], test x"${it_cv_dtdtype}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r bd1accbb0f3b -r 3a12a790af72 configure.ac
--- a/configure.ac	Tue Nov 17 13:27:54 2009 +0000
+++ b/configure.ac	Tue Nov 17 17:00:32 2009 +0000
@@ -217,6 +217,7 @@ IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER], 
 IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER], [java.util.Scanner])
 IT_PR40630_CHECK
 IT_CHECK_FOR_CLASS([JAVAX_ANNOTATION_RESOURCE], [javax.annotation.Resource])
+IT_GETDTDTYPE_CHECK
 IT_CHECK_ENABLE_WARNINGS
 
 FIND_RHINO_JAR
diff -r bd1accbb0f3b -r 3a12a790af72 patches/icedtea-jaxws-getdtdtype.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 17:00:32 2009 +0000
@@ -0,0 +1,11 @@
+--- openjdk.orig/build/linux-amd64/jaxws/drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
++++ openjdk/build/linux-amd64/jaxws/drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:38:00.000000000 +0000
+@@ -276,7 +276,7 @@
+                 qName = localName;
+             else
+                 qName = prefix + ':' + localName;
+-            String type = staxAttr.getDTDType();
++            String type = staxAttr.getDTDType().toString();
+             String value = staxAttr.getValue();
+ 
+             attrs.addAttribute(uri, localName, qName, type, value);


From andrew at icedtea.classpath.org  Tue Nov 17 09:43:24 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 17:43:24 +0000
Subject: /hg/icedtea: Fix path on new JAXWS patch.
Message-ID: <hg.ee96b94c9270.1258479804.-6899778133799504387@icedtea.classpath.org>

changeset ee96b94c9270 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee96b94c9270
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 17:47:58 2009 +0000

	Fix path on new JAXWS patch.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-jaxws-getdtdtype.patch: Fix path.


diffstat:

2 files changed, 7 insertions(+), 2 deletions(-)
ChangeLog                              |    5 +++++
patches/icedtea-jaxws-getdtdtype.patch |    4 ++--

diffs (23 lines):

diff -r 3a12a790af72 -r ee96b94c9270 ChangeLog
--- a/ChangeLog	Tue Nov 17 17:00:32 2009 +0000
+++ b/ChangeLog	Tue Nov 17 17:47:58 2009 +0000
@@ -1,3 +1,8 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jaxws-getdtdtype.patch:
+	Fix path.
+
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 3a12a790af72 -r ee96b94c9270 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 17:00:32 2009 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 17:47:58 2009 +0000
@@ -1,5 +1,5 @@
---- openjdk.orig/build/linux-amd64/jaxws/drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
-+++ openjdk/build/linux-amd64/jaxws/drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:38:00.000000000 +0000
+--- drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
++++ drop/jaxws_src/src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:38:00.000000000 +0000
 @@ -276,7 +276,7 @@
                  qName = localName;
              else


From andrew at icedtea.classpath.org  Tue Nov 17 11:44:48 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 19:44:48 +0000
Subject: /hg/icedtea: 3 new changesets
Message-ID: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>

changeset 9c090fa1a619 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:31:54 2009 +0000

	Always checksum zips, even if specified with --with-alt-x.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Always compute the checksums of zip
	files even when specified by --with-alt-src-zip.
	Switch the alternate HotSpot build to SHA256 checksums.
	(hgforest.stamp): Simplified to just if USE_HG. (download-
	openjdk.stamp): Symlink alternate zip files and then check,
	instead of jumping the download step altogether.
	(download-cacao.stamp): Likewise.
		* hotspot.map: Remove dead redundant line for old original
	build.


changeset 713bd5db2ed2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=713bd5db2ed2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:44:03 2009 +0000

	Use SHA256 checksums throughout.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Use SHA256 checksums for all.
	(download-visualvm.stamp): Use SHA256 checksums. (download-
	cacao.stamp): Likewise. (download-jaf-drop.stamp): Likewise.
	(download-jaxws-drop.stamp): Likewise.
		* configure.ac: Remove search for MD5SUM tool.


changeset 3b4962f39f65 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b4962f39f65
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:49:20 2009 +0000

	Add additional JAXWS gcj 4.3 fix for AttributeBase.java

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-jaxws-getdtdtype.patch: Add
	additional fix for AttributeBase.java


diffstat:

5 files changed, 101 insertions(+), 82 deletions(-)
ChangeLog                              |   31 +++++++
Makefile.am                            |  138 +++++++++++++-------------------
configure.ac                           |    1 
hotspot.map                            |    1 
patches/icedtea-jaxws-getdtdtype.patch |   12 ++

diffs (396 lines):

diff -r ee96b94c9270 -r 3b4962f39f65 ChangeLog
--- a/ChangeLog	Tue Nov 17 17:47:58 2009 +0000
+++ b/ChangeLog	Tue Nov 17 19:49:20 2009 +0000
@@ -1,3 +1,34 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jaxws-getdtdtype.patch:
+	Add additional fix for AttributeBase.java
+	
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Use SHA256 checksums for all.
+	(download-visualvm.stamp): Use SHA256 checksums.
+	(download-cacao.stamp): Likewise.
+	(download-jaf-drop.stamp): Likewise.
+	(download-jaxws-drop.stamp): Likewise.
+	* configure.ac:
+	Remove search for MD5SUM tool.
+	
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Always compute the checksums of zip files
+	even when specified by --with-alt-src-zip.
+	Switch the alternate HotSpot build to SHA256
+	checksums.
+	(hgforest.stamp): Simplified to just if USE_HG.
+	(download-openjdk.stamp): Symlink alternate
+	zip files and then check, instead of jumping
+	the download step altogether.
+	(download-cacao.stamp): Likewise.
+	* hotspot.map: Remove dead redundant line for
+	old original build.
+
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-jaxws-getdtdtype.patch:
diff -r ee96b94c9270 -r 3b4962f39f65 Makefile.am
--- a/Makefile.am	Tue Nov 17 17:47:58 2009 +0000
+++ b/Makefile.am	Tue Nov 17 19:49:20 2009 +0000
@@ -19,23 +19,24 @@ OPENJDK_SHA256SUM = 6a28cd0ba1bcc4290175
 OPENJDK_SHA256SUM = 6a28cd0ba1bcc4290175497e6cfe11295a8e4f82f4c030b3e5686f7c48297936
 
 CACAO_VERSION = 0.99.4
-CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
+CACAO_SHA256SUM = c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
 CACAO_BASE_URL = http://www.complang.tuwien.ac.at
 CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 
 NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
 NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
-NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
+NETBEANS_PROFILER_SHA256SUM = b57b8d90e5749b80885c03abe5547f0d671abebe7f4991d679fa8a0034ebf2c3
 
 VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
 VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
-VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
+VISUALVM_SHA256SUM = 947b0af99a1263e14d496a7231445eeff3e04cb38877fd2b56e1b6f68a7ff710
 
 JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
 JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
-JAXWS_DROP_MD5SUM = f5010ebf636db9f465a61a7a74944543
+JAXWS_DROP_SHA256SUM = 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
 JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
-JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472
+JAF_DROP_SHA256SUM = 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
 JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/144160
 JAXP_DROP_ZIP = jdk7-jaxp-m5.zip
 JAXP_DROP_SHA256SUM = ebab4c6c4e641a4c95a7b6669e78f9bb1149a11054fc5b423cf292b633d6be53
@@ -144,55 +145,21 @@ if USE_HG
   LANGTOOLS_SRC_ZIP =
   HOTSPOT_SRC_ZIP =
 else
-if USE_ALT_OPENJDK_SRC_ZIP
-  OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-else
   OPENJDK_SRC_ZIP = openjdk.tar.gz
-endif
-if USE_ALT_CORBA_SRC_ZIP
-  CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP)
-else
   CORBA_SRC_ZIP = corba.tar.gz
-endif
-if USE_ALT_JAXP_SRC_ZIP
-  JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP)
-else
   JAXP_SRC_ZIP = jaxp.tar.gz
-endif
-if USE_ALT_JAXWS_SRC_ZIP
-  JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP)
-else
   JAXWS_SRC_ZIP = jaxws.tar.gz
-endif
-if USE_ALT_JDK_SRC_ZIP
-  JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP)
-else
   JDK_SRC_ZIP = jdk.tar.gz
-endif
-if USE_ALT_LANGTOOLS_SRC_ZIP
-  LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP)
-else
   LANGTOOLS_SRC_ZIP = langtools.tar.gz
-endif
-if USE_ALT_HOTSPOT_SRC_ZIP
-  HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP)
-else
   HOTSPOT_SRC_ZIP = hotspot.tar.gz
 endif
-endif
-
-if USE_ALT_CACAO_SRC_ZIP
-  CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
-else
-  CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-endif
 
 if WITH_ALT_HSBUILD
-  HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+  HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
   HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
   HS_URL = $(OPENJDK_HOTSPOT_URL)
 else
-  HS_MD5SUM = $(HOTSPOT_MD5SUM)
+  HS_SHA256SUM = $(HOTSPOT_SHA256SUM)
   HS_CHANGESET = $(HOTSPOT_CHANGESET)
   HS_URL = $(HOTSPOT_URL)
 endif
@@ -769,20 +736,13 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp
 # Check for forest support
 
 stamps/hgforest.stamp:
-if OPENJDK_SRC_DIR_FOUND
-else
-if USE_ALT_OPENJDK_SRC_ZIP
-else
-if !USE_HG
-else
+if USE_HG
 	if ! $(HG) fclone -h; \
           then \
           echo "No forest extension found. Please refer to" \
             "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
           exit 1; \
-          fi;
-endif
-endif
+        fi;
 endif
 	mkdir -p stamps 
 	touch $@
@@ -831,16 +791,16 @@ if USE_ALT_JAF_DROP_ZIP
 if USE_ALT_JAF_DROP_ZIP
 	ln -sf $(ALT_JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP)
 endif
-	if ! echo "$(JAF_DROP_MD5SUM)  drops/$(JAF_DROP_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JAF_DROP_SHA256SUM)  drops/$(JAF_DROP_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ -f drops/$(JAF_DROP_ZIP) ] ; \
 	  then \
 	    mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
-	  if ! echo "$(JAF_DROP_MD5SUM)  drops/$(JAF_DROP_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(JAF_DROP_SHA256SUM)  drops/$(JAF_DROP_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of jaf drop zip"; false; \
 	  fi; \
 	fi ;
@@ -856,16 +816,16 @@ if USE_ALT_JAXWS_DROP_ZIP
 if USE_ALT_JAXWS_DROP_ZIP
 	ln -sf $(ALT_JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP)
 endif
-	if ! echo "$(JAXWS_DROP_MD5SUM)  drops/$(JAXWS_DROP_ZIP)" \
-	  | $(MD5SUM) --check ; \
+	if ! echo "$(JAXWS_DROP_SHA256SUM)  drops/$(JAXWS_DROP_ZIP)" \
+	  | $(SHA256SUM) --check ; \
 	then \
 	  if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \
 	  then \
 	    mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
 	  fi ; \
 	  $(WGET) $(JAXWS_DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
-	  if ! echo "$(JAXWS_DROP_MD5SUM)  drops/$(JAXWS_DROP_ZIP)" \
-	    | $(MD5SUM) --check ; \
+	  if ! echo "$(JAXWS_DROP_SHA256SUM)  drops/$(JAXWS_DROP_ZIP)" \
+	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of jaxws drop zip"; false; \
 	  fi; \
 	fi ;
@@ -890,8 +850,6 @@ clean-drops: clean-download-jaxp-drop cl
 
 stamps/download-openjdk.stamp: stamps/hgforest.stamp
 if !OPENJDK_SRC_DIR_FOUND
-if USE_ALT_OPENJDK_SRC_ZIP
-else
 if USE_CLOSURES
 	$(HG) fclone $(CLOSURES_HG_URL) openjdk; 
 else
@@ -917,6 +875,9 @@ else
 	$(HG) fclone $(ICEDTEA_HG_URL) openjdk;
 endif
 else
+if USE_ALT_OPENJDK_SRC_ZIP
+	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
+endif
 	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -929,7 +890,10 @@ else
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of OpenJDK root zip"; false; \
 	  fi; \
-	fi ; \
+	fi ;
+if USE_ALT_CORBA_SRC_ZIP
+	ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
+endif
 	if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -942,7 +906,10 @@ else
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of CORBA zip"; false; \
 	  fi; \
-	fi ; \
+	fi ;
+if USE_ALT_JAXP_SRC_ZIP
+	ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
+endif
 	if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -955,7 +922,10 @@ else
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JAXP zip"; false; \
 	  fi; \
-	fi ; \
+	fi ;
+if USE_ALT_JAXWS_SRC_ZIP
+	ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
+endif
 	if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -968,7 +938,10 @@ else
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JAXWS zip"; false; \
 	  fi; \
-	fi ; \
+	fi ;
+if USE_ALT_JDK_SRC_ZIP
+	ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
+endif
 	if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -981,7 +954,10 @@ else
 	    | $(SHA256SUM) --check ; \
 	  then echo "ERROR: Bad download of JDK zip"; false; \
 	  fi; \
-	fi ; \
+	fi ;
+if USE_ALT_LANGTOOLS_SRC_ZIP
+	ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
+endif
 	if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -995,6 +971,9 @@ else
 	  then echo "ERROR: Bad download of langtools zip"; false; \
 	  fi; \
 	fi ;
+if USE_ALT_HOTSPOT_SRC_ZIP
+	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
+endif
 	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
@@ -1016,7 +995,6 @@ endif
 endif
 endif
 endif
-endif
 	mkdir -p stamps
 	touch $@
 
@@ -1062,21 +1040,21 @@ if BUILD_CACAO
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_ZIP
-else
-	if ! echo "$(CACAO_MD5SUM)  $(CACAO_SRC_ZIP)" \
-	 | $(MD5SUM) --check ; \
+	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
+endif
+	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
+	 | $(SHA256SUM) --check ; \
 	then \
 	 if [ $(CACAO_SRC_ZIP) ] ; \
 	 then \
 	   mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
 	 fi ; \
 	 $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
-	 if ! echo "$(CACAO_MD5SUM)  $(CACAO_SRC_ZIP)" \
-	   | $(MD5SUM) --check ; \
+	 if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
+	   | $(SHA256SUM) --check ; \
 	 then echo "ERROR: Bad download of CACAO zip"; false; \
 	 fi; \
 	fi
-endif
 endif
 endif
 	mkdir -p stamps
@@ -1092,8 +1070,8 @@ endif
 
 stamps/download-visualvm.stamp:
 if WITH_VISUALVM
-	if ! echo "$(NETBEANS_PROFILER_MD5SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
-	 | $(MD5SUM) --check ; \
+	if ! echo "$(NETBEANS_PROFILER_SHA256SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
+	 | $(SHA256SUM) --check ; \
 	then \
 	 if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
 	 then \
@@ -1101,14 +1079,14 @@ if WITH_VISUALVM
 	 fi ; \
 	 $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
 	  -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
-	 if ! echo "$(NETBEANS_PROFILER_MD5SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
-	   | $(MD5SUM) --check ; \
+	 if ! echo "$(NETBEANS_PROFILER_SHA256SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
+	   | $(SHA256SUM) --check ; \
 	 then echo "ERROR: Bad download of NetBeans profiler zip"; false; \
 	 fi; \
 	fi
 
-	if ! echo "$(VISUALVM_MD5SUM)  $(VISUALVM_SRC_ZIP)" \
-         | $(MD5SUM) --check ; \
+	if ! echo "$(VISUALVM_SHA256SUM)  $(VISUALVM_SRC_ZIP)" \
+         | $(SHA256SUM) --check ; \
         then \
          if [ $(VISUALVM_SRC_ZIP) ] ; \
          then \
@@ -1116,8 +1094,8 @@ if WITH_VISUALVM
          fi ; \
          $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \
           -O $(VISUALVM_SRC_ZIP) ; \
-	 if ! echo "$(VISUALVM_MD5SUM)  $(VISUALVM_SRC_ZIP)" \
-	   | $(MD5SUM) --check ; \
+	 if ! echo "$(VISUALVM_SHA256SUM)  $(VISUALVM_SRC_ZIP)" \
+	   | $(SHA256SUM) --check ; \
 	 then echo "ERROR: Bad download of VisualVM zip"; false; \
 	 fi; \
         fi
diff -r ee96b94c9270 -r 3b4962f39f65 configure.ac
--- a/configure.ac	Tue Nov 17 17:47:58 2009 +0000
+++ b/configure.ac	Tue Nov 17 19:49:20 2009 +0000
@@ -25,7 +25,6 @@ FIND_TOOL([PATCH], [patch])
 FIND_TOOL([PATCH], [patch])
 FIND_TOOL([TAR], [tar])
 FIND_TOOL([CHMOD], [chmod])
-FIND_TOOL([MD5SUM], [md5sum])
 FIND_TOOL([SHA256SUM], [sha256sum])
 FIND_TOOL([WGET], [wget])
 FIND_TOOL([ZIP], [zip])
diff -r ee96b94c9270 -r 3b4962f39f65 hotspot.map
--- a/hotspot.map	Tue Nov 17 17:47:58 2009 +0000
+++ b/hotspot.map	Tue Nov 17 19:49:20 2009 +0000
@@ -1,2 +1,1 @@
 # version changeset md5sum
-original	f9d938ede196 c8f78d48ac83987bc2adebeebcd354e9
diff -r ee96b94c9270 -r 3b4962f39f65 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 17:47:58 2009 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 19:49:20 2009 +0000
@@ -9,3 +9,15 @@
              String value = staxAttr.getValue();
  
              attrs.addAttribute(uri, localName, qName, type, value);
+--- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old	2009-11-17 19:46:11.000000000 +0000
++++ drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java	2009-11-17 19:46:35.000000000 +0000
+@@ -112,6 +112,9 @@
+         return _attributeType;
+     }
+ 
++    public QName getDTDType() {
++        return new QName(_attributeType);
++    }
+ 
+   /**
+    * A flag indicating whether this attribute was actually


From doko at ubuntu.com  Tue Nov 17 13:21:24 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Tue, 17 Nov 2009 15:21:24 -0600
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>
Message-ID: <4B0313D4.7050000@ubuntu.com>

On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
> changeset 9c090fa1a619 in /hg/icedtea
> details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
> author: Andrew John Hughes<ahughes at redhat.com>
> date: Tue Nov 17 19:31:54 2009 +0000
>
> 	Always checksum zips, even if specified with --with-alt-x.

if I understand the patch correctly, then this is the wrong thing to do. 
distributions need to ship modified tarballs with binary files and files with 
questionalble licenses removed.

   Matthias


From andrew at icedtea.classpath.org  Tue Nov 17 13:30:40 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Tue, 17 Nov 2009 21:30:40 +0000
Subject: /hg/icedtea: 3 new changesets
Message-ID: <hg.d4fe9b0323e0.1258493440.-6899778133799504387@icedtea.classpath.org>

changeset d4fe9b0323e0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4fe9b0323e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 20:05:05 2009 +0000

	Update to VisualVM 1.2.1.

	2009-11-11 Tomas Hurka <tomas.hurka at sun.com>

	 * Makefile.am: Update to VisualVM 1.2.1.


changeset 896e946a6c03 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=896e946a6c03
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 21:31:19 2009 +0000

	Add missing alternate zip options for VisualVM and NetBeans
	profiler. Ensure symlinks are cleaned.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-download-openjdk): Remove
	conditionals so that symlinks are removed. (clean-
	download-cacao): Likewise. (download-visualvm.stamp):
	Symlink the alternate NetBeans profiler and VisualVM zips
	into place. (clean-download-visualvm): No need for a
	conditional.
		* acinclude.m4: (FIND_NETBEANS): Remove duplicate.
	(WITH_NETBEANS_PROFILER_ZIP): New --with-netbeans-profiler-zip
	option. (WITH_VISUALVM_ZIP): New --with-visualvm-zip option.
		* configure.ac: Invoke new macros.


changeset 81a1e18fede2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=81a1e18fede2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 21:35:00 2009 +0000

	Make the AttributeBase fix actually compile...

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-jaxws-getdtdtype.patch: Replace
	getDTDType method, don't add another.
		* HACKING: Document the patch.


diffstat:

6 files changed, 87 insertions(+), 61 deletions(-)
ChangeLog                              |   26 ++++++++++++++
HACKING                                |    1 
Makefile.am                            |   46 ++++++++-----------------
acinclude.m4                           |   57 +++++++++++++++++---------------
configure.ac                           |    2 +
patches/icedtea-jaxws-getdtdtype.patch |   16 +++++---

diffs (273 lines):

diff -r 3b4962f39f65 -r 81a1e18fede2 ChangeLog
--- a/ChangeLog	Tue Nov 17 19:49:20 2009 +0000
+++ b/ChangeLog	Tue Nov 17 21:35:00 2009 +0000
@@ -1,3 +1,29 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-jaxws-getdtdtype.patch:
+	Replace getDTDType method, don't add another.
+	* HACKING: Document the patch.
+	
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-download-openjdk): Remove conditionals
+	so that symlinks are removed.
+	(clean-download-cacao): Likewise.
+	(download-visualvm.stamp): Symlink the alternate
+	NetBeans profiler and VisualVM zips into place.
+	(clean-download-visualvm): No need for a conditional.
+	* acinclude.m4:
+	(FIND_NETBEANS): Remove duplicate.
+	(WITH_NETBEANS_PROFILER_ZIP): New --with-netbeans-profiler-zip option.
+	(WITH_VISUALVM_ZIP): New --with-visualvm-zip option.
+	* configure.ac:
+	Invoke new macros.
+
+2009-11-11  Tomas Hurka  <tomas.hurka at sun.com>
+
+	* Makefile.am: Update to VisualVM 1.2.1.
+	
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-jaxws-getdtdtype.patch:
diff -r 3b4962f39f65 -r 81a1e18fede2 HACKING
--- a/HACKING	Tue Nov 17 19:49:20 2009 +0000
+++ b/HACKING	Tue Nov 17 21:35:00 2009 +0000
@@ -117,6 +117,7 @@ The following patches are only applied t
 * icedtea-nss-config.patch: Add the NSS PKCS11 security provider. (PR356)
 * icedtea-nss-6763530.patch: Fix PKCS11 provider when used with newer version of NSS (>=3.12.3) (PR356, S6763530).
 * icedtea-sources.patch: Include netx and plugin sources in src.zip
+* icedtea-jaxws-getdtdtype.patch: Workaround for incorrect return type in gcj < 4.4 / GNU Classpath < 0.98
 
 The following patches are only applied to the icedtea-ecj bootstrap tree:
 
diff -r 3b4962f39f65 -r 81a1e18fede2 Makefile.am
--- a/Makefile.am	Tue Nov 17 19:49:20 2009 +0000
+++ b/Makefile.am	Tue Nov 17 21:35:00 2009 +0000
@@ -24,13 +24,13 @@ CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/d
 CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 
-NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
-NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
-NETBEANS_PROFILER_SHA256SUM = b57b8d90e5749b80885c03abe5547f0d671abebe7f4991d679fa8a0034ebf2c3
-
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
-VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
-VISUALVM_SHA256SUM = 947b0af99a1263e14d496a7231445eeff3e04cb38877fd2b56e1b6f68a7ff710
+NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/
+NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release67.tar.gz
+NETBEANS_PROFILER_SHA256SUM = 611736b4e6dac2f7ddb669a23a474fb052f4141c04dc2ba5888b9e9db61fe59b
+
+VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/145167/
+VISUALVM_SRC_ZIP = visualvm_121-src.tar.gz
+VISUALVM_SHA256SUM = b561207d85da4916e809cc4c104098e1ca979b30192c207b9d6087a31c91b8b0
 
 JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
 JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
@@ -999,41 +999,27 @@ endif
 	touch $@
 
 clean-download-openjdk:
-if !USE_ALT_OPENJDK_SRC_ZIP
 	if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
 	  rm -f $(OPENJDK_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_CORBA_SRC_ZIP
 	if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
 	  rm -f $(CORBA_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_JAXP_SRC_ZIP
 	if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
 	  rm -f $(JAXP_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_JAXWS_SRC_ZIP
 	if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
 	  rm -f $(JAXWS_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_JDK_SRC_ZIP
 	if [ ! -z $(JDK_SRC_ZIP) ] ; then \
 	  rm -f $(JDK_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_LANGTOOLS_SRC_ZIP
 	if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
 	  rm -f $(LANGTOOLS_SRC_ZIP) ; \
 	fi
-endif
-if !USE_ALT_HOTSPOT_SRC_ZIP
 	if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
 	  rm -f $(HOTSPOT_SRC_ZIP) ; \
 	fi
-endif
 	rm -f stamps/download-openjdk.stamp
 
 stamps/download-cacao.stamp:
@@ -1061,15 +1047,14 @@ endif
 	touch $@
 
 clean-download-cacao:
-if BUILD_CACAO
-if !USE_ALT_CACAO_SRC_ZIP
 	rm -f $(CACAO_SRC_ZIP)
-endif
-endif
 	rm -f stamps/download-cacao.stamp
 
 stamps/download-visualvm.stamp:
 if WITH_VISUALVM
+if USE_ALT_NETBEANS_PROFILER_ZIP
+	ln -sf $(ALT_NETBEANS_PROFILER_ZIP) $(NETBEANS_PROFILER_SRC_ZIP)
+endif
 	if ! echo "$(NETBEANS_PROFILER_SHA256SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
@@ -1085,6 +1070,9 @@ if WITH_VISUALVM
 	 fi; \
 	fi
 
+if USE_ALT_VISUALVM_ZIP
+	ln -sf $(ALT_VISUALVM_ZIP) $(VISUALVM_SRC_ZIP)
+endif
 	if ! echo "$(VISUALVM_SHA256SUM)  $(VISUALVM_SRC_ZIP)" \
          | $(SHA256SUM) --check ; \
         then \
@@ -1104,10 +1092,8 @@ endif
 	touch $@
 
 clean-download-visualvm:
-if WITH_VISUALVM
 	rm -f $(VISUALVM_SRC_ZIP)
 	rm -f $(NETBEANS_PROFILER_SRC_ZIP)
-endif
 	rm -f stamps/download-visualvm.stamp
 
 stamps/extract.stamp: stamps/extract-openjdk.stamp \
@@ -2224,9 +2210,9 @@ if WITH_VISUALVM
 	cd ../../.. ; \
         JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
             -f nbbuild/build.xml bootstrap ; \
-	for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \
-	  JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \
-            -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \
+	for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler ; do \
+	  JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091020 \
+            -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \
 	    -f $$dir/build.xml ; \
 	done 
 endif
diff -r 3b4962f39f65 -r 81a1e18fede2 acinclude.m4
--- a/acinclude.m4	Tue Nov 17 19:49:20 2009 +0000
+++ b/acinclude.m4	Tue Nov 17 21:35:00 2009 +0000
@@ -581,31 +581,6 @@ AC_DEFUN([FIND_NETBEANS],
   AC_SUBST(NETBEANS)
 ])
 
-AC_DEFUN([FIND_NETBEANS],
-[
-  AC_ARG_WITH([netbeans],
-              [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
-  [
-    if test -f "${withval}"; then
-      AC_MSG_CHECKING(netbeans)
-      NETBEANS="${withval}"
-      AC_MSG_RESULT(${withval})
-    else
-      AC_PATH_PROG(NETBEANS, "${withval}")
-    fi
-  ],
-  [
-    NETBEANS=
-  ])
-  if test -z "${NETBEANS}"; then
-    AC_PATH_PROG(NETBEANS, "netbeans")
-  fi
-  if test -z "${NETBEANS}"; then
-    AC_MSG_ERROR("NetBeans was not found.")
-  fi
-  AC_SUBST(NETBEANS)
-])
-
 AC_DEFUN([FIND_RHINO_JAR],
 [
   AC_MSG_CHECKING(whether to include Javascript support via Rhino)
@@ -1635,3 +1610,35 @@ AM_CONDITIONAL([DTDTYPE_QNAME], test x"$
 AM_CONDITIONAL([DTDTYPE_QNAME], test x"${it_cv_dtdtype}" = "xyes")
 AC_PROVIDE([$0])dnl
 ])
+
+AC_DEFUN([WITH_NETBEANS_PROFILER_ZIP],
+[
+  AC_MSG_CHECKING(for a NetBeans profiler zip)
+  AC_ARG_WITH([netbeans-profiler-zip],
+              [AS_HELP_STRING(--with-netbeans-profiler-zip,specify the location of the NetBeans profiler zip)],
+  [
+    ALT_NETBEANS_PROFILER_ZIP=${withval}
+  ],
+  [ 
+    ALT_NETBEANS_PROFILER_ZIP="not specified"
+  ])
+  AC_MSG_RESULT(${ALT_NETBEANS_PROFILER_ZIP})
+  AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_ZIP, test "x$ALT_NETBEANS_PROFILER_ZIP" != "xnot specified")
+  AC_SUBST(ALT_NETBEANS_PROFILER_ZIP)
+])
+
+AC_DEFUN([WITH_VISUALVM_ZIP],
+[
+  AC_MSG_CHECKING(for a VisualVM zip)
+  AC_ARG_WITH([visualvm-zip],
+              [AS_HELP_STRING(--with-visualvm-zip,specify the location of the VisualVM zip)],
+  [
+    ALT_VISUALVM_ZIP=${withval}
+  ],
+  [ 
+    ALT_VISUALVM_ZIP="not specified"
+  ])
+  AC_MSG_RESULT(${ALT_VISUALVM_ZIP})
+  AM_CONDITIONAL(USE_ALT_VISUALVM_ZIP, test "x$ALT_VISUALVM_ZIP" != "xnot specified")
+  AC_SUBST(ALT_VISUALVM_ZIP)
+])
diff -r 3b4962f39f65 -r 81a1e18fede2 configure.ac
--- a/configure.ac	Tue Nov 17 19:49:20 2009 +0000
+++ b/configure.ac	Tue Nov 17 21:35:00 2009 +0000
@@ -232,6 +232,8 @@ WITH_JAXP_DROP_ZIP
 WITH_JAXP_DROP_ZIP
 WITH_JAF_DROP_ZIP
 WITH_JAXWS_DROP_ZIP
+WITH_NETBEANS_PROFILER_ZIP
+WITH_VISUALVM_ZIP
 
 AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
diff -r 3b4962f39f65 -r 81a1e18fede2 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 19:49:20 2009 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch	Tue Nov 17 21:35:00 2009 +0000
@@ -11,13 +11,17 @@
              attrs.addAttribute(uri, localName, qName, type, value);
 --- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old	2009-11-17 19:46:11.000000000 +0000
 +++ drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java	2009-11-17 19:46:35.000000000 +0000
-@@ -112,6 +112,9 @@
-         return _attributeType;
+@@ -108,11 +108,10 @@
+    * the String "CDATA"
+    * @return the type as a String, default is "CDATA"
+    */
+-    public String getDTDType() {
+-        return _attributeType;
++    public QName getDTDType() {
++        return new QName(_attributeType);
      }
  
-+    public QName getDTDType() {
-+        return new QName(_attributeType);
-+    }
- 
+-
    /**
     * A flag indicating whether this attribute was actually
+    * specified in the start-tag of its element, or was defaulted from the schema.


From gnu_andrew at member.fsf.org  Tue Nov 17 13:54:30 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 17 Nov 2009 21:54:30 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
Message-ID: <17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>

2009/11/11 Tomas Hurka <Tomas.Hurka at sun.com>:
> Hi All,
> attached is a patch to include the latest version (1.2.1) of VisualVM in
> IcedTea6. Can somebody commit these changes for me?
>
> Thanks,
> --
> Tomas Hurka ? <mailto:tomas.hurka at sun.com>
> NetBeans Profiler http://profiler.netbeans.org
> VisualVM http://visualvm.dev.java.net
> Software Engineer, Developer Platforms Group
> Sun Microsystems, Praha Czech Republic
>
>
>
>
>
>
>

I've applied this to IcedTea7:
http://icedtea.classpath.org/hg/icedtea/rev/d4fe9b0323e0 I'll backport
it to IcedTea6 once I've sorted out the IcedTea7 release for milestone
5.

Note that $(abs_top_builddir) should be used, not $(abs_top_srcdir).

Thanks for the contribution!
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gnu_andrew at member.fsf.org  Tue Nov 17 13:58:28 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 17 Nov 2009 21:58:28 +0000
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <4B0313D4.7050000@ubuntu.com>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>
	<4B0313D4.7050000@ubuntu.com>
Message-ID: <17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>

2009/11/17 Matthias Klose <doko at ubuntu.com>:
> On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
>>
>> changeset 9c090fa1a619 in /hg/icedtea
>> details:
>> http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
>> author: Andrew John Hughes<ahughes at redhat.com>
>> date: Tue Nov 17 19:31:54 2009 +0000
>>
>> ? ? ? ?Always checksum zips, even if specified with --with-alt-x.
>
> if I understand the patch correctly, then this is the wrong thing to do.
> distributions need to ship modified tarballs with binary files and files
> with questionalble licenses removed.
>
> ?Matthias
>

Do we still have any?  If so, we should be getting them removed upstream.

I don't think that's a justifiable reason to allow through potential
bogus zips; this patch avoids issues where the build then fails
because someone used an old zip.
Worst case, you can change the checksum to match your modified tarball.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gnu_andrew at member.fsf.org  Tue Nov 17 16:30:48 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 18 Nov 2009 00:30:48 +0000
Subject: IcedTea7 1.12 (Milestone 5) Released!
Message-ID: <17c6771e0911171630g440c4376sdf8470de1357d6c9@mail.gmail.com>

We are pleased to announce the release of IcedTea7 1.12 - Bigger and
Bolder and Rougher and Tougher!

The IcedTea project provides a harness to build the source code from
OpenJDK7 using Free Software build tools. It also includes the only
Free Java plugin and Web Start implementation, and support for
additional architectures over and above x86, x86_64 and SPARC via the
Zero assembler port.

What?s New?
 ??????
- Updated to OpenJDK7 milestone 5; includes:
  - From Project Coin:
    - 6860965: Support for binary literals (e.g. 2 can be written 0b10)
    - 6860965: Support for underscored literals (e.g. 123456 can be
      written 123_456)
    - 6827009: Support for strings in switch statements (e.g. case "a")
    - 6840638: Improved inferencing with generics, e.g.
      Map<String,Integer> map = new HashMap<>();
  - jsr166y from http://gee.cs.oswego.edu/dl/concurrency-interest/:
    - 6865571: Add a lightweight task framework known as ForkJoin
    - 6445158: Phaser - an improved CyclicBarrier
    - 6865579: Add TransferQueue/LinkedTransferQueue
  - The Zero assembler port
  - JIBX is no longer required to build Nimbus.
  - Many bug fixes
- Security fixes for:
 (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
 (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
 (CVE-2009-3881) resurrected classloaders can still have children (6636650)
 (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
(CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
 (CVE-2009-3880) UI logging information leakage (6664512)
 (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
(CVE-2009-3884) zoneinfo file existence information leak (6824265)
 (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
 (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
 (CVE-2009-3875) MessageDigest.isEqual introduces timing attack
vulnerabilities (6863503)
 (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser
 denial of service (6864911)
(CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
 (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643)
 (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
- The NSS crypto. provider may be turned on with --enable-nss if
  the NSS libraries and headers are available via pkg-config.
- Makefile reorganisation:
  * icedtea-ecj is now icedtea-boot and patches/ecj is now
    patches/boot.
  * The icedtea-against-icedtea target is now icedtea-stage2.
    The icedtea-against-ecj target is now icedtea-stage1.
  * The Java code for the plugin is now built by the
    liveconnect.stamp and liveconnect-dist.stamp targets
    rather than hijacking the OpenJDK build.
- Upgraded to VisualVM 1.2.1
 ??????

 The tarball can be downloaded from:

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

The following people helped with the release:

Gary Benson, Deepak Bhole, Andrew Haley, Andrew John Hughes, Thomas
Hurka, Matthias Klose,  Xerxes R?nby, Jon VonAlten, Mark Wielaard and
many others.

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

To get started:
$ tar xzf icedtea-1.12.tar.gz
$ cd icedtea6-1.12

Full build requirements and instructions are in INSTALL:
$ ./configure [--enable-zero --enable-shark --enable-visualvm
--with-jdk-home  --enable-pulse-java --enable-systemtap etc...]
$ make

Blog: http://blog.fuseyism.com/index.php/2009/11/18/icedtea7-112-bigger-and-bolder-and-rougher-and-tougher/

Happy hacking!
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From doko at ubuntu.com  Tue Nov 17 20:00:25 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Tue, 17 Nov 2009 22:00:25 -0600
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>	
	<4B0313D4.7050000@ubuntu.com>
	<17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>
Message-ID: <4B037159.7000005@ubuntu.com>

On 17.11.2009 15:58, Andrew John Hughes wrote:
> 2009/11/17 Matthias Klose<doko at ubuntu.com>:
>> On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
>>>
>>> changeset 9c090fa1a619 in /hg/icedtea
>>> details:
>>> http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
>>> author: Andrew John Hughes<ahughes at redhat.com>
>>> date: Tue Nov 17 19:31:54 2009 +0000
>>>
>>>         Always checksum zips, even if specified with --with-alt-x.
>>
>> if I understand the patch correctly, then this is the wrong thing to do.
>> distributions need to ship modified tarballs with binary files and files
>> with questionalble licenses removed.
>>
>>   Matthias
>>
>
> Do we still have any?  If so, we should be getting them removed upstream.

is upstream willing to remove any prebuilt binaries from the tarballs?

> I don't think that's a justifiable reason to allow through potential
> bogus zips; this patch avoids issues where the build then fails
> because someone used an old zip.

I honestly disagree; did you see any cases where this did go wrong?

> Worst case, you can change the checksum to match your modified tarball.

If you really have to do this (which I disagree with), please only do this for 
tarballs which are not renamed, e.g. disable the check for anything which name 
differs from the "upstream" name.

   Matthias


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 18 00:25:26 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Nov 2009 08:25:26 +0000
Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NAfqw-0003an-EP@icedtea.classpath.org>

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





------- Comment #4 from stefan.riepenhausen at edicos.de  2009-11-18 08:25 -------
We are using freetype-2.2.1-21.el5_3

libfontmanager.so is provides by java-1.6.0-openjdk-1.6.0.0-1.7.b09.el5.i386 


-- 
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 Tomas.Hurka at Sun.COM  Wed Nov 18 01:19:54 2009
From: Tomas.Hurka at Sun.COM (Tomas Hurka)
Date: Wed, 18 Nov 2009 10:19:54 +0100
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
Message-ID: <BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>

Hi Andrew,

On 17 Nov 2009, at 22:54, Andrew John Hughes wrote:

> 2009/11/11 Tomas Hurka <Tomas.Hurka at sun.com>:
>> Hi All,
>> attached is a patch to include the latest version (1.2.1) of  
>> VisualVM in
>> IcedTea6. Can somebody commit these changes for me?
>
> I've applied this to IcedTea7:
> http://icedtea.classpath.org/hg/icedtea/rev/d4fe9b0323e0 I'll backport
> it to IcedTea6 once I've sorted out the IcedTea7 release for milestone
> 5.
OK.

> Note that $(abs_top_builddir) should be used, not $(abs_top_srcdir).

I see. Thanks for the review of the patch.

Bye,
--
Tomas Hurka   <mailto:tomas.hurka at sun.com>
NetBeans Profiler http://profiler.netbeans.org
VisualVM http://visualvm.dev.java.net
Software Engineer, Developer Platforms Group
Sun Microsystems, Praha Czech Republic





From gbenson at icedtea.classpath.org  Wed Nov 18 06:19:29 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 18 Nov 2009 14:19:29 +0000
Subject: /hg/icedtea6: 2009-11-18  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.1daa0bb701a8.1258553969.2873452341184383832@icedtea.classpath.org>

changeset 1daa0bb701a8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1daa0bb701a8
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 18 14:24:09 2009 +0000

	2009-11-18 Gary Benson <gbenson at redhat.com>

	 *
	ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
		* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
		* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Non-
	code cleanups to better match upstream Zero.


diffstat:

4 files changed, 10 insertions(+), 6 deletions(-)
ChangeLog                                                  |    7 +++++++
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp |    2 --
ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp       |    5 ++---
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp       |    2 +-

diffs (51 lines):

diff -r 86479d159627 -r 1daa0bb701a8 ChangeLog
--- a/ChangeLog	Thu Nov 12 16:39:22 2009 +0100
+++ b/ChangeLog	Wed Nov 18 14:24:09 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-12  Xerxes R??nby  <xerxes at zafen
+2009-11-18  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
+	* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
+	* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp:
+	Non-code cleanups to better match upstream Zero.
+
 2009-11-12  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp	Wed Nov 18 14:24:09 2009 +0000
@@ -146,5 +146,3 @@
                                                   ((VMJavaVal64*)(addr))->d)
 #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \
                                                 ((VMJavaVal64*)(addr))->l)
-
-
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp	Wed Nov 18 14:24:09 2009 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,5 +23,4 @@
  *
  */
 
-#include "incls/_precompiled.incl"
-#include "incls/_methodHandles_zero.cpp.incl"
+// This file is intentionally empty
diff -r 86479d159627 -r 1daa0bb701a8 ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Thu Nov 12 16:39:22 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp	Wed Nov 18 14:24:09 2009 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it


From gbenson at icedtea.classpath.org  Wed Nov 18 08:06:11 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 18 Nov 2009 16:06:11 +0000
Subject: /hg/icedtea6: 2009-11-18  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.d5f77a4c9214.1258560370.2873452341184383832@icedtea.classpath.org>

changeset d5f77a4c9214 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d5f77a4c9214
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 18 10:56:39 2009 -0500

	2009-11-18 Gary Benson <gbenson at redhat.com>

	 * patches/icedtea-shark.patch
	(hotspot/src/share/vm/utilities/macros.hpp): IA64 is
	NOT_X86.


diffstat:

2 files changed, 8 insertions(+), 6 deletions(-)
ChangeLog                   |    6 ++++++
patches/icedtea-shark.patch |    8 ++------

diffs (31 lines):

diff -r 1daa0bb701a8 -r d5f77a4c9214 ChangeLog
--- a/ChangeLog	Wed Nov 18 14:24:09 2009 +0000
+++ b/ChangeLog	Wed Nov 18 10:56:39 2009 -0500
@@ -1,3 +1,9 @@ 2009-11-18  Gary Benson  <gbenson at redhat
+2009-11-18  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-shark.patch
+	(hotspot/src/share/vm/utilities/macros.hpp):
+	IA64 is NOT_X86.
+
 2009-11-18  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
diff -r 1daa0bb701a8 -r d5f77a4c9214 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch	Wed Nov 18 14:24:09 2009 +0000
+++ b/patches/icedtea-shark.patch	Wed Nov 18 10:56:39 2009 -0500
@@ -392,12 +392,8 @@ Index: openjdk/hotspot/src/share/vm/util
 ===================================================================
 --- openjdk.orig/ports/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:17:14.458064088 +0100
 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:19:18.097063844 +0100
-@@ -146,12 +146,14 @@
- #define NOT_WINDOWS(code) code
- #endif
- 
--#if defined(IA32) || defined(AMD64)
-+#if defined(IA32) || defined(IA64) || defined(AMD64)
+@@ -146,9 +146,11 @@
+ #if defined(IA32) || defined(AMD64)
  #define X86
  #define X86_ONLY(code) code
 +#define NOT_X86(code)


From gnu_andrew at member.fsf.org  Wed Nov 18 08:49:52 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 18 Nov 2009 16:49:52 +0000
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <4B037159.7000005@ubuntu.com>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>
	<4B0313D4.7050000@ubuntu.com>
	<17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>
	<4B037159.7000005@ubuntu.com>
Message-ID: <17c6771e0911180849x52cc04aau5cde037472d5fd2b@mail.gmail.com>

2009/11/18 Matthias Klose <doko at ubuntu.com>:
> On 17.11.2009 15:58, Andrew John Hughes wrote:
>>
>> 2009/11/17 Matthias Klose<doko at ubuntu.com>:
>>>
>>> On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
>>>>
>>>> changeset 9c090fa1a619 in /hg/icedtea
>>>> details:
>>>> http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
>>>> author: Andrew John Hughes<ahughes at redhat.com>
>>>> date: Tue Nov 17 19:31:54 2009 +0000
>>>>
>>>> ? ? ? ?Always checksum zips, even if specified with --with-alt-x.
>>>
>>> if I understand the patch correctly, then this is the wrong thing to do.
>>> distributions need to ship modified tarballs with binary files and files
>>> with questionalble licenses removed.
>>>
>>> ?Matthias
>>>
>>
>> Do we still have any? ?If so, we should be getting them removed upstream.
>
> is upstream willing to remove any prebuilt binaries from the tarballs?
>

Upstream in this case is the IcedTea forest i.e. me -- so yes :)

More seriously, I thought this had all been dealt with a couple of
years ago.  What you seem to be saying is that the issue has instead
been sidelined and you've worked around it by cutting your own
tarballs with bits cut out and thus presumably untested by the rest of
us.  That worries me to be honest and I think that's the bigger
problem to solve.

If you can point me to what these problem areas are, we can work on
removing them both in our trees and Sun's.

>> I don't think that's a justifiable reason to allow through potential
>> bogus zips; this patch avoids issues where the build then fails
>> because someone used an old zip.
>
> I honestly disagree; did you see any cases where this did go wrong?

In most cases, I produce a patch due to an issue and that was the case
here.  Not checking the existing tarballs was allowing an issue with
the HotSpot check to go unnoticed.  I've also had builds fail in the
past because my zips are outdated.  Given how long the IcedTea build
process is, I prefer to catch such errors sooner rather than later.

My use of the alternate zip options has always been to avoid a 50mb
download on every build.  I don't think it's practical to do repeated
builds any other way.  Clearly you're instead using them to use a
different tarball altogether, and that's not something I want to
support by default as such a tarball is not going to have been
subjected to the same amount of testing.

We can still support it, if necessary, via an additional option e.g.
--disable-checksums.

>
>> Worst case, you can change the checksum to match your modified tarball.
>
> If you really have to do this (which I disagree with), please only do this
> for tarballs which are not renamed, e.g. disable the check for anything
> which name differs from the "upstream" name.
>

That sounds too much like a hack; I think an additional option is
appropriate, if we deem it's needed.  Preferably, we need to fix the
underlying issue.

> ?Matthias
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From doko at ubuntu.com  Wed Nov 18 09:05:45 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Wed, 18 Nov 2009 11:05:45 -0600
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <17c6771e0911180849x52cc04aau5cde037472d5fd2b@mail.gmail.com>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>	
	<4B0313D4.7050000@ubuntu.com>	
	<17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>	
	<4B037159.7000005@ubuntu.com>
	<17c6771e0911180849x52cc04aau5cde037472d5fd2b@mail.gmail.com>
Message-ID: <4B042969.4010702@ubuntu.com>

On 18.11.2009 10:49, Andrew John Hughes wrote:
> 2009/11/18 Matthias Klose<doko at ubuntu.com>:
>> On 17.11.2009 15:58, Andrew John Hughes wrote:
>>>
>>> 2009/11/17 Matthias Klose<doko at ubuntu.com>:
>>>>
>>>> On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
>>>>>
>>>>> changeset 9c090fa1a619 in /hg/icedtea
>>>>> details:
>>>>> http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
>>>>> author: Andrew John Hughes<ahughes at redhat.com>
>>>>> date: Tue Nov 17 19:31:54 2009 +0000
>>>>>
>>>>>         Always checksum zips, even if specified with --with-alt-x.
>>>>
>>>> if I understand the patch correctly, then this is the wrong thing to do.
>>>> distributions need to ship modified tarballs with binary files and files
>>>> with questionalble licenses removed.
>>>>
>>>>   Matthias
>>>>
>>>
>>> Do we still have any?  If so, we should be getting them removed upstream.
>>
>> is upstream willing to remove any prebuilt binaries from the tarballs?
>>
>
> Upstream in this case is the IcedTea forest i.e. me -- so yes :)
>
> More seriously, I thought this had all been dealt with a couple of
> years ago.  What you seem to be saying is that the issue has instead
> been sidelined and you've worked around it by cutting your own
> tarballs with bits cut out and thus presumably untested by the rest of
> us.  That worries me to be honest and I think that's the bigger
> problem to solve.
>
> If you can point me to what these problem areas are, we can work on
> removing them both in our trees and Sun's.

see fsg.sh.

>>> I don't think that's a justifiable reason to allow through potential
>>> bogus zips; this patch avoids issues where the build then fails
>>> because someone used an old zip.
>>
>> I honestly disagree; did you see any cases where this did go wrong?
>
> In most cases, I produce a patch due to an issue and that was the case
> here.  Not checking the existing tarballs was allowing an issue with
> the HotSpot check to go unnoticed.  I've also had builds fail in the
> past because my zips are outdated.  Given how long the IcedTea build
> process is, I prefer to catch such errors sooner rather than later.
>
> My use of the alternate zip options has always been to avoid a 50mb
> download on every build.

there are other ways to ensure this, like using a proxy.

> I don't think it's practical to do repeated
> builds any other way.  Clearly you're instead using them to use a
> different tarball altogether, and that's not something I want to
> support by default as such a tarball is not going to have been
> subjected to the same amount of testing.

yes, and that's the way that *all* distributions do the build, using local 
archives without accessing the web, even the fedora build does modify those:

http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=markup

> We can still support it, if necessary, via an additional option e.g.
> --disable-checksums.
>
>>
>>> Worst case, you can change the checksum to match your modified tarball.
>>
>> If you really have to do this (which I disagree with), please only do this
>> for tarballs which are not renamed, e.g. disable the check for anything
>> which name differs from the "upstream" name.
>>
>
> That sounds too much like a hack; I think an additional option is
> appropriate, if we deem it's needed.  Preferably, we need to fix the
> underlying issue.

the underlying issue are distribution builds, and that distributions do modify / 
use different tarballs from time to time. please don't enforce your development 
centric view on packagers.

If you think that the unversioned tarball downloads lead to confusion, then 
maybe just rename these tarballs to include the revision/version number and 
don't use the unversioned ones.

   Matthias


From gnu_andrew at member.fsf.org  Wed Nov 18 10:02:25 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 18 Nov 2009 18:02:25 +0000
Subject: /hg/icedtea: 3 new changesets
In-Reply-To: <4B042969.4010702@ubuntu.com>
References: <hg.9c090fa1a619.1258487088.-6899778133799504387@icedtea.classpath.org>
	<4B0313D4.7050000@ubuntu.com>
	<17c6771e0911171358v206c685ch580e236ec81b154f@mail.gmail.com>
	<4B037159.7000005@ubuntu.com>
	<17c6771e0911180849x52cc04aau5cde037472d5fd2b@mail.gmail.com>
	<4B042969.4010702@ubuntu.com>
Message-ID: <17c6771e0911181002v394e71e0ob54eeb5666b451c0@mail.gmail.com>

2009/11/18 Matthias Klose <doko at ubuntu.com>:
> On 18.11.2009 10:49, Andrew John Hughes wrote:
>>
>> 2009/11/18 Matthias Klose<doko at ubuntu.com>:
>>>
>>> On 17.11.2009 15:58, Andrew John Hughes wrote:
>>>>
>>>> 2009/11/17 Matthias Klose<doko at ubuntu.com>:
>>>>>
>>>>> On 17.11.2009 13:44, andrew at icedtea.classpath.org wrote:
>>>>>>
>>>>>> changeset 9c090fa1a619 in /hg/icedtea
>>>>>> details:
>>>>>>
>>>>>> http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
>>>>>> author: Andrew John Hughes<ahughes at redhat.com>
>>>>>> date: Tue Nov 17 19:31:54 2009 +0000
>>>>>>
>>>>>> ? ? ? ?Always checksum zips, even if specified with --with-alt-x.
>>>>>
>>>>> if I understand the patch correctly, then this is the wrong thing to
>>>>> do.
>>>>> distributions need to ship modified tarballs with binary files and
>>>>> files
>>>>> with questionalble licenses removed.
>>>>>
>>>>> ?Matthias
>>>>>
>>>>
>>>> Do we still have any? ?If so, we should be getting them removed
>>>> upstream.
>>>
>>> is upstream willing to remove any prebuilt binaries from the tarballs?
>>>
>>
>> Upstream in this case is the IcedTea forest i.e. me -- so yes :)
>>
>> More seriously, I thought this had all been dealt with a couple of
>> years ago. ?What you seem to be saying is that the issue has instead
>> been sidelined and you've worked around it by cutting your own
>> tarballs with bits cut out and thus presumably untested by the rest of
>> us. ?That worries me to be honest and I think that's the bigger
>> problem to solve.
>>
>> If you can point me to what these problem areas are, we can work on
>> removing them both in our trees and Sun's.
>
> see fsg.sh.
>

Some of this is outdated.

I've removed the binaries that still exist:
http://hg.openjdk.java.net/icedtea/jdk7/jdk/rev/f80cf2e0eb9c

The 'questionable license headers' need further examination.  Do you
have any more information on these? Why are they questionable?

>>>> I don't think that's a justifiable reason to allow through potential
>>>> bogus zips; this patch avoids issues where the build then fails
>>>> because someone used an old zip.
>>>
>>> I honestly disagree; did you see any cases where this did go wrong?
>>
>> In most cases, I produce a patch due to an issue and that was the case
>> here. ?Not checking the existing tarballs was allowing an issue with
>> the HotSpot check to go unnoticed. ?I've also had builds fail in the
>> past because my zips are outdated. ?Given how long the IcedTea build
>> process is, I prefer to catch such errors sooner rather than later.
>>
>> My use of the alternate zip options has always been to avoid a 50mb
>> download on every build.
>
> there are other ways to ensure this, like using a proxy.
>

That sounds like using a sledgehammer to crack a nut; it's a
convoluted solution for what is a simple problem already remedied by
existing means.

>> I don't think it's practical to do repeated
>> builds any other way. ?Clearly you're instead using them to use a
>> different tarball altogether, and that's not something I want to
>> support by default as such a tarball is not going to have been
>> subjected to the same amount of testing.
>
> yes, and that's the way that *all* distributions do the build, using local
> archives without accessing the web, even the fedora build does modify those:
>
> http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=markup
>

I don't have a problem with local archives; as I say that's what I'm using.
This particular need to modify them could have been dealt with ages ago.

>> We can still support it, if necessary, via an additional option e.g.
>> --disable-checksums.
>>
>>>
>>>> Worst case, you can change the checksum to match your modified tarball.
>>>
>>> If you really have to do this (which I disagree with), please only do
>>> this
>>> for tarballs which are not renamed, e.g. disable the check for anything
>>> which name differs from the "upstream" name.
>>>
>>
>> That sounds too much like a hack; I think an additional option is
>> appropriate, if we deem it's needed. ?Preferably, we need to fix the
>> underlying issue.
>
> the underlying issue are distribution builds, and that distributions do
> modify / use different tarballs from time to time. please don't enforce your
> development centric view on packagers.
>

No, the underlying issue I'm referring to here is that there are
binaries and badly licensed files in the OpenJDK source tree that
should be removed upstream.

I'm not trying to enforce anything.  I'm try to work out the best way
to handle this so that all possibilities can be appropriately dealt
with.  As I said in my last e-mail, we can add an option to disable
the checksumming, which then allows the user to acknowledge that they
want to use a non-standard tarball.  Please don't turn a discussion
into an argument.

> If you think that the unversioned tarball downloads lead to confusion, then
> maybe just rename these tarballs to include the revision/version number and
> don't use the unversioned ones.
>
> ?Matthias
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 18 13:10:47 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 18 Nov 2009 21:10:47 +0000
Subject: [Bug 409] New: Hi,
	arduino is crashing when trying to read from the serial port. The
	following report has been created (see below). Thank you very
	very much!!!
Message-ID: <E1NArnb-0003lV-2m@icedtea.classpath.org>

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

           Summary: Hi, arduino is crashing when trying to read from the
                    serial port. The following report has been created (see
                    below). Thank you very very much!!!
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P1
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: festhead at gmail.com


#
# An unexpected error has been detected by Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x00007f09995c1383, pid=22017, tid=139679285602640
#
# Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode linux-amd64)
# Problematic frame:
# C  [librxtxSerial-2.1-7.so+0x8383]  read_byte_array+0x43
#
# If you would like to submit a bug report, please visit:
#   http://icedtea.classpath.org/bugzilla
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

---------------  T H R E A D  ---------------

Current thread (0x0000000001ebc400):  JavaThread "Thread-420"
[_thread_in_native, id=23129, stack(0x00007f099e236000,0x00007f099e337000)]

siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR),
si_addr=0xffffffff9e335a48

Registers:
RAX=0xffffffff9e335a40, RBX=0x0000000000000013, RCX=0x0000000000000001,
RDX=0x00007f09cd3a9400
RSP=0x00007f099e335170, RBP=0x0000000001ebc598, RSI=0x00007f09995c3490,
RDI=0x00000000ffffffff
R8 =0x00007f09a64c0b9c, R9 =0x00007f09bf2f88a0, R10=0x0000000000000182,
R11=0x00007f09cd3ad430
R12=0x0000000000000104, R13=0x00007f09a64c3af8, R14=0x00007f099e335350,
R15=0x0000000001ebc400
RIP=0x00007f09995c1383, EFL=0x0000000000010202, CSGSFS=0x0000000000000033,
ERR=0x0000000000000005
  TRAPNO=0x000000000000000e

Top of Stack: (sp=0x00007f099e335170)
0x00007f099e335170:   00007f099e3351d0 00007f099e3351e0
0x00007f099e335180:   00007f099e3351c0 00007f09ccd2b823
0x00007f099e335190:   00007f09a0845920 0000000001ebc400
0x00007f099e3351a0:   00000001ffffffff 00007f099e3352c7
0x00007f099e3351b0:   0000001301ebc400 0000000000000102
0x00007f099e3351c0:   00007f09995ba218 00007f09a0008c30
0x00007f099e3351d0:   00007f099e335230 ffffffff9e335a40
0x00007f099e3351e0:   0000002100000002 000000000020d2a0
0x00007f099e3351f0:   0000000000000104 00007f09a64c3af8
0x00007f099e335200:   00007f099e335350 0000000001ebc400
0x00007f099e335210:   00007f09995b9000 00007f09cdf6312a
0x00007f099e335220:   00007f0900000005 0000000000000000
0x00007f099e335230:   0000000001ebc400 00007f09cceba41b
0x00007f099e335240:   00007f09995ba218 0000000000000013
0x00007f099e335250:   0000000001ebc598 00007f09cdf68fd2
0x00007f099e335260:   ffffffffffffffff 00007f099e3352c7
0x00007f099e335270:   0000000000000013 0000000000000013
0x00007f099e335280:   0000000001ebc598 0000000000000104
0x00007f099e335290:   00007f09a64c3af8 00007f099e335350
0x00007f099e3352a0:   0000000001ebc400 00007f09995c1958
0x00007f099e3352b0:   00007f099e335350 00007f099e335350
0x00007f099e3352c0:   00007f099e335330 00007f09a64c3b00
0x00007f099e3352d0:   00007f099e335330 00007f09c8520878
0x00007f099e3352e0:   0000000001ebc400 00007f09c852acc3
0x00007f099e3352f0:   00007f099e3352f0 00007f09a64c3af8
0x00007f099e335300:   00007f099e335350 00007f09a6b40108
0x00007f099e335310:   0000000000000000 00007f09a64c3b00
0x00007f099e335320:   0000000000000000 00007f099e335350
0x00007f099e335330:   00007f099e3353a8 00007f09c851504e
0x00007f099e335340:   0000000000000000 00007f09c851d0d6
0x00007f099e335350:   00007f09bf2f88a0 00007f09a031ffc0
0x00007f099e335360:   00007f09bf2f8970 00007f099e335358 

Instructions: (pc=0x00007f09995c1383)
0x00007f09995c1373:   24 30 e8 66 b6 ff ff 8b 7c 24 30 48 89 44 24 68
0x00007f09995c1383:   8b 40 08 48 8b 54 24 68 48 c7 44 24 58 00 00 00 

Stack: [0x00007f099e236000,0x00007f099e337000],  sp=0x00007f099e335170,  free
space=1020k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  [librxtxSerial-2.1-7.so+0x8383]  read_byte_array+0x43

Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::StubRoutines (1)
v  ~BufferBlob::Interpreter
v  ~BufferBlob::Interpreter
v  ~BufferBlob::StubRoutines (1)

---------------  P R O C E S S  ---------------

Java Threads: ( => current thread )
=>0x0000000001ebc400 JavaThread "Thread-420" [_thread_in_native, id=23129,
stack(0x00007f099e236000,0x00007f099e337000)]
  0x0000000001c3c000 JavaThread "DestroyJavaVM" [_thread_blocked, id=22018,
stack(0x00007f09ce04d000,0x00007f09ce14e000)]
  0x00000000021ab400 JavaThread "AWT-EventQueue-0" [_thread_blocked, id=22041,
stack(0x00007f0998f48000,0x00007f0999049000)]
  0x0000000002060c00 JavaThread "AWT-Shutdown" [_thread_blocked, id=22040,
stack(0x00007f0999049000,0x00007f099914a000)]
  0x000000000213e400 JavaThread "TimerQueue" daemon [_thread_blocked, id=22037,
stack(0x00007f09994b8000,0x00007f09995b9000)]
  0x0000000001f90000 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=22031,
stack(0x00007f099e337000,0x00007f099e438000)]
  0x0000000001de8400 JavaThread "Java2D Disposer" daemon [_thread_blocked,
id=22030, stack(0x00007f09a4049000,0x00007f09a414a000)]
  0x0000000001ce2800 JavaThread "Low Memory Detector" daemon [_thread_blocked,
id=22028, stack(0x00007f09a4977000,0x00007f09a4a78000)]
  0x0000000001ce0000 JavaThread "CompilerThread1" daemon [_thread_blocked,
id=22027, stack(0x00007f09a4a78000,0x00007f09a4b79000)]
  0x0000000001cde800 JavaThread "CompilerThread0" daemon [_thread_in_native,
id=22026, stack(0x00007f09a4b79000,0x00007f09a4c7a000)]
  0x0000000001cdd000 JavaThread "Signal Dispatcher" daemon [_thread_blocked,
id=22025, stack(0x00007f09a4c7a000,0x00007f09a4d7b000)]
  0x0000000001caf000 JavaThread "Finalizer" daemon [_thread_blocked, id=22024,
stack(0x00007f09a4ebd000,0x00007f09a4fbe000)]
  0x0000000001cad800 JavaThread "Reference Handler" daemon [_thread_blocked,
id=22023, stack(0x00007f09a4fbe000,0x00007f09a50bf000)]

Other Threads:
  0x0000000001ca8400 VMThread [stack: 0x00007f09a50bf000,0x00007f09a51c0000]
[id=22022]
  0x0000000001cec800 WatcherThread [stack:
0x00007f09a4876000,0x00007f09a4977000] [id=22029]

VM state:not at safepoint (normal execution)

VM Mutex/Monitor currently owned by a thread: None

Heap
 PSYoungGen      total 42688K, used 13243K [0x00007f09be7c0000,
0x00007f09c1930000, 0x00007f09c8510000)
  eden space 41600K, 29% used
[0x00007f09be7c0000,0x00007f09bf3aadd0,0x00007f09c1060000)
  from space 1088K, 95% used
[0x00007f09c1820000,0x00007f09c1924018,0x00007f09c1930000)
  to   space 2624K, 0% used
[0x00007f09c1410000,0x00007f09c1410000,0x00007f09c16a0000)
 PSOldGen        total 20160K, used 7849K [0x00007f09aad10000,
0x00007f09ac0c0000, 0x00007f09be7c0000)
  object space 20160K, 38% used
[0x00007f09aad10000,0x00007f09ab4ba618,0x00007f09ac0c0000)
 PSPermGen       total 27584K, used 18886K [0x00007f09a5910000,
0x00007f09a7400000, 0x00007f09aad10000)
  object space 27584K, 68% used
[0x00007f09a5910000,0x00007f09a6b81af8,0x00007f09a7400000)

Dynamic libraries:
00400000-00408000 r-xp 00000000 08:07 148262                            
/usr/lib/jvm/java-6-openjdk/jre/bin/java
00608000-00609000 rw-p 00008000 08:07 148262                            
/usr/lib/jvm/java-6-openjdk/jre/bin/java
01c33000-02f48000 rw-p 01c33000 00:00 0                                  [heap]
7f0998737000-7f099873c000 r-xp 00000000 08:07 410210                    
/lib/libnss_dns-2.9.so
7f099873c000-7f099893b000 ---p 00005000 08:07 410210                    
/lib/libnss_dns-2.9.so
7f099893b000-7f099893c000 r--p 00004000 08:07 410210                    
/lib/libnss_dns-2.9.so
7f099893c000-7f099893d000 rw-p 00005000 08:07 410210                    
/lib/libnss_dns-2.9.so
7f099893d000-7f099893f000 r-xp 00000000 08:07 410157                    
/lib/libnss_mdns4_minimal.so.2
7f099893f000-7f0998b3e000 ---p 00002000 08:07 410157                    
/lib/libnss_mdns4_minimal.so.2
7f0998b3e000-7f0998b3f000 rw-p 00001000 08:07 410157                    
/lib/libnss_mdns4_minimal.so.2
7f0998b72000-7f0998b75000 rwxp 7f0998b72000 00:00 0 
7f0998b75000-7f0998c73000 rwxp 7f0998b75000 00:00 0 
7f0998c73000-7f0998c76000 rwxp 7f0998c73000 00:00 0 
7f0998c76000-7f0998d74000 rwxp 7f0998c76000 00:00 0 
7f0998d74000-7f0998dd4000 rw-s 00000000 00:08 42467351                  
/SYSV00000000 (deleted)
7f0998e46000-7f0998e49000 rwxp 7f0998e46000 00:00 0 
7f0998e49000-7f0998f47000 rwxp 7f0998e49000 00:00 0 
7f0998f48000-7f0998f4b000 ---p 7f0998f48000 00:00 0 
7f0998f4b000-7f0999049000 rwxp 7f0998f4b000 00:00 0 
7f0999049000-7f099904c000 ---p 7f0999049000 00:00 0 
7f099904c000-7f099914a000 rwxp 7f099904c000 00:00 0 
7f099947d000-7f0999498000 rw-s 00000000 00:08 45187106                  
/SYSV00000000 (deleted)
7f09994b8000-7f09994bb000 ---p 7f09994b8000 00:00 0 
7f09994bb000-7f09995b9000 rwxp 7f09994bb000 00:00 0 
7f09995b9000-7f09995c6000 r-xp 00000000 08:07 30557                     
/usr/lib/librxtxSerial-2.1-7.so
7f09995c6000-7f09997c6000 ---p 0000d000 08:07 30557                     
/usr/lib/librxtxSerial-2.1-7.so
7f09997c6000-7f09997c7000 rw-p 0000d000 08:07 30557                     
/usr/lib/librxtxSerial-2.1-7.so
7f09997c7000-7f09997d4000 r--p 00000000 08:07 420385                    
/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf
7f09997d4000-7f09997e5000 r--p 00000000 08:07 420378                    
/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf
7f09997e5000-7f09997e7000 r-xp 00000000 08:07 599861                    
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so
7f09997e7000-7f09999e6000 ---p 00002000 08:07 599861                    
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so
7f09999e6000-7f09999e7000 rw-p 00001000 08:07 599861                    
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so
7f09999e7000-7f09999f0000 r--s 00000000 08:07 86758                     
/var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86-64.cache-2
7f09999f0000-7f09999f2000 r--s 00000000 08:07 87906                     
/var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86-64.cache-2
7f09999f2000-7f09999f6000 r--s 00000000 08:07 87905                     
/var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86-64.cache-2
7f09999f6000-7f09999f7000 r--s 00000000 08:07 87904                     
/var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86-64.cache-2
7f09999f7000-7f09999f9000 r--s 00000000 08:07 87903                     
/var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86-64.cache-2
7f09999f9000-7f09999fc000 r--s 00000000 08:07 87902                     
/var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86-64.cache-2
7f09999fc000-7f0999a00000 r--s 00000000 08:07 87901                     
/var/cache/fontconfig/6eb3985aa4124903f6ff08ba781cd364-x86-64.cache-2
7f0999a00000-7f0999a03000 r--s 00000000 08:07 87900                     
/var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86-64.cache-2
7f0999a03000-7f0999a06000 r--s 00000000 08:07 87899                     
/var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86-64.cache-2
7f0999a06000-7f0999a0a000 r--s 00000000 08:07 87898                     
/var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86-64.cache-2
7f0999a0a000-7f0999a13000 r--s 00000000 08:07 87888                     
/var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86-64.cache-2
7f0999a13000-7f0999a16000 r--s 00000000 08:07 87897                     
/var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86-64.cache-2
7f0999a16000-7f0999a19000 r--s 00000000 08:07 87896                     
/var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86-64.cache-2
7f0999a19000-7f0999a1b000 r--s 00000000 08:07 87895                     
/var/cache/fontconfig/ddd4086aec35a5275babba44bb759c3c-x86-64.cache-2
7f0999a1b000-7f0999a1c000 r--s 00000000 08:07 87894                     
/var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86-64.cache-2
7f0999a1c000-7f0999a1e000 r--s 00000000 08:07 87893                     
/var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86-64.cache-2
7f0999a1e000-7f0999a22000 r--s 00000000 08:07 87892                     
/var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86-64.cache-2
7f0999a22000-7f0999a29000 r--s 00000000 08:07 87889                     
/var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86-64.cache-2
7f0999a29000-7f0999a2b000 r--s 00000000 08:07 86762                     
/var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86-64.cache-2
7f0999a2b000-7f0999a33000 r-xp 00000000 08:07 148248                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnio.so
7f0999a33000-7f0999c32000 ---p 00008000 08:07 148248                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnio.so
7f0999c32000-7f0999c33000 rw-p 00007000 08:07 148248                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnio.so
7f0999c33000-7f0999c48000 r-xp 00000000 08:07 148241                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnet.so
7f0999c48000-7f0999e47000 ---p 00015000 08:07 148241                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnet.so
7f0999e47000-7f0999e48000 rw-p 00014000 08:07 148241                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libnet.so
7f0999e48000-7f0999e7c000 r-xp 00000000 08:07 609759                    
/usr/lib/gtk-2.0/2.10.0/engines/libsmooth.so
7f0999e7c000-7f099a07c000 ---p 00034000 08:07 609759                    
/usr/lib/gtk-2.0/2.10.0/engines/libsmooth.so
7f099a07c000-7f099a07d000 rw-p 00034000 08:07 609759                    
/usr/lib/gtk-2.0/2.10.0/engines/libsmooth.so
7f099a07d000-7f099a0a3000 r--p 00000000 08:07 53432                     
/usr/share/locale/nl/LC_MESSAGES/gtk20-properties.mo
7f099a0a3000-7f099a0ca000 r-xp 00000000 08:07 480370                    
/usr/lib/libexpat.so.1.5.2
7f099a0ca000-7f099a2ca000 ---p 00027000 08:07 480370                    
/usr/lib/libexpat.so.1.5.2
7f099a2ca000-7f099a2cc000 rw-p 00027000 08:07 480370                    
/usr/lib/libexpat.so.1.5.2
7f099a2cc000-7f099a2e7000 r-xp 00000000 08:07 447283                    
/lib/libselinux.so.1
7f099a2e7000-7f099a4e7000 ---p 0001b000 08:07 447283                    
/lib/libselinux.so.1
7f099a4e7000-7f099a4e8000 r--p 0001b000 08:07 447283                    
/lib/libselinux.so.1
7f099a4e8000-7f099a4e9000 rw-p 0001c000 08:07 447283                    
/lib/libselinux.so.1
7f099a4e9000-7f099a4ea000 rw-p 7f099a4e9000 00:00 0 
7f099a4ea000-7f099a4fd000 r-xp 00000000 08:07 410291                    
/lib/libresolv-2.9.so
7f099a4fd000-7f099a6fd000 ---p 00013000 08:07 410291                    
/lib/libresolv-2.9.so
7f099a6fd000-7f099a6fe000 r--p 00013000 08:07 410291                    
/lib/libresolv-2.9.so
7f099a6fe000-7f099a6ff000 rw-p 00014000 08:07 410291                    
/lib/libresolv-2.9.so
7f099a6ff000-7f099a701000 rw-p 7f099a6ff000 00:00 0 
7f099a701000-7f099a730000 r-xp 00000000 08:07 476454                    
/usr/lib/libpcre.so.3.12.1
7f099a730000-7f099a92f000 ---p 0002f000 08:07 476454                    
/usr/lib/libpcre.so.3.12.1
7f099a92f000-7f099a930000 rw-p 0002e000 08:07 476454                    
/usr/lib/libpcre.so.3.12.1
7f099a930000-7f099a937000 r-xp 00000000 08:07 481663                    
/usr/lib/libxcb-render.so.0.0.0
7f099a937000-7f099ab37000 ---p 00007000 08:07 481663                    
/usr/lib/libxcb-render.so.0.0.0
7f099ab37000-7f099ab38000 rw-p 00007000 08:07 481663                    
/usr/lib/libxcb-render.so.0.0.0
7f099ab38000-7f099ab3b000 r-xp 00000000 08:07 95240                     
/usr/lib/libxcb-render-util.so.0.0.0
7f099ab3b000-7f099ad3a000 ---p 00003000 08:07 95240                     
/usr/lib/libxcb-render-util.so.0.0.0
7f099ad3a000-7f099ad3b000 rw-p 00002000 08:07 95240                     
/usr/lib/libxcb-render-util.so.0.0.0
7f099ad3b000-7f099ad60000 r-xp 00000000 08:07 480354                    
/usr/lib/libpng12.so.0.27.0
7f099ad60000-7f099af5f000 ---p 00025000 08:07 480354                    
/usr/lib/libpng12.so.0.27.0
7f099af5f000-7f099af60000 rw-p 00024000 08:07 480354                    
/usr/lib/libpng12.so.0.27.0
7f099af60000-7f099af76000 r-xp 00000000 08:07 95248                     
/usr/lib/libdirect-1.2.so.0.8.0
7f099af76000-7f099b175000 ---p 00016000 08:07 95248                     
/usr/lib/libdirect-1.2.so.0.8.0
7f099b175000-7f099b176000 rw-p 00015000 08:07 95248                     
/usr/lib/libdirect-1.2.so.0.8.0
7f099b176000-7f099b177000 rw-p 7f099b176000 00:00 0 
7f099b177000-7f099b180000 r-xp 00000000 08:07 95246                     
/usr/lib/libfusion-1.2.so.0.8.0
7f099b180000-7f099b380000 ---p 00009000 08:07 95246                     
/usr/lib/libfusion-1.2.so.0.8.0
7f099b380000-7f099b381000 rw-p 00009000 08:07 95246                     
/usr/lib/libfusion-1.2.so.0.8.0
7f099b381000-7f099b3ff000 r-xp 00000000 08:07 95247                     
/usr/lib/libdirectfb-1.2.so.0.8.0
7f099b3ff000-7f099b5fe000 ---p 0007e000 08:07 95247                     
/usr/lib/libdirectfb-1.2.so.0.8.0
7f099b5fe000-7f099b602000 rw-p 0007d000 08:07 95247                     
/usr/lib/libdirectfb-1.2.so.0.8.0
7f099b602000-7f099b645000 r-xp 00000000 08:07 95236                     
/usr/lib/libpixman-1.so.0.14.0
7f099b645000-7f099b844000 ---p 00043000 08:07 95236                     
/usr/lib/libpixman-1.so.0.14.0
7f099b844000-7f099b847000 rw-p 00042000 08:07 95236                     
/usr/lib/libpixman-1.so.0.14.0
7f099b847000-7f099b84f000 r-xp 00000000 08:07 650900                    
/usr/lib/libXrandr.so.2.2.0
7f099b84f000-7f099ba4e000 ---p 00008000 08:07 650900                    
/usr/lib/libXrandr.so.2.2.0
7f099ba4e000-7f099ba4f000 rw-p 00007000 08:07 650900                    
/usr/lib/libXrandr.so.2.2.0
7f099ba4f000-7f099ba51000 r-xp 00000000 08:07 481025                    
/usr/lib/libXinerama.so.1.0.0
7f099ba51000-7f099bc50000 ---p 00002000 08:07 481025                    
/usr/lib/libXinerama.so.1.0.0
7f099bc50000-7f099bc51000 rw-p 00001000 08:07 481025                    
/usr/lib/libXinerama.so.1.0.0
7f099bc51000-7f099bd15000 r-xp 00000000 08:07 410198                    
/lib/libglib-2.0.so.0.2200.2
7f099bd15000-7f099bf14000 ---p 000c4000 08:07 410198                    
/lib/libglib-2.0.so.0.2200.2
7f099bf14000-7f099bf16000 rw-p 000c3000 08:07 410198                    
/lib/libglib-2.0.so.0.2200.2
7f099bf16000-7f099bf19000 r-xp 00000000 08:07 30676                     
/usr/lib/libgmodule-2.0.so.0.2200.2
7f099bf19000-7f099c118000 ---p 00003000 08:07 30676                     
/usr/lib/libgmodule-2.0.so.0.2200.2
7f099c118000-7f099c119000 rw-p 00002000 08:07 30676                     
/usr/lib/libgmodule-2.0.so.0.2200.2
7f099c119000-7f099c15c000 r-xp 00000000 08:07 30683                     
/usr/lib/libgobject-2.0.so.0.2200.2
7f099c15c000-7f099c35c000 ---p 00043000 08:07 30683                     
/usr/lib/libgobject-2.0.so.0.2200.2
7f099c35c000-7f099c35e000 rw-p 00043000 08:07 30683                     
/usr/lib/libgobject-2.0.so.0.2200.2
7f099c35e000-7f099c38e000 r-xp 00000000 08:07 480414                    
/usr/lib/libfontconfig.so.1.3.0
7f099c38e000-7f099c58d000 ---p 00030000 08:07 480414                    
/usr/lib/libfontconfig.so.1.3.0
7f099c58d000-7f099c58f000 rw-p 0002f000 08:07 480414                    
/usr/lib/libfontconfig.so.1.3.0
7f099c58f000-7f099c5d7000 r-xp 00000000 08:07 95218                     
/usr/lib/libpango-1.0.so.0.2400.5
7f099c5d7000-7f099c7d7000 ---p 00048000 08:07 95218                     
/usr/lib/libpango-1.0.so.0.2400.5
7f099c7d7000-7f099c7da000 rw-p 00048000 08:07 95218                     
/usr/lib/libpango-1.0.so.0.2400.5
7f099c7da000-7f099c807000 r-xp 00000000 08:07 95226                     
/usr/lib/libpangoft2-1.0.so.0.2400.5
7f099c807000-7f099ca07000 ---p 0002d000 08:07 95226                     
/usr/lib/libpangoft2-1.0.so.0.2400.5
7f099ca07000-7f099ca08000 rw-p 0002d000 08:07 95226                     
/usr/lib/libpangoft2-1.0.so.0.2400.5
7f099ca08000-7f099caae000 r-xp 00000000 08:07 30678                     
/usr/lib/libgio-2.0.so.0.2200.2
7f099caae000-7f099ccad000 ---p 000a6000 08:07 30678                     
/usr/lib/libgio-2.0.so.0.2200.2
7f099ccad000-7f099ccb0000 rw-p 000a5000 08:07 30678                     
/usr/lib/libgio-2.0.so.0.2200.2
7f099ccb0000-7f099ccb1000 rw-p 7f099ccb0000 00:00 0 
7f099ccb1000-7f099cd2f000 r-xp 00000000 08:07 95253                     
/usr/lib/libcairo.so.2.10800.8
7f099cd2f000-7f099cf2f000 ---p 0007e000 08:07 95253                     
/usr/lib/libcairo.so.2.10800.8
7f099cf2f000-7f099cf32000 rw-p 0007e000 08:07 95253                     
/usr/lib/libcairo.so.2.10800.8
7f099cf32000-7f099cf50000 r-xp 00000000 08:07 481672                    
/usr/lib/libatk-1.0.so.0.2209.1
7f099cf50000-7f099d150000 ---p 0001e000 08:07 481672                    
/usr/lib/libatk-1.0.so.0.2209.1
7f099d150000-7f099d153000 rw-p 0001e000 08:07 481672                    
/usr/lib/libatk-1.0.so.0.2209.1
7f099d153000-7f099d155000 r-xp 00000000 08:07 481017                    
/usr/lib/libXdamage.so.1.1.0
7f099d155000-7f099d354000 ---p 00002000 08:07 481017                    
/usr/lib/libXdamage.so.1.1.0
7f099d354000-7f099d355000 rw-p 00001000 08:07 481017                    
/usr/lib/libXdamage.so.1.1.0
7f099d355000-7f099d357000 r-xp 00000000 08:07 481821                    
/usr/lib/libXcomposite.so.1.0.0
7f099d357000-7f099d556000 ---p 00002000 08:07 481821                    
/usr/lib/libXcomposite.so.1.0.0
7f099d556000-7f099d557000 rw-p 00001000 08:07 481821                    
/usr/lib/libXcomposite.so.1.0.0
7f099d557000-7f099d562000 r-xp 00000000 08:07 95220                     
/usr/lib/libpangocairo-1.0.so.0.2400.5
7f099d562000-7f099d762000 ---p 0000b000 08:07 95220                     
/usr/lib/libpangocairo-1.0.so.0.2400.5
7f099d762000-7f099d763000 rw-p 0000b000 08:07 95220                     
/usr/lib/libpangocairo-1.0.so.0.2400.5
7f099d763000-7f099d80a000 r-xp 00000000 08:07 221575                    
/usr/lib/libgdk-x11-2.0.so.0.1800.3
7f099d80a000-7f099da0a000 ---p 000a7000 08:07 221575                    
/usr/lib/libgdk-x11-2.0.so.0.1800.3
7f099da0a000-7f099da0f000 rw-p 000a7000 08:07 221575                    
/usr/lib/libgdk-x11-2.0.so.0.1800.3
7f099da0f000-7f099da2a000 r-xp 00000000 08:07 221576                    
/usr/lib/libgdk_pixbuf-2.0.so.0.1800.3
7f099da2a000-7f099dc29000 ---p 0001b000 08:07 221576                    
/usr/lib/libgdk_pixbuf-2.0.so.0.1800.3
7f099dc29000-7f099dc2a000 rw-p 0001a000 08:07 221576                    
/usr/lib/libgdk_pixbuf-2.0.so.0.1800.3
7f099dc2a000-7f099e02a000 r-xp 00000000 08:07 221574                    
/usr/lib/libgtk-x11-2.0.so.0.1800.3
7f099e02a000-7f099e229000 ---p 00400000 08:07 221574                    
/usr/lib/libgtk-x11-2.0.so.0.1800.3
7f099e229000-7f099e234000 rw-p 003ff000 08:07 221574                    
/usr/lib/libgtk-x11-2.0.so.0.1800.3
7f099e234000-7f099e236000 rw-p 7f099e234000 00:00 0 
7f099e236000-7f099e239000 ---p 7f099e236000 00:00 0 
7f099e239000-7f099e337000 rwxp 7f099e239000 00:00 0 
7f099e337000-7f099e33a000 ---p 7f099e337000 00:00 0 
7f099e33a000-7f099e438000 rwxp 7f099e33a000 00:00 0 
7f099e438000-7f099e43d000 r-xp 00000000 08:07 480802                    
/usr/lib/libXfixes.so.3.1.0
7f099e43d000-7f099e53c000 ---p 00005000 08:07 480802                    
/usr/lib/libXfixes.so.3.1.0
7f099e53c000-7f099e53d000 rw-p 00004000 08:07 480802                    
/usr/lib/libXfixes.so.3.1.0
7f099e53d000-7f099e546000 r--s 00000000 08:07 86758                     
/var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86-64.cache-2
7f099e546000-7f099e548000 r--s 00000000 08:07 87906                     
/var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86-64.cache-2
7f099e548000-7f099e54c000 r--s 00000000 08:07 87905                     
/var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86-64.cache-2
7f099e54c000-7f099e54e000 r--s 00000000 08:07 87903                     
/var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86-64.cache-2
7f099e54e000-7f099e551000 r--s 00000000 08:07 87902                     
/var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86-64.cache-2
7f099e551000-7f099e555000 r--s 00000000 08:07 87901                     
/var/cache/fontconfig/6eb3985aa4124903f6ff08ba781cd364-x86-64.cache-2
7f099e555000-7f099e558000 r--s 00000000 08:07 87900                     
/var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86-64.cache-2
7f099e558000-7f099e55b000 r--s 00000000 08:07 87899                     
/var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86-64.cache-2
7f099e55b000-7f099e55f000 r--s 00000000 08:07 87898                     
/var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86-64.cache-2
7f099e55f000-7f099e568000 r--s 00000000 08:07 87888                     
/var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86-64.cache-2
7f099e568000-7f099e56b000 r--s 00000000 08:07 87897                     
/var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86-64.cache-2
7f099e56b000-7f099e56e000 r--s 00000000 08:07 87896                     
/var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86-64.cache-2
7f099e56e000-7f099e570000 r--s 00000000 08:07 87895                     
/var/cache/fontconfig/ddd4086aec35a5275babba44bb759c3c-x86-64.cache-2
7f099e570000-7f099e571000 rw-p 7f099e570000 00:00 0 
7f099e571000-7f099e574000 r--s 00000000 08:07 86754                     
/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-x86-64.cache-2
7f099e574000-7f099e595000 r--p 00000000 08:07 476411                    
/usr/share/locale/nl/LC_MESSAGES/libc.mo
7f099e595000-7f099e59c000 r--s 00000000 08:07 476381                    
/usr/lib/gconv/gconv-modules.cache
7f099e59c000-7f099e5af000 r--p 00000000 08:07 53433                     
/usr/share/locale/nl/LC_MESSAGES/gtk20.mo
7f099e5af000-7f099e5b0000 r--p 7f099e5af000 00:00 0 
7f099e5b0000-7f099e5b9000 r-xp 00000000 08:07 480935                    
/usr/lib/libXrender.so.1.3.0
7f099e5b9000-7f099e7b8000 ---p 00009000 08:07 480935                    
/usr/lib/libXrender.so.1.3.0
7f099e7b8000-7f099e7b9000 rw-p 00008000 08:07 480935                    
/usr/lib/libXrender.so.1.3.0
7f099e7b9000-7f099e7c2000 r-xp 00000000 08:07 480937                    
/usr/lib/libXcursor.so.1.0.2
7f099e7c2000-7f099e9c2000 ---p 00009000 08:07 480937                    
/usr/lib/libXcursor.so.1.0.2
7f099e9c2000-7f099e9c3000 rw-p 00009000 08:07 480937                    
/usr/lib/libXcursor.so.1.0.2
7f099e9c3000-7f099e9ca000 r--s 000fd000 08:07 148176                    
/usr/lib/jvm/java-6-openjdk/jre/lib/resources.jar
7f099e9ca000-7f099e9e4000 r-xp 00000000 08:07 409929                    
/lib/libgcc_s.so.1
7f099e9e4000-7f099ebe3000 ---p 0001a000 08:07 409929                    
/lib/libgcc_s.so.1
7f099ebe3000-7f099ebe4000 rw-p 00019000 08:07 409929                    
/lib/libgcc_s.so.1
7f099ebe4000-7f099ec63000 r-xp 00000000 08:07 480320                    
/usr/lib/libfreetype.so.6.3.18
7f099ec63000-7f099ee62000 ---p 0007f000 08:07 480320                    
/usr/lib/libfreetype.so.6.3.18
7f099ee62000-7f099ee68000 rw-p 0007e000 08:07 480320                    
/usr/lib/libfreetype.so.6.3.18
7f099ee68000-7f099eeae000 r-xp 00000000 08:07 148214                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libfontmanager.so
7f099eeae000-7f099f0ad000 ---p 00046000 08:07 148214                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libfontmanager.so
7f099f0ad000-7f099f0b1000 rw-p 00045000 08:07 148214                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libfontmanager.so
7f099f0b1000-7f099f0c1000 rw-p 7f099f0b1000 00:00 0 
7f099f0c1000-7f099f0c6000 r-xp 00000000 08:07 480794                    
/usr/lib/libXdmcp.so.6.0.0
7f099f0c6000-7f099f2c5000 ---p 00005000 08:07 480794                    
/usr/lib/libXdmcp.so.6.0.0
7f099f2c5000-7f099f2c6000 rw-p 00004000 08:07 480794                    
/usr/lib/libXdmcp.so.6.0.0
7f099f2c6000-7f099f2e1000 r-xp 00000000 08:07 480796                    
/usr/lib/libxcb.so.1.0.0
7f099f2e1000-7f099f4e1000 ---p 0001b000 08:07 480796                    
/usr/lib/libxcb.so.1.0.0
7f099f4e1000-7f099f4e2000 rw-p 0001b000 08:07 480796                    
/usr/lib/libxcb.so.1.0.0
7f099f4e2000-7f099f4e3000 r-xp 00000000 08:07 480798                    
/usr/lib/libxcb-xlib.so.0.0.0
7f099f4e3000-7f099f6e2000 ---p 00001000 08:07 480798                    
/usr/lib/libxcb-xlib.so.0.0.0
7f099f6e2000-7f099f6e3000 rw-p 00000000 08:07 480798                    
/usr/lib/libxcb-xlib.so.0.0.0
7f099f6e3000-7f099f6e5000 r-xp 00000000 08:07 480792                    
/usr/lib/libXau.so.6.0.0
7f099f6e5000-7f099f8e4000 ---p 00002000 08:07 480792                    
/usr/lib/libXau.so.6.0.0
7f099f8e4000-7f099f8e5000 rw-p 00001000 08:07 480792                    
/usr/lib/libXau.so.6.0.0
7f099f8e5000-7f099f8ee000 r-xp 00000000 08:07 481023                    
/usr/lib/libXi.so.6.0.0
7f099f8ee000-7f099faed000 ---p 00009000 08:07 481023                    
/usr/lib/libXi.so.6.0.0
7f099faed000-7f099faee000 rw-p 00008000 08:07 481023                    
/usr/lib/libXi.so.6.0.0
7f099faee000-7f099faf3000 r-xp 00000000 08:07 481027                    
/usr/lib/libXtst.so.6.1.0
7f099faf3000-7f099fcf3000 ---p 00005000 08:07 481027                    
/usr/lib/libXtst.so.6.1.0
7f099fcf3000-7f099fcf4000 rw-p 00005000 08:07 481027                    
/usr/lib/libXtst.so.6.1.0
7f099fcf4000-7f099fdfa000 r-xp 00000000 08:07 480800                    
/usr/lib/libX11.so.6.2.0
7f099fdfa000-7f099fffa000 ---p 00106000 08:07 480800                    
/usr/lib/libX11.so.6.2.0
7f099fffa000-7f09a0000000 rw-p 00106000 08:07 480800                    
/usr/lib/libX11.so.6.2.0
7f09a0000000-7f09a1dd9000 rw-p 7f09a0000000 00:00 0 
7f09a1dd9000-7f09a4000000 ---p 7f09a1dd9000 00:00 0 
7f09a4000000-7f09a4002000 r--s 00000000 08:07 87893                     
/var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86-64.cache-2
7f09a4002000-7f09a4006000 r--s 00000000 08:07 87892                     
/var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86-64.cache-2
7f09a4006000-7f09a400d000 r--s 00000000 08:07 87889                     
/var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86-64.cache-2
7f09a400d000-7f09a400f000 r--s 00000000 08:07 86762                     
/var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86-64.cache-2
7f09a400f000-7f09a4012000 r--s 00000000 08:07 86754                     
/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-x86-64.cache-2
7f09a4012000-7f09a401b000 r--s 00000000 08:07 86758                     
/var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86-64.cache-2
7f09a401b000-7f09a401d000 r--s 00000000 08:07 87906                     
/var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86-64.cache-2
7f09a401d000-7f09a4021000 r--s 00000000 08:07 87905                     
/var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86-64.cache-2
7f09a4021000-7f09a4023000 r--s 00000000 08:07 87903                     
/var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86-64.cache-2
7f09a4023000-7f09a4026000 r--s 00000000 08:07 87902                     
/var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86-64.cache-2
7f09a4026000-7f09a402a000 r--s 00000000 08:07 87901                     
/var/cache/fontconfig/6eb3985aa4124903f6ff08ba781cd364-x86-64.cache-2
7f09a402a000-7f09a402d000 r--s 00000000 08:07 87900                     
/var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86-64.cache-2
7f09a402d000-7f09a4030000 r--s 00000000 08:07 87899                     
/var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86-64.cache-2
7f09a4030000-7f09a4034000 r--s 00000000 08:07 87898                     
/var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86-64.cache-2
7f09a4034000-7f09a403d000 r--s 00000000 08:07 87888                     
/var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86-64.cache-2
7f09a403d000-7f09a4040000 r--s 00000000 08:07 87897                     
/var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86-64.cache-2
7f09a4040000-7f09a4043000 r--s 00000000 08:07 87896                     
/var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86-64.cache-2
7f09a4043000-7f09a4045000 r--s 00000000 08:07 87893                     
/var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86-64.cache-2
7f09a4045000-7f09a4049000 r--s 00000000 08:07 87892                     
/var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86-64.cache-2
7f09a4049000-7f09a404c000 ---p 7f09a4049000 00:00 0 
7f09a404c000-7f09a414a000 rwxp 7f09a404c000 00:00 0 
7f09a414a000-7f09a415a000 r-xp 00000000 08:07 480923                    
/usr/lib/libXext.so.6.4.0
7f09a415a000-7f09a435a000 ---p 00010000 08:07 480923                    
/usr/lib/libXext.so.6.4.0
7f09a435a000-7f09a435b000 rw-p 00010000 08:07 480923                    
/usr/lib/libXext.so.6.4.0
7f09a435b000-7f09a43a2000 r-xp 00000000 08:07 148331                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/xawt/libmawt.so
7f09a43a2000-7f09a45a1000 ---p 00047000 08:07 148331                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/xawt/libmawt.so
7f09a45a1000-7f09a45a5000 rw-p 00046000 08:07 148331                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/xawt/libmawt.so
7f09a45a5000-7f09a45a6000 rw-p 7f09a45a5000 00:00 0 
7f09a45a6000-7f09a4647000 r-xp 00000000 08:07 148219                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libawt.so
7f09a4647000-7f09a4846000 ---p 000a1000 08:07 148219                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libawt.so
7f09a4846000-7f09a4852000 rw-p 000a0000 08:07 148219                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libawt.so
7f09a4852000-7f09a4876000 rw-p 7f09a4852000 00:00 0 
7f09a4876000-7f09a4877000 ---p 7f09a4876000 00:00 0 
7f09a4877000-7f09a4977000 rwxp 7f09a4877000 00:00 0 
7f09a4977000-7f09a497a000 ---p 7f09a4977000 00:00 0 
7f09a497a000-7f09a4a78000 rwxp 7f09a497a000 00:00 0 
7f09a4a78000-7f09a4a7b000 ---p 7f09a4a78000 00:00 0 
7f09a4a7b000-7f09a4b79000 rwxp 7f09a4a7b000 00:00 0 
7f09a4b79000-7f09a4b7c000 ---p 7f09a4b79000 00:00 0 
7f09a4b7c000-7f09a4c7a000 rwxp 7f09a4b7c000 00:00 0 
7f09a4c7a000-7f09a4c7d000 ---p 7f09a4c7a000 00:00 0 
7f09a4c7d000-7f09a4d7b000 rwxp 7f09a4c7d000 00:00 0 
7f09a4d7b000-7f09a4ebd000 r--p 00000000 08:07 492358                    
/usr/lib/locale/locale-archive
7f09a4ebd000-7f09a4ec0000 ---p 7f09a4ebd000 00:00 0 
7f09a4ec0000-7f09a4fbe000 rwxp 7f09a4ec0000 00:00 0 
7f09a4fbe000-7f09a4fc1000 ---p 7f09a4fbe000 00:00 0 
7f09a4fc1000-7f09a50bf000 rwxp 7f09a4fc1000 00:00 0 
7f09a50bf000-7f09a50c0000 ---p 7f09a50bf000 00:00 0 
7f09a50c0000-7f09a51c0000 rwxp 7f09a50c0000 00:00 0 
7f09a51c0000-7f09a5277000 rw-p 7f09a51c0000 00:00 0 
7f09a5277000-7f09a5406000 r--s 033c4000 08:07 148251                    
/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar
7f09a5406000-7f09a542e000 rw-p 7f09a5406000 00:00 0 
7f09a542e000-7f09a542f000 ---p 7f09a542e000 00:00 0 
7f09a542f000-7f09a552f000 rwxp 7f09a542f000 00:00 0 
7f09a552f000-7f09a5530000 ---p 7f09a552f000 00:00 0 
7f09a5530000-7f09a5630000 rwxp 7f09a5530000 00:00 0 
7f09a5630000-7f09a5631000 ---p 7f09a5630000 00:00 0 
7f09a5631000-7f09a573f000 rwxp 7f09a5631000 00:00 0 
7f09a573f000-7f09a575b000 rwxp 7f09a573f000 00:00 0 
7f09a575b000-7f09a5765000 rwxp 7f09a575b000 00:00 0 
7f09a5765000-7f09a57f9000 rwxp 7f09a5765000 00:00 0 
7f09a57f9000-7f09a5807000 rwxp 7f09a57f9000 00:00 0 
7f09a5807000-7f09a5823000 rwxp 7f09a5807000 00:00 0 
7f09a5823000-7f09a582d000 rwxp 7f09a5823000 00:00 0 
7f09a582d000-7f09a58c0000 rwxp 7f09a582d000 00:00 0 
7f09a58c0000-7f09a58da000 rwxp 7f09a58c0000 00:00 0 
7f09a58da000-7f09a590f000 rwxp 7f09a58da000 00:00 0 
7f09a590f000-7f09a7400000 rwxp 7f09a590f000 00:00 0 
7f09a7400000-7f09aad10000 rwxp 7f09a7400000 00:00 0 
7f09aad10000-7f09ac0c0000 rwxp 7f09aad10000 00:00 0 
7f09ac0c0000-7f09be7c0000 rwxp 7f09ac0c0000 00:00 0 
7f09be7c0000-7f09c1930000 rwxp 7f09be7c0000 00:00 0 
7f09c1930000-7f09c8510000 rwxp 7f09c1930000 00:00 0 
7f09c8510000-7f09c8511000 r--s 00000000 08:07 87904                     
/var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86-64.cache-2
7f09c8511000-7f09c8512000 r--s 00000000 08:07 87894                     
/var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86-64.cache-2
7f09c8512000-7f09c8782000 rwxp 7f09c8512000 00:00 0 
7f09c8782000-7f09cb512000 rwxp 7f09c8782000 00:00 0 
7f09cb512000-7f09cb519000 r-xp 00000000 08:07 148240                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so
7f09cb519000-7f09cb718000 ---p 00007000 08:07 148240                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so
7f09cb718000-7f09cb719000 rw-p 00006000 08:07 148240                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libzip.so
7f09cb719000-7f09cb746000 r-xp 00000000 08:07 148227                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so
7f09cb746000-7f09cb945000 ---p 0002d000 08:07 148227                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so
7f09cb945000-7f09cb949000 rw-p 0002c000 08:07 148227                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libjava.so
7f09cb949000-7f09cb958000 r-xp 00000000 08:07 148237                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so
7f09cb958000-7f09cbb57000 ---p 0000f000 08:07 148237                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so
7f09cbb57000-7f09cbb59000 rw-p 0000e000 08:07 148237                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/libverify.so
7f09cbb59000-7f09cbb64000 r-xp 00000000 08:07 410205                    
/lib/libnss_files-2.9.so
7f09cbb64000-7f09cbd63000 ---p 0000b000 08:07 410205                    
/lib/libnss_files-2.9.so
7f09cbd63000-7f09cbd64000 r--p 0000a000 08:07 410205                    
/lib/libnss_files-2.9.so
7f09cbd64000-7f09cbd65000 rw-p 0000b000 08:07 410205                    
/lib/libnss_files-2.9.so
7f09cbd65000-7f09cbd6f000 r-xp 00000000 08:07 410503                    
/lib/libnss_nis-2.9.so
7f09cbd6f000-7f09cbf6e000 ---p 0000a000 08:07 410503                    
/lib/libnss_nis-2.9.so
7f09cbf6e000-7f09cbf6f000 r--p 00009000 08:07 410503                    
/lib/libnss_nis-2.9.so
7f09cbf6f000-7f09cbf70000 rw-p 0000a000 08:07 410503                    
/lib/libnss_nis-2.9.so
7f09cbf70000-7f09cbf77000 r-xp 00000000 08:07 410501                    
/lib/libnss_compat-2.9.so
7f09cbf77000-7f09cc176000 ---p 00007000 08:07 410501                    
/lib/libnss_compat-2.9.so
7f09cc176000-7f09cc177000 r--p 00006000 08:07 410501                    
/lib/libnss_compat-2.9.so
7f09cc177000-7f09cc178000 rw-p 00007000 08:07 410501                    
/lib/libnss_compat-2.9.so
7f09cc178000-7f09cc18d000 r-xp 00000000 08:07 410505                    
/lib/libnsl-2.9.so
7f09cc18d000-7f09cc38c000 ---p 00015000 08:07 410505                    
/lib/libnsl-2.9.so
7f09cc38c000-7f09cc38d000 r--p 00014000 08:07 410505                    
/lib/libnsl-2.9.so
7f09cc38d000-7f09cc38e000 rw-p 00015000 08:07 410505                    
/lib/libnsl-2.9.so
7f09cc38e000-7f09cc390000 rw-p 7f09cc38e000 00:00 0 
7f09cc390000-7f09cc398000 r-xp 00000000 08:07 148230                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so
7f09cc398000-7f09cc597000 ---p 00008000 08:07 148230                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so
7f09cc597000-7f09cc599000 rw-p 00007000 08:07 148230                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/native_threads/libhpi.so
7f09cc599000-7f09cc5a0000 r-xp 00000000 08:07 410298                    
/lib/librt-2.9.so
7f09cc5a0000-7f09cc79f000 ---p 00007000 08:07 410298                    
/lib/librt-2.9.so
7f09cc79f000-7f09cc7a0000 r--p 00006000 08:07 410298                    
/lib/librt-2.9.so
7f09cc7a0000-7f09cc7a1000 rw-p 00007000 08:07 410298                    
/lib/librt-2.9.so
7f09cc7a1000-7f09cc823000 r-xp 00000000 08:07 410211                    
/lib/libm-2.9.so
7f09cc823000-7f09cca22000 ---p 00082000 08:07 410211                    
/lib/libm-2.9.so
7f09cca22000-7f09cca23000 r--p 00081000 08:07 410211                    
/lib/libm-2.9.so
7f09cca23000-7f09cca24000 rw-p 00082000 08:07 410211                    
/lib/libm-2.9.so
7f09cca24000-7f09cd11b000 r-xp 00000000 08:07 148222                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so
7f09cd11b000-7f09cd31a000 ---p 006f7000 08:07 148222                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so
7f09cd31a000-7f09cd392000 rw-p 006f6000 08:07 148222                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server/libjvm.so
7f09cd392000-7f09cd3cb000 rw-p 7f09cd392000 00:00 0 
7f09cd3cb000-7f09cd512000 r-xp 00000000 08:07 410293                    
/lib/libc-2.9.so
7f09cd512000-7f09cd712000 ---p 00147000 08:07 410293                    
/lib/libc-2.9.so
7f09cd712000-7f09cd716000 r--p 00147000 08:07 410293                    
/lib/libc-2.9.so
7f09cd716000-7f09cd717000 rw-p 0014b000 08:07 410293                    
/lib/libc-2.9.so
7f09cd717000-7f09cd71c000 rw-p 7f09cd717000 00:00 0 
7f09cd71c000-7f09cd71e000 r-xp 00000000 08:07 410299                    
/lib/libdl-2.9.so
7f09cd71e000-7f09cd91e000 ---p 00002000 08:07 410299                    
/lib/libdl-2.9.so
7f09cd91e000-7f09cd91f000 r--p 00002000 08:07 410299                    
/lib/libdl-2.9.so
7f09cd91f000-7f09cd920000 rw-p 00003000 08:07 410299                    
/lib/libdl-2.9.so
7f09cd920000-7f09cd924000 r-xp 00000000 08:07 148218                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so
7f09cd924000-7f09cdb23000 ---p 00004000 08:07 148218                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so
7f09cdb23000-7f09cdb24000 rw-p 00003000 08:07 148218                    
/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/jli/libjli.so
7f09cdb24000-7f09cdb3a000 r-xp 00000000 08:07 410207                    
/lib/libpthread-2.9.so
7f09cdb3a000-7f09cdd39000 ---p 00016000 08:07 410207                    
/lib/libpthread-2.9.so
7f09cdd39000-7f09cdd3a000 r--p 00015000 08:07 410207                    
/lib/libpthread-2.9.so
7f09cdd3a000-7f09cdd3b000 rw-p 00016000 08:07 410207                    
/lib/libpthread-2.9.so
7f09cdd3b000-7f09cdd3f000 rw-p 7f09cdd3b000 00:00 0 
7f09cdd3f000-7f09cdd55000 r-xp 00000000 08:07 477548                    
/usr/lib/libz.so.1.2.3.3
7f09cdd55000-7f09cdf55000 ---p 00016000 08:07 477548                    
/usr/lib/libz.so.1.2.3.3
7f09cdf55000-7f09cdf56000 rw-p 00016000 08:07 477548                    
/usr/lib/libz.so.1.2.3.3
7f09cdf56000-7f09cdf73000 r-xp 00000000 08:07 410292                    
/lib/ld-2.9.so
7f09cdf73000-7f09cdf74000 r--s 00000000 08:07 87904                     
/var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86-64.cache-2
7f09cdf74000-7f09cdf76000 r--s 00000000 08:07 87895                     
/var/cache/fontconfig/ddd4086aec35a5275babba44bb759c3c-x86-64.cache-2
7f09cdf76000-7f09cdf7d000 r--s 00000000 08:07 87889                     
/var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86-64.cache-2
7f09cdf7d000-7f09cdf7f000 r--s 00000000 08:07 86762                     
/var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86-64.cache-2
7f09cdf7f000-7f09cdf81000 r--s 0000d000 08:07 593609                    
/usr/share/java/RXTXcomm.jar
7f09cdf81000-7f09cdf85000 r--s 00079000 08:07 148171                    
/usr/lib/jvm/java-6-openjdk/jre/lib/jsse.jar
7f09cdf85000-7f09cdf86000 r--s 00003000 08:07 149110                    
/home/fest/Desktop/arduino/arduino-0015/lib/mrj.jar
7f09cdf86000-7f09cdf87000 r--s 00006000 08:07 149121                    
/home/fest/Desktop/arduino/arduino-0015/lib/registry.jar
7f09cdf87000-7f09cdf88000 r--s 00006000 08:07 149120                    
/home/fest/Desktop/arduino/arduino-0015/lib/oro.jar
7f09cdf88000-7f09cdf8d000 r--s 00053000 08:07 149101                    
/home/fest/Desktop/arduino/arduino-0015/lib/antlr.jar
7f09cdf8d000-7f09cdf97000 rwxp 7f09cdf8d000 00:00 0 
7f09cdf97000-7f09ce04d000 rwxp 7f09cdf97000 00:00 0 
7f09ce04d000-7f09ce050000 ---p 7f09ce04d000 00:00 0 
7f09ce050000-7f09ce14e000 rwxp 7f09ce050000 00:00 0 
7f09ce14e000-7f09ce152000 rw-p 7f09ce14e000 00:00 0 
7f09ce152000-7f09ce153000 r--s 00000000 08:07 87894                     
/var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86-64.cache-2
7f09ce153000-7f09ce156000 r--s 00000000 08:07 86754                     
/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-x86-64.cache-2
7f09ce156000-7f09ce15c000 r--s 000bb000 08:07 149116                    
/home/fest/Desktop/arduino/arduino-0015/lib/pde.jar
7f09ce15c000-7f09ce165000 r--s 00065000 08:07 118616                    
/usr/share/java/gnome-java-bridge.jar
7f09ce165000-7f09ce16d000 rw-s 00000000 08:07 197802                    
/tmp/hsperfdata_fest/22017
7f09ce16d000-7f09ce16e000 rwxp 7f09ce16d000 00:00 0 
7f09ce16e000-7f09ce16f000 r--p 7f09ce16e000 00:00 0 
7f09ce16f000-7f09ce172000 rw-p 7f09ce16f000 00:00 0 
7f09ce172000-7f09ce173000 r--p 0001c000 08:07 410292                    
/lib/ld-2.9.so
7f09ce173000-7f09ce174000 rw-p 0001d000 08:07 410292                    
/lib/ld-2.9.so
7fffd615e000-7fffd6171000 rwxp 7ffffffea000 00:00 0                     
[stack]
7fffd6171000-7fffd6173000 rw-p 7fffffffd000 00:00 0 
7fffd61fe000-7fffd61ff000 r-xp 7fffd61fe000 00:00 0                      [vdso]
ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0                 
[vsyscall]

VM Arguments:
java_command: processing.app.Base
Launcher Type: SUN_STANDARD

Environment Variables:
CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/registry.jar:lib/mrj.jar:/usr/share/java/RXTXcomm.jar
PATH=/home/fest/Desktop/arduino/arduino-0015/tools:/usr/local/bin:/usr/bin:/bin:/usr/games
USERNAME=fest
LD_LIBRARY_PATH=/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/../lib/amd64:/usr/lib:
SHELL=/bin/bash
DISPLAY=:0.0

Signal Handlers:
SIGSEGV: [libjvm.so+0x5d2630], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGBUS: [libjvm.so+0x5d2630], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGFPE: [libjvm.so+0x4ab9d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGPIPE: SIG_IGN, sa_mask[0]=0x00001000, sa_flags=0x10000000
SIGXFSZ: [libjvm.so+0x4ab9d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGILL: [libjvm.so+0x4ab9d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGUSR2: [libjvm.so+0x4ab380], sa_mask[0]=0x00000000, sa_flags=0x10000004
SIGHUP: [libjvm.so+0x4ad520], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGINT: [libjvm.so+0x4ad520], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGTERM: [libjvm.so+0x4ad520], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGQUIT: [libjvm.so+0x4ad520], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004


---------------  S Y S T E M  ---------------

OS:5.0.2

uname:Linux 2.6.26-2-amd64 #1 SMP Sun Jul 26 20:35:48 UTC 2009 x86_64
libc:glibc 2.9 NPTL 2.9 
rlimit: STACK 8192k, CORE 0k, NPROC 15357, NOFILE 1024, AS infinity
load average:1,10 0,99 0,80

CPU:total 3 (3 cores per cpu, 1 threads per core) family 16 model 2 stepping 3,
cmov, cx8, fxsr, mmx, sse, sse2, sse3, mmxext, 3dnow, 3dnowext, sse4a

Memory: 4k page, physical 1932172k(18280k free), swap 0k(0k free)

vm_info: OpenJDK 64-Bit Server VM (1.6.0_0-b11) for linux-amd64 JRE
(1.6.0_0-b11), built on Apr  9 2009 19:35:18 by "pbuilder" with gcc 4.3.2

time: Wed Nov 18 22:05:38 2009
elapsed time: 91 seconds


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


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 18 19:59:55 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 19 Nov 2009 03:59:55 +0000
Subject: [Bug 410] New: Applet resource loading fails
Message-ID: <E1NAyBX-0003iD-I0@icedtea.classpath.org>

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

           Summary: Applet resource loading fails
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: https://www.e-contract.be/eid-applet-beta/
        OS/Version: Linux
            Status: NEW
          Severity: major
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: info at frankcornelis.be


When I run an applet in Firefox (eID Applet from
http://code.google.com/p/eid-applet/) using the Sun JRE 1.6 everything works.
When running the applet using the java-1.6.0-openjdk 30.b16.fc11 it cannot load
resources from the applet JAR. It fails on loading the following resource:

ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream applicationPropertiesInputStream = classLoader
    .getResourceAsStream("be/fedict/eid/applet/application.properties");

Apparently the classloader behaves differently under OpenJDK.


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


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 19 01:46:57 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 19 Nov 2009 09:46:57 +0000
Subject: [Bug 411] New: Applet cannot load j2pkcs11 library
Message-ID: <E1NB3bN-00049u-0R@icedtea.classpath.org>

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

           Summary: Applet cannot load j2pkcs11 library
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: https://www.e-contract.be/eid-applet-beta/
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: info at frankcornelis.be


My signed eID Applet (http://code.google.com/p/eid-applet/) can use the
SunPKCS11 security provider when I'm using the Sun Java 1.6 runtime within
Firefox. When using the OpenJDK 30.b16.fc11 I get the following error in the
Java Console:
Caused by: java.security.AccessControlException: access denied
(java.lang.RuntimePermission loadLibrary.j2pkcs11)
        at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:342)
        at
java.security.AccessController.checkPermission(AccessController.java:553)
        at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
        at
net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:281)
        at java.lang.SecurityManager.checkLink(SecurityManager.java:835)
        at java.lang.Runtime.loadLibrary0(Runtime.java:834)
        at java.lang.System.loadLibrary(System.java:1047)
        at sun.security.pkcs11.wrapper.PKCS11$1.run(PKCS11.java:84)
        at java.security.AccessController.doPrivileged(Native Method)
        at sun.security.pkcs11.wrapper.PKCS11.<clinit>(PKCS11.java:82)

Which clearly indicates that the Applet has insufficient rights in the JRE to
be able to load the Sun PKCS#11 security provider. Could this be 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  Thu Nov 19 02:22:38 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 19 Nov 2009 10:22:38 +0000
Subject: [Bug 409] Hi,
	arduino is crashing when trying to read from the serial port. The
	following report has been created (see below). Thank you very
	very much!!!
Message-ID: <E1NB49u-0004Ce-DE@icedtea.classpath.org>

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


aph at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |aph at redhat.com




------- Comment #1 from aph at redhat.com  2009-11-19 10:22 -------
Can you show us how to reproduce 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 gnu_andrew at member.fsf.org  Thu Nov 19 08:24:23 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 19 Nov 2009 16:24:23 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
Message-ID: <17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>

2009/11/18 Tomas Hurka <Tomas.Hurka at sun.com>:
> Hi Andrew,
>
> On 17 Nov 2009, at 22:54, Andrew John Hughes wrote:
>
>> 2009/11/11 Tomas Hurka <Tomas.Hurka at sun.com>:
>>>
>>> Hi All,
>>> attached is a patch to include the latest version (1.2.1) of VisualVM in
>>> IcedTea6. Can somebody commit these changes for me?
>>
>> I've applied this to IcedTea7:
>> http://icedtea.classpath.org/hg/icedtea/rev/d4fe9b0323e0 I'll backport
>> it to IcedTea6 once I've sorted out the IcedTea7 release for milestone
>> 5.
>
> OK.
>
>> Note that $(abs_top_builddir) should be used, not $(abs_top_srcdir).
>
> I see. Thanks for the review of the patch.
>
> Bye,
> --
> Tomas Hurka ? <mailto:tomas.hurka at sun.com>
> NetBeans Profiler http://profiler.netbeans.org
> VisualVM http://visualvm.dev.java.net
> Software Engineer, Developer Platforms Group
> Sun Microsystems, Praha Czech Republic
>
>
>
>

We're getting this failure:

BUILD FAILED
/notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
The module org.jdesktop.layout
cannot be compiled against because it is part of the cluster
/notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
which is not part of cluster.path
in your suite configuration.

Any ideas what this means?

Thanks,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From Tomas.Hurka at Sun.COM  Thu Nov 19 08:38:29 2009
From: Tomas.Hurka at Sun.COM (Tomas Hurka)
Date: Thu, 19 Nov 2009 17:38:29 +0100
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
Message-ID: <4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>

Hi Andrew,

On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>
> We're getting this failure:
>
> BUILD FAILED
> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/ 
> templates/projectized.xml:93:
> The module org.jdesktop.layout
> cannot be compiled against because it is part of the cluster
> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/ 
> netbeans_visualvm/platform9
> which is not part of cluster.path
> in your suite configuration.
>
> Any ideas what this means?
You need to build it against NetBeans Platform 6.7.1 (netbeans- 
platform-6.7.1-2.fc12.noarch). It looks like you are using older  
version.

Bye,
--
Tomas Hurka   <mailto:tomas.hurka at sun.com>
NetBeans Profiler http://profiler.netbeans.org
VisualVM http://visualvm.dev.java.net
Software Engineer, Developer Platforms Group
Sun Microsystems, Praha Czech Republic



From bugzilla-daemon at icedtea.classpath.org  Thu Nov 19 09:04:33 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 19 Nov 2009 17:04:33 +0000
Subject: [Bug 409] additional info
Message-ID: <E1NBAQr-0004TC-UX@icedtea.classpath.org>

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


festhead at gmail.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|Hi, arduino is crashing when|additional info
                   |trying to read from the     |
                   |serial port. The following  |
                   |report has been created (see|
                   |below). Thank you very very |
                   |much!!!                     |




------- Comment #2 from festhead at gmail.com  2009-11-19 17:04 -------
I upload the read from rom sketch file, and when I push serial monitor i get
the crash. 
It's on atmega368, linux 64bit.

I start the arduino software with the following command:

#!/bin/sh

CLASSPATH=java/lib/rt.jar:lib:lib/build:lib/pde.jar:lib/core.jar:lib/antlr.jar:lib/oro.jar:lib/registry.jar:lib/mrj.jar:/usr/share/java/RXTXcomm.jar
export CLASSPATH

# put the directory where this file lives in the front of the path, because
# that directory also contains jikes, which we will need at runtime.
PATH=`pwd`/tools:${PATH}
export PATH

# put the directory with the native RXTX libs in the library path
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH

java processing.app.Base


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


From langel at redhat.com  Thu Nov 19 11:24:32 2009
From: langel at redhat.com (Lillian Angel)
Date: Thu, 19 Nov 2009 14:24:32 -0500
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
Message-ID: <D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>

Andrew,


On 2009-11-19, at 11:38 AM, Tomas Hurka wrote:

> Hi Andrew,
> 
> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>> 
>> We're getting this failure:
>> 
>> BUILD FAILED
>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
>> The module org.jdesktop.layout
>> cannot be compiled against because it is part of the cluster
>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
>> which is not part of cluster.path
>> in your suite configuration.
>> 
>> Any ideas what this means?
> You need to build it against NetBeans Platform 6.7.1 (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using older version.

Be sure when we update IcedTea in Fedora, this is only applied as a patch in Fedora 12 (and rawhide) and not updated in Fedora 10 or 11. Same case for all other distributions, I just don't know if they build with --enable-visualvm. We should update the docs to say 6.7.1 is required.


Cheers

From doko at ubuntu.com  Thu Nov 19 12:26:26 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 19 Nov 2009 14:26:26 -0600
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
	<D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>
Message-ID: <4B05A9F2.9020101@ubuntu.com>

On 19.11.2009 13:24, Lillian Angel wrote:
> Andrew,
>
>
> On 2009-11-19, at 11:38 AM, Tomas Hurka wrote:
>
>> Hi Andrew,
>>
>> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>>
>>> We're getting this failure:
>>>
>>> BUILD FAILED
>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
>>> The module org.jdesktop.layout
>>> cannot be compiled against because it is part of the cluster
>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
>>> which is not part of cluster.path
>>> in your suite configuration.
>>>
>>> Any ideas what this means?
>> You need to build it against NetBeans Platform 6.7.1 (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using older version.
>
> Be sure when we update IcedTea in Fedora, this is only applied as a patch in Fedora 12 (and rawhide) and not updated in Fedora 10 or 11. Same case for all other distributions, I just don't know if they build with --enable-visualvm. We should update the docs to say 6.7.1 is required.

other distributions build separate sources from a separate source package. I 
still don't see the value why visualvm needs to be built from IcedTea. But maybe 
somebody wants to add javadb as well in the future.

   Matthias


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 20 23:35:55 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 21 Nov 2009 07:35:55 +0000
Subject: [Bug 387] circular dependencies for install of Gentoo ARM5
Message-ID: <E1NBkVf-0006Fx-EC@icedtea.classpath.org>

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





------- Comment #2 from jlpoole at pon.net  2009-11-21 07:35 -------
(In reply to comment #1)
> use gcj to build openjdk build dependencies and bootstrap openjdk using gcj.
> 

I'm having problems getting gcj to install (armv5te processor), see Bug 388.


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


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 21 03:28:04 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 21 Nov 2009 11:28:04 +0000
Subject: [Bug 388] Compile of  gcc hangs at fortran/intrinsic.o
Message-ID: <E1NBo8K-0006NF-AI@icedtea.classpath.org>

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





------- Comment #8 from aph at redhat.com  2009-11-21 11:28 -------
Building FORTRAN is a huge waste of time for you

configure --enable-langauges=java


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


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 21 03:28:57 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 21 Nov 2009 11:28:57 +0000
Subject: [Bug 388] Compile of  gcc hangs at fortran/intrinsic.o
Message-ID: <E1NBo9B-0006NN-Ux@icedtea.classpath.org>

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





------- Comment #9 from aph at redhat.com  2009-11-21 11:28 -------
er, --enable-languages=java

:-)


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:16:41 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:16:41 +0000
Subject: [Bug 388] Compile of  gcc hangs at fortran/intrinsic.o
Message-ID: <E1NCCIz-0007Xp-Va@icedtea.classpath.org>

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


jlpoole at pon.net changed:

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




------- Comment #10 from jlpoole at pon.net  2009-11-22 13:16 -------
That worked, insofar as it got be past the error arising under the Fortan
section.
(I did run into another bug, which I'll log separately.)
Thank you!


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:21:46 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:21:46 +0000
Subject: [Bug 412] New: build fails at final link
Message-ID: <E1NCCNu-0007YE-2b@icedtea.classpath.org>

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

           Summary: build fails at final link
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: jlpoole at pon.net


Following the suggestion in Bug 387 "use gcj to build openjdk build
dependencies and bootstrap openjdk using gcj." for

Platform: SheevaPlug (ARMv5TE) 
OS: Gentoo linux-2.6.30-rc1 

in download/gnu/ (aka /mnt/seagate1/download/gnu)
svn checkout svn://gcc.gnu.org/svn/gcc/trunk

localhost gnu # svn info trunk
Path: trunk
URL: svn://gcc.gnu.org/svn/gcc/trunk
Repository Root: svn://gcc.gnu.org/svn/gcc
Repository UUID: 138bc75d-0d04-0410-961f-82ee72b054a4
Revision: 152432
Node Kind: directory
Schedule: normal
Last Changed Author: uros
Last Changed Rev: 152432
Last Changed Date: 2009-10-03 01:15:55 -0700 (Sat, 03 Oct 2009)

localhost gnu #


mkdir build
cd build
 ../trunk/configure --enable-languages=java
make

...
libtool: link: ar rc .libs/libgcj_bc.a  libgcj_bc.o
libtool: link: ranlib .libs/libgcj_bc.a
libtool: link: ( cd ".libs" && rm -f "libgcj_bc.la" && ln -s "../libgcj_bc.la"
"libgcj_bc.la" )
/bin/sh ./libtool --tag=GCJ  --mode=link
/mnt/seagate2/download/gnu/build/./gcc/gcj
-B/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/
-B/mnt/seagate2/download/gnu/build/./gcc/
-B/usr/local/armv5tel-unknown-linux-gnueabi/bin/
-B/usr/local/armv5tel-unknown-linux-gnueabi/lib/ -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/include -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/sys-include   
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava -g
-O2  -o jv-convert --main=gnu.gcj.convert.Convert -rpath /usr/local/lib
-shared-libgcc 
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/../libstdc++-v3/src/.libs
-lstdc++ 
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/.libs
libgcj.la
libtool: link: /mnt/seagate2/download/gnu/build/./gcc/gcj
-B/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/
-B/mnt/seagate2/download/gnu/build/./gcc/
-B/usr/local/armv5tel-unknown-linux-gnueabi/bin/
-B/usr/local/armv5tel-unknown-linux-gnueabi/lib/ -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/include -isystem
/usr/local/armv5tel-unknown-linux-gnueabi/sys-include -g -O2 -o
.libs/jv-convert --main=gnu.gcj.convert.Convert -shared-libgcc 
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/.libs
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava
-L/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/../libstdc++-v3/src/.libs
/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava/../libstdc++-v3/src/.libs/libstdc++.so
./.libs/libgcj.so
/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libstdc++-v3/src/.libs/libstdc++.so
-lm -lpthread -lrt -ldl -Wl,-rpath -Wl,/usr/local/lib
/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/../../../../armv5tel-softfloat-linux-gnueabi/bin/ld:
.libs/jv-convert: hidden symbol `__sync_synchronize' in
/mnt/seagate2/download/gnu/build/./gcc/libgcc.a(linux-atomic.o) is referenced
by DSO
/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/../../../../armv5tel-softfloat-linux-gnueabi/bin/ld:
final link failed: Nonrepresentable section on output
collect2: ld returned 1 exit status
make[3]: *** [jv-convert] Error 1
make[3]: Leaving directory
`/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory
`/mnt/seagate2/download/gnu/build/armv5tel-unknown-linux-gnueabi/libjava'
make[1]: *** [all-target-libjava] Error 2
make[1]: Leaving directory `/mnt/seagate2/download/gnu/build'
make: *** [all] Error 2
plug build #


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:22:50 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:22:50 +0000
Subject: [Bug 413] New: Crash with ibus and JOSM
Message-ID: <E1NCCOw-0007YK-Vu@icedtea.classpath.org>

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

           Summary: Crash with ibus and JOSM
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: major
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: niklas.laxstrom+icedtea at gmail.com


I'm assuming this is related to ibus. Occasionally JOSM stops accepting any
keyboard input when ibus is running (I had the same problem with some kde apps
before installing ibus-tq). If I restart ibus daemon, JOSM crashes if I try to
type anything into it.

64-bit Fedora 12, I'll attached the log.


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:23:46 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:23:46 +0000
Subject: [Bug 413] Crash with ibus and JOSM
Message-ID: <E1NCCPq-0007YQ-QT@icedtea.classpath.org>

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





------- Comment #1 from niklas.laxstrom+icedtea at gmail.com  2009-11-22 13:23 -------
Created an attachment (id=273)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=273&action=view)
Crash log


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:28:13 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:28:13 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCCU9-0007Yb-Oo@icedtea.classpath.org>

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





------- Comment #1 from jlpoole at pon.net  2009-11-22 13:28 -------
For completenes, I tried the make again and I will attach the output in an
updated.  Here's the console error output:

plug build # make > make_output2ndtry.txt
Makefile:860: warning: overriding commands for target `gjdoc'
Makefile:778: warning: ignoring old commands for target `gjdoc'
Makefile:860: warning: overriding commands for target `gjdoc'
Makefile:778: warning: ignoring old commands for target `gjdoc'
/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/../../../../armv5tel-softfloat-linux-gnueabi/bin/ld:
.libs/jv-convert: hidden symbol `__sync_synchronize' in
/mnt/seagate2/download/gnu/build/./gcc/libgcc.a(linux-atomic.o) is referenced
by DSO
/usr/lib/gcc/armv5tel-softfloat-linux-gnueabi/4.1.2/../../../../armv5tel-softfloat-linux-gnueabi/bin/ld:
final link failed: Nonrepresentable section on output
collect2: ld returned 1 exit status
make[3]: *** [jv-convert] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all-target-libjava] Error 2
make: *** [all] Error 2
plug build #


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:33:23 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:33:23 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCCZ9-0007Yt-09@icedtea.classpath.org>

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





------- Comment #2 from jlpoole at pon.net  2009-11-22 13:33 -------
Created an attachment (id=274)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=274&action=view)
2nd try at make

Complete log of 2nd try at make; error output is in previous comment above.


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:36:39 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:36:39 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCCcJ-0007Yz-Rv@icedtea.classpath.org>

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





------- Comment #3 from jlpoole at pon.net  2009-11-22 13:36 -------
To confirm the version I have and that it is current:

plug gnu # svn info trunk
Path: trunk
URL: svn://gcc.gnu.org/svn/gcc/trunk
Repository Root: svn://gcc.gnu.org/svn/gcc
Repository UUID: 138bc75d-0d04-0410-961f-82ee72b054a4
Revision: 152432
Node Kind: directory
Schedule: normal
Last Changed Author: uros
Last Changed Rev: 152432
Last Changed Date: 2009-10-03 01:15:55 -0700 (Sat, 03 Oct 2009)

plug gnu # svn update
Skipped '.'
plug gnu # 


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:41:41 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:41:41 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCChB-0007ZR-3R@icedtea.classpath.org>

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





------- Comment #4 from jlpoole at pon.net  2009-11-22 13:41 -------
I should mention that this platform does not have floating point processor;
could that be the culprit?  Is there a setting I should use to indicate
softfloat?

What is interesting is that Sun offers a Java for this architecture and charges
for it (you can evaluate it for a 90 period), so they must be adding value that
may not be readily accomplished here?

See: http://java.sun.com/javase/embedded/


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 05:51:17 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 13:51:17 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCCqT-0007Zw-Dr@icedtea.classpath.org>

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





------- Comment #5 from aph at redhat.com  2009-11-22 13:51 -------
Oh, I know this one, it's a bug in ARM gcc.

I think you can fix this by linking shared libraries with -Wl,-lgcc.

p.s. This is not the place to put links to unfree software.  Please don't do
it.


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 07:20:33 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 15:20:33 +0000
Subject: [Bug 414] New: NPPlugin build fails with recent xulrunner
Message-ID: <E1NCEEr-0007eQ-7t@icedtea.classpath.org>

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

           Summary: NPPlugin build fails with recent xulrunner
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: a.radke at arcor.de


build fails:

cd /tmp/openjdk6-hg/trunk/src/icedtea6/plugin/icedteanp; \
        if [ -e /tmp/openjdk6-hg/trunk/src/icedtea6/.hg ] && which /usr/bin/hg
>/dev/null; then \
          revision="-r`(cd /tmp/openjdk6-hg/trunk/src/icedtea6; /usr/bin/hg tip
--template '{rev}')`" ; \
        fi ; \
        if [ -n "ArchLinux-6.b17_hg_20091121-2-x86_64" ]; then plugin_version="
(ArchLinux-6.b17_hg_20091121-2-x86_64)"; fi; \
        plugin_version=" 1.7pre$revision$plugin_version"; \
        g++ -march=x86-64 -mtune=generic -O2 -pipe \
          -DPACKAGE_VERSION="\"1.7pre\"" \
          -DPLUGIN_VERSION="\"$plugin_version\"" \
          -DMOZILLA_VERSION_COLLAPSED="1090105" \
          -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   \
          -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1
-I/usr/include/freetype2 -I/usr/include/libpng12   \
          -DXP_UNIX -DOJI -fshort-wchar -I/usr/include/xulrunner-1.9.1/stable
-I/usr/include/xulrunner-1.9.1/java -I/usr/include/xulrunner-1.9.1/plugin
-I/usr/include/nspr -I/usr/include/xulrunner-1.9.1/unstable   \
          -fPIC -c IcedTeaNPPlugin.cc IcedTeaScriptablePluginObject.cc
IcedTeaJavaRequestProcessor.cc IcedTeaPluginRequestProcessor.cc
IcedTeaPluginUtils.cc; \
        cd ../
In file included from IcedTeaNPPlugin.cc:75:
IcedTeaScriptablePluginObject.h:43:19: error: npupp.h: No such file or
directory
In file included from IcedTeaNPPlugin.h:61,
                 from IcedTeaJavaRequestProcessor.h:46,
                 from IcedTeaScriptablePluginObject.h:49,
                 from IcedTeaNPPlugin.cc:75:
IcedTeaPluginUtils.h:204: error: expected ';' before '(' token
IcedTeaPluginUtils.h:206: error: 'NPVariant' has not been declared
IcedTeaPluginUtils.h:208: error: expected ';' before '(' token
In file included from IcedTeaNPPlugin.h:62,
                 from IcedTeaJavaRequestProcessor.h:46,
                 from IcedTeaScriptablePluginObject.h:49,
                 from IcedTeaNPPlugin.cc:75:
IcedTeaPluginRequestProcessor.h:86: error: 'NPVariant' has not been declared
IcedTeaPluginRequestProcessor.h:125: error: 'NPVariant' has not been declared
In file included from IcedTeaJavaRequestProcessor.h:46,
                 from IcedTeaScriptablePluginObject.h:49,
                 from IcedTeaNPPlugin.cc:75:
IcedTeaNPPlugin.h:103: error: 'NPNetscapeFuncs' does not name a type
IcedTeaNPPlugin.h:130: error: expected constructor, destructor, or type
conversion before '*' token
IcedTeaNPPlugin.h:133: error: expected constructor, destructor, or type
conversion before '*' token
In file included from IcedTeaScriptablePluginObject.h:49,
                 from IcedTeaNPPlugin.cc:75:
IcedTeaJavaRequestProcessor.h:107: error: 'NPVariant' has not been declared

and more...

this is ArchLinux x86_64, gcc 4.4, checking for xulrunner version... 1090105
(1.9.0.5/FF3.5.5)


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 08:03:41 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 16:03:41 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCEub-0007g2-Cg@icedtea.classpath.org>

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





------- Comment #6 from jlpoole at pon.net  2009-11-22 16:03 -------
Could I get a little bit more guidance.  

When you write "fix this by linking shared libraries with -Wl,-lgcc", I do not
know what you are suggesting?  Should I go into Makefile and edit certain lines
adding these flags?  Or are these configure flags.  Since it take about 20+
hours to compile, I don't want to experiment with configure only to have to
undertake an unsuccessful compile.  And should I use the format "-Wl,-lgcc" or
delimit the parameters with a space as in: "-Wl -lgcc"?


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 09:11:04 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 22 Nov 2009 17:11:04 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCFxo-0007ir-5M@icedtea.classpath.org>

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





------- Comment #7 from aph at redhat.com  2009-11-22 17:11 -------
> When you write "fix this by linking shared libraries with -Wl,-lgcc", I do not
> know what you are suggesting?  Should I go into Makefile and edit certain
> lines
> adding these flags?

At the point where you get the error message, try repeating the last command,
but with "-Wl,-lgcc" added to the line.  If that works, we'll make a patch for
ARM builds.  I don't think you need to edit the makefile, just go into the
diretcory and run it by hand.

> And should I use the format "-Wl,-lgcc" or
> delimit the parameters with a space as in: "-Wl -lgcc"?

Use "-Wl,-lgcc".


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 20:20:24 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Nov 2009 04:20:24 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCQPY-00084R-42@icedtea.classpath.org>

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





------- Comment #8 from jlpoole at pon.net  2009-11-23 04:20 -------
Created an attachment (id=275)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=275&action=view)
Recreation of error line and 4 attempts to incorporate suggested parameter

Attached are:
1) Recreating the original error:
2) 1st Attempt: placing "-Wl,-lgcc" at the end of the command
3) 2nd Attempt: placing "-Wl, -lgcc" after "-g -02"
4) 3rd Attempt: placing "-Wl, -lgcc" after "jv-convert"
5) 4th Attempt: placing "-Wl, -lgcc" after "/gcc/gcj"


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 20:25:27 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Nov 2009 04:25:27 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCQUR-00084X-Av@icedtea.classpath.org>

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





------- Comment #9 from jlpoole at pon.net  2009-11-23 04:25 -------
I'm sorry my unfamiliarity with compiling and libtool makes me have to come
back to you.  I tried various scenarios and attached the results in a file to
this bug. 

Basically, I tried to determine which line was causing the error (I think I
accomplished that) and then I tried to determine where to place the suggested
line parameters "-Wl,-lgcc".  I made four attempts and was unsuccessful.

I tried reading the documentation on libtool at
http://www.gnu.org/software/libtool/manual/html_node/Link-mode.html#Link-mode
but there is no documentation about the "Wl"; moreover I found the
documentation did not enlighten me very will into analyzing what the problem
command line is doing.

What may I try next?


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


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 22 20:27:34 2009
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 23 Nov 2009 04:27:34 +0000
Subject: [Bug 412] build fails at final link
Message-ID: <E1NCQWU-00084c-AZ@icedtea.classpath.org>

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





------- Comment #10 from jlpoole at pon.net  2009-11-23 04:27 -------
(In reply to comment #8)
> Created an attachment (id=275)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=275&action=view) [details]
> Recreation of error line and 4 attempts to incorporate suggested parameter
> 
> Attached are:
> 1) Recreating the original error:
> 2) 1st Attempt: placing "-Wl,-lgcc" at the end of the command
> 3) 2nd Attempt: placing "-Wl, -lgcc" after "-g -02"
> 4) 3rd Attempt: placing "-Wl, -lgcc" after "jv-convert"
> 5) 4th Attempt: placing "-Wl, -lgcc" after "/gcc/gcj"
> 

Note: The spaces showing above within the quotation marks were not in the
actual commands.  Lines #3-5 on the summary should have read:
  3) 2nd Attempt: placing "-Wl,-lgcc" after "-g -02"
  4) 3rd Attempt: placing "-Wl,-lgcc" after "jv-convert"
  5) 4th Attempt: placing "-Wl,-lgcc" after "/gcc/gcj"


-- 
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 Nov 23 01:15:02 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Nov 2009 09:15:02 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
Message-ID: <17c6771e0911230115s686bf606x5b5526d7644625ef@mail.gmail.com>

2009/11/19 Tomas Hurka <Tomas.Hurka at sun.com>:
> Hi Andrew,
>
> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>
>> We're getting this failure:
>>
>> BUILD FAILED
>>
>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
>> The module org.jdesktop.layout
>> cannot be compiled against because it is part of the cluster
>>
>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
>> which is not part of cluster.path
>> in your suite configuration.
>>
>> Any ideas what this means?
>
> You need to build it against NetBeans Platform 6.7.1
> (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using older
> version.
>
> Bye,
> --
> Tomas Hurka ? <mailto:tomas.hurka at sun.com>
> NetBeans Profiler http://profiler.netbeans.org
> VisualVM http://visualvm.dev.java.net
> Software Engineer, Developer Platforms Group
> Sun Microsystems, Praha Czech Republic
>
>

Well yes, this is in our nightly build on an F11 box.  You didn't
mention any change of requirements in your original email. I'm in two
minds as to whether we should revert this change or not.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gnu_andrew at member.fsf.org  Mon Nov 23 01:17:15 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Nov 2009 09:17:15 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
	<D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>
Message-ID: <17c6771e0911230117t4af1af43w3b41c1a801a14e35@mail.gmail.com>

2009/11/19 Lillian Angel <langel at redhat.com>:
> Andrew,
>
>
> On 2009-11-19, at 11:38 AM, Tomas Hurka wrote:
>
>> Hi Andrew,
>>
>> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>>
>>> We're getting this failure:
>>>
>>> BUILD FAILED
>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
>>> The module org.jdesktop.layout
>>> cannot be compiled against because it is part of the cluster
>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
>>> which is not part of cluster.path
>>> in your suite configuration.
>>>
>>> Any ideas what this means?
>> You need to build it against NetBeans Platform 6.7.1 (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using older version.
>
> Be sure when we update IcedTea in Fedora, this is only applied as a patch in Fedora 12 (and rawhide) and not updated in Fedora 10 or 11. Same case for all other distributions, I just don't know if they build with --enable-visualvm. We should update the docs to say 6.7.1 is required.
>
>
> Cheers

This isn't in IcedTea6 yet but is in IcedTea7, which should be safe;
the likelihood of someone wanting to ship VisualVM with that is pretty
low.  What versions of IcedTea6 are in each of the Fedoras now?  I'm
guessing this would want to go in HEAD and then be used for F12 and up
as part of the next release.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gnu_andrew at member.fsf.org  Mon Nov 23 01:20:25 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Nov 2009 09:20:25 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <4B05A9F2.9020101@ubuntu.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
	<D1BE8782-074F-467A-81BF-E7E077123870@redhat.com>
	<4B05A9F2.9020101@ubuntu.com>
Message-ID: <17c6771e0911230120k6a07e825v21436d7467b99a64@mail.gmail.com>

2009/11/19 Matthias Klose <doko at ubuntu.com>:
> On 19.11.2009 13:24, Lillian Angel wrote:
>>
>> Andrew,
>>
>>
>> On 2009-11-19, at 11:38 AM, Tomas Hurka wrote:
>>
>>> Hi Andrew,
>>>
>>> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>>>
>>>> We're getting this failure:
>>>>
>>>> BUILD FAILED
>>>>
>>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/templates/projectized.xml:93:
>>>> The module org.jdesktop.layout
>>>> cannot be compiled against because it is part of the cluster
>>>>
>>>> /notnfs/nighttester/icedtea7-target-testing/netbeans/nbbuild/netbeans_visualvm/platform9
>>>> which is not part of cluster.path
>>>> in your suite configuration.
>>>>
>>>> Any ideas what this means?
>>>
>>> You need to build it against NetBeans Platform 6.7.1
>>> (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using older
>>> version.
>>
>> Be sure when we update IcedTea in Fedora, this is only applied as a patch
>> in Fedora 12 (and rawhide) and not updated in Fedora 10 or 11. Same case for
>> all other distributions, I just don't know if they build with
>> --enable-visualvm. We should update the docs to say 6.7.1 is required.
>
> other distributions build separate sources from a separate source package. I
> still don't see the value why visualvm needs to be built from IcedTea. But
> maybe somebody wants to add javadb as well in the future.
>

I've also never included it in the ebuilds for Gentoo -- it's
infeasible given it requires NetBeans which in turns requires the very
JDK being built.

It does work from the point of view of a personal build of IcedTea,
giving the builder a JDK with more of the features of the proprietary
JDK, which I believe includes this thing.

> ?Matthias
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From andrew at icedtea.classpath.org  Mon Nov 23 01:28:31 2009
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 23 Nov 2009 09:28:31 +0000
Subject: /hg/icedtea: 4 new changesets
Message-ID: <hg.d96a0228b792.1258968511.-6899778133799504387@icedtea.classpath.org>

changeset d96a0228b792 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d96a0228b792
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 18 00:06:43 2009 +0000

	Update NEWS.

	2009-11-17 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Mention VisualVM and changes in building
	the Java plugin code.


changeset d5e5028e4026 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d5e5028e4026
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 18 00:07:24 2009 +0000

	Added tag icedtea-1.12 for changeset d96a0228b792


changeset 12b80715576e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=12b80715576e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 23 09:29:41 2009 +0000

	Update NetBeans requirement to 6.7.1.

	2009-11-23 Andrew John Hughes <ahughes at redhat.com>

	 * INSTALL: Update NetBeans requirement to 6.7.1.


changeset 440306c5b19d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=440306c5b19d
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Nov 23 09:31:03 2009 +0000

	Merge


diffstat:

4 files changed, 21 insertions(+), 2 deletions(-)
.hgtags   |    4 ++++
ChangeLog |   11 +++++++++++
INSTALL   |    2 +-
NEWS      |    6 +++++-

diffs (61 lines):

diff -r 81a1e18fede2 -r 440306c5b19d .hgtags
--- a/.hgtags	Tue Nov 17 21:35:00 2009 +0000
+++ b/.hgtags	Mon Nov 23 09:31:03 2009 +0000
@@ -24,3 +24,7 @@ 3f7290ca2f5730cf1ebd8fcbbd062417750655aa
 3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
 3f7290ca2f5730cf1ebd8fcbbd062417750655aa icedtea-1.12
 0000000000000000000000000000000000000000 icedtea-1.12
+0000000000000000000000000000000000000000 icedtea-1.12
+81a1e18fede27d94540b67a42798419aaf59f5b9 icedtea-1.12
+81a1e18fede27d94540b67a42798419aaf59f5b9 icedtea-1.12
+d96a0228b79286eea28af85707fd8ccc42cbed84 icedtea-1.12
diff -r 81a1e18fede2 -r 440306c5b19d ChangeLog
--- a/ChangeLog	Tue Nov 17 21:35:00 2009 +0000
+++ b/ChangeLog	Mon Nov 23 09:31:03 2009 +0000
@@ -1,3 +1,14 @@ 2009-11-17  Andrew John Hughes  <ahughes
+2009-11-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* INSTALL: Update NetBeans requirement
+	to 6.7.1.
+
+2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Mention VisualVM and changes in building
+	the Java plugin code.
+
 2009-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-jaxws-getdtdtype.patch:
diff -r 81a1e18fede2 -r 440306c5b19d INSTALL
--- a/INSTALL	Tue Nov 17 21:35:00 2009 +0000
+++ b/INSTALL	Mon Nov 23 09:31:03 2009 +0000
@@ -35,7 +35,7 @@ pulseaudio-libs-devel >= 0.9.11
 pulseaudio-libs-devel >= 0.9.11
 
 For building VisualVM, you will need
-netbeans = 6.5
+netbeans = 6.7.1
 
 For building the zero-assembler port (see below), you will need libffi.
 
diff -r 81a1e18fede2 -r 440306c5b19d NEWS
--- a/NEWS	Tue Nov 17 21:35:00 2009 +0000
+++ b/NEWS	Mon Nov 23 09:31:03 2009 +0000
@@ -1,4 +1,4 @@ New in release 1.12 (2009-XX-XX)
-New in release 1.12 (2009-XX-XX)
+New in release 1.12 (2009-11-17)
 
 - Updated to OpenJDK7 milestone 5; includes:
   - From Project Coin:
@@ -38,6 +38,10 @@ New in release 1.12 (2009-XX-XX)
     patches/boot.
   * The icedtea-against-icedtea target is now icedtea-stage2.
     The icedtea-against-ecj target is now icedtea-stage1.
+  * The Java code for the plugin is now built by the
+    liveconnect.stamp and liveconnect-dist.stamp targets
+    rather than hijacking the OpenJDK build.
+- Upgraded to VisualVM 1.2.1
 
 New in release 1.11 (2009-08-06)
 


From gbenson at icedtea.classpath.org  Mon Nov 23 03:37:22 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Mon, 23 Nov 2009 11:37:22 +0000
Subject: /hg/icedtea6: 2009-11-23  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.7b1be6431ccf.1258976242.2873452341184383832@icedtea.classpath.org>

changeset 7b1be6431ccf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7b1be6431ccf
author: Gary Benson <gbenson at redhat.com>
date: Mon Nov 23 12:41:55 2009 +0100

	2009-11-23 Gary Benson <gbenson at redhat.com>

	 * contrib/jck/compile-native-code.sh: Support s390x.


diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog                          |    4 ++++
contrib/jck/compile-native-code.sh |    2 +-

diffs (23 lines):

diff -r d5f77a4c9214 -r 7b1be6431ccf ChangeLog
--- a/ChangeLog	Wed Nov 18 10:56:39 2009 -0500
+++ b/ChangeLog	Mon Nov 23 12:41:55 2009 +0100
@@ -1,3 +1,7 @@ 2009-11-18  Gary Benson  <gbenson at redhat
+2009-11-23  Gary Benson  <gbenson at redhat.com>
+
+	* contrib/jck/compile-native-code.sh: Support s390x.
+
 2009-11-18  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-shark.patch
diff -r d5f77a4c9214 -r 7b1be6431ccf contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh	Wed Nov 18 10:56:39 2009 -0500
+++ b/contrib/jck/compile-native-code.sh	Mon Nov 23 12:41:55 2009 +0100
@@ -25,7 +25,7 @@ case "$arch" in
   i?86|ppc)
     MFLAG=-m32
     ;;
-  x86_64|ppc64)
+  x86_64|ppc64|s390x)
     MFLAG=-m64
     ;;
   *)


From Tomas.Hurka at Sun.COM  Mon Nov 23 05:08:38 2009
From: Tomas.Hurka at Sun.COM (Tomas Hurka)
Date: Mon, 23 Nov 2009 14:08:38 +0100
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <17c6771e0911230115s686bf606x5b5526d7644625ef@mail.gmail.com>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
	<17c6771e0911230115s686bf606x5b5526d7644625ef@mail.gmail.com>
Message-ID: <6C50E3B8-86D1-441A-8EB9-DA8306199C60@Sun.COM>

Hi Andrew,

On 23 Nov 2009, at 10:15, Andrew John Hughes wrote:

> 2009/11/19 Tomas Hurka <Tomas.Hurka at sun.com>:
>>
>> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>>
>>> We're getting this failure:
>>>
>>> BUILD FAILED
[..]
>>> Any ideas what this means?
>>
>> You need to build it against NetBeans Platform 6.7.1
>> (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are  
>> using older
>> version.
>
> Well yes, this is in our nightly build on an F11 box.  You didn't
> mention any change of requirements in your original email.
I did mentioned it here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-October/007408.html
I did not know that you are still using NetBeans 6.5, since NetBeans  
6.7 was released almost half a year ago.

Bye,
--
Tomas Hurka   <mailto:tomas.hurka at sun.com>
NetBeans Profiler http://profiler.netbeans.org
VisualVM http://visualvm.dev.java.net
Software Engineer, Developer Platforms Group
Sun Microsystems, Praha Czech Republic





From gnu_andrew at member.fsf.org  Mon Nov 23 06:15:08 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Nov 2009 14:15:08 +0000
Subject: VisualVM 1.2.1 and IcedTea6
In-Reply-To: <6C50E3B8-86D1-441A-8EB9-DA8306199C60@Sun.COM>
References: <569184CB-5D39-4463-9274-E27AD93A2589@sun.com>
	<17c6771e0911171354ufbffa98ua68b773760a85df3@mail.gmail.com>
	<BF2B9152-D1B3-4EF7-B7AD-DCF3BAB77208@Sun.COM>
	<17c6771e0911190824l3e67df8dl89d27156752c7b8c@mail.gmail.com>
	<4EF293B1-F9A6-4558-BC15-06431322E6A6@Sun.COM>
	<17c6771e0911230115s686bf606x5b5526d7644625ef@mail.gmail.com>
	<6C50E3B8-86D1-441A-8EB9-DA8306199C60@Sun.COM>
Message-ID: <17c6771e0911230615t795415beh90cfca153e733338@mail.gmail.com>

2009/11/23 Tomas Hurka <Tomas.Hurka at sun.com>:
> Hi Andrew,
>
> On 23 Nov 2009, at 10:15, Andrew John Hughes wrote:
>
>> 2009/11/19 Tomas Hurka <Tomas.Hurka at sun.com>:
>>>
>>> On 19 Nov 2009, at 17:24, Andrew John Hughes wrote:
>>>>
>>>> We're getting this failure:
>>>>
>>>> BUILD FAILED
>
> [..]
>>>>
>>>> Any ideas what this means?
>>>
>>> You need to build it against NetBeans Platform 6.7.1
>>> (netbeans-platform-6.7.1-2.fc12.noarch). It looks like you are using
>>> older
>>> version.
>>
>> Well yes, this is in our nightly build on an F11 box. ?You didn't
>> mention any change of requirements in your original email.
>
> I did mentioned it here:
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-October/007408.html

True, but it would have been much clearer to have mentioned it in the
e-mail rather than expecting people to remember this earlier thread (I
didn't).

> I did not know that you are still using NetBeans 6.5, since NetBeans 6.7 was
> released almost half a year ago.
>

We're not talking about me personally (I don't use any version of
NetBeans), but about what is available in various distributions.  As a
Fedora user, you are probably aware that version 12, which contains
this version of NetBeans, has only just been released, and so it isn't
yet in widespread use.  I would imagine other distributions are the
same; a quick web search shows only the very latest Ubuntu has 6.7 and
Debian is still on 6.0.

Six months is nothing; if we were talking six years, you'd have a point :)

> Bye,
> --
> Tomas Hurka ? <mailto:tomas.hurka at sun.com>
> NetBeans Profiler http://profiler.netbeans.org
> VisualVM http://visualvm.dev.java.net
> Software Engineer, Developer Platforms Group
> Sun Microsystems, Praha Czech Republic
>
>
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gnu_andrew at member.fsf.org  Mon Nov 23 06:19:51 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 23 Nov 2009 14:19:51 +0000
Subject: IcedTea6 -- Next Generation
Message-ID: <17c6771e0911230619v11c93788mb424ef17e56f05a1@mail.gmail.com>

Hi all,

I've just created a clone of HEAD at

http://icedtea.classpath.org/people/andrew/icedtea6-hg

which I intend to use to provide a version of IcedTea6 which tracks
the current Mercurial version of OpenJDK6 rather than the tarball.
This will enable us to test new build drops before they occur - the
motivation for doing it now is to test the upcoming b18.

In this branch, ./configure && make will be _intentionally_ broken --
you'll need to use --enable-hg or --with-openjdk-src-dir=<path to
OpenJDK6 hg checkout> to build.

Happy hacking,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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

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


From gbenson at icedtea.classpath.org  Wed Nov 25 03:36:11 2009
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Wed, 25 Nov 2009 11:36:11 +0000
Subject: /hg/icedtea6: 2009-11-25  Gary Benson  <gbenson@redhat.com>
Message-ID: <hg.610a316e54d2.1259148971.2873452341184383832@icedtea.classpath.org>

changeset 610a316e54d2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=610a316e54d2
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 25 11:41:02 2009 +0000

	2009-11-25 Gary Benson <gbenson at redhat.com>

	 * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
	(ZeroEntry::entry_point): Removed explicit inline.
	(ZeroEntry::invoke): Likewise. (ZeroEntry::invoke_osr):
	Likewise.


diffstat:

2 files changed, 10 insertions(+), 3 deletions(-)
ChangeLog                                    |    7 +++++++
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp |    6 +++---

diffs (39 lines):

diff -r 7b1be6431ccf -r 610a316e54d2 ChangeLog
--- a/ChangeLog	Mon Nov 23 12:41:55 2009 +0100
+++ b/ChangeLog	Wed Nov 25 11:41:02 2009 +0000
@@ -1,3 +1,10 @@ 2009-11-23  Gary Benson  <gbenson at redhat
+2009-11-25  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp 
+	(ZeroEntry::entry_point): Removed explicit inline.
+	(ZeroEntry::invoke): Likewise.
+	(ZeroEntry::invoke_osr): Likewise.
+
 2009-11-23  Gary Benson  <gbenson at redhat.com>
 
 	* contrib/jck/compile-native-code.sh: Support s390x.
diff -r 7b1be6431ccf -r 610a316e54d2 ports/hotspot/src/cpu/zero/vm/entry_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Mon Nov 23 12:41:55 2009 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/entry_zero.hpp	Wed Nov 25 11:41:02 2009 +0000
@@ -33,7 +33,7 @@ class ZeroEntry {
   address _entry_point;
 
  public:
-  inline address entry_point() const {
+  address entry_point() const {
     return _entry_point;
   }
   void set_entry_point(address entry_point) {
@@ -50,10 +50,10 @@ class ZeroEntry {
                                TRAPS);
 
  public:
-  inline void invoke(methodOop method, TRAPS) const {
+  void invoke(methodOop method, TRAPS) const {
     ((NormalEntryFunc) entry_point())(method, (intptr_t) this, THREAD);
   }
-  inline void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
+  void invoke_osr(methodOop method, address osr_buf, TRAPS) const {
     ((OSREntryFunc) entry_point())(method, osr_buf, (intptr_t) this, THREAD);
   }
 


From mjw at redhat.com  Mon Nov 30 11:21:11 2009
From: mjw at redhat.com (Mark Wielaard)
Date: Mon, 30 Nov 2009 20:21:11 +0100
Subject: systemtap java hotspot backtrace support
Message-ID: <1259608871.2267.60.camel@hermans.wildebeest.org>

Hi,

Attached is a systemtap helper script to go with the other tapsets
(hotspot.stp and hotspot_jni.stp) in icedtea. (And some build/configury
patches to slot it in the build).

At the moment on x86_64 it is blocked on systemtap bug #11034, but when
that is solved I like to check this in as a first step (it works fine on
i386 with either client or server libjvm.so and a smaller version - with
some of the frames smarts removes works fine on x86_64). You will need
the latest systemtap from git for the moment though, since it relies on
some recent bug/feature fixes on git trunk.

With this you can get java backtraces, with or without full method
signatures and with or without native frames in between, from any
hotspot probe context. You can directly print the stack to the trace
log, or collect it as a space separated string to inspect (and if needed
tweak some parameters to say how many frames you want and whether or not
to include method signatures and/or native frames). There is
documentation in the jstack.stp script about the various jstack()
function variants.

There are a couple of points that can use improvements (suggestions how
to do it very welcome):

- Collecting of frames isn't as useful as it looks since they are
  limited by MAXSTRINGLEN.
- The server (c2) compiler can trash the frame pointer, so we try to
  catch up by inspecting the stack. This mostly works, but can miss a
  frame. It would be nice to be able to retrieve the register map for
  the frame somehow.
- Similar to the above, we collect "native frames", while it would be
  nice to somehow collect the "virtual frames" (so inlined code expands
  to the corresponding java frames again).
- We are using the server libjvm.so dwarf info to extract all structure
  info, this is actually wrong, we should use the client libjvm.so when
  the client libjvm.so is probed (but the key structures are the same).
- The @casts in the actual jstack_call() function look somewhat ugly
  because they need to explicitly reference the absolute libjvm.so path.
- Related to the above, $vars cannot be used in stap functions (unlike
  @cast), which means we need to extract some info in a global probe
  (hotspot.vm_init_ended). Some way to associate an helper function with
  the probed module would be really nice.
  This creates two major limitations:
  - When starting to trace after this global probe has triggered
    jstack() just doesn't work.
  - Only one java process at a time can be traced since multiple
    global variables will conflict otherwise (this impacts tracing
    eclipse and netbeans, which start in "stages" running multiple
    java processes).
- For native frames it helps to add -d .../.../libjava.so also to see
  the core library jni helper functions. Would be nice to somehow
  include this (and maybe other libraries under jre/lib) automatically.

If anybody uses the jstack script please let me know how it works out.
And if you hit any of the above limitations or have ideas how to resolve
them, please also let me know.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jstack.stp.in
Type: text/x-csrc
Size: 18622 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091130/02145f3a/jstack.stp.in 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jstack-build.patch
Type: text/x-patch
Size: 1397 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20091130/02145f3a/jstack-build.patch