/hg/release/icedtea6-1.9: 6 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Sep 30 06:59:23 PDT 2010 

changeset 896caf972fc5 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=896caf972fc5
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 13:10:13 2010 +0100

	Fix issues with NEWS file formatting.

	2010-09-30 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Fix Sun bug ID and use of &amp; rather than
	&.


changeset bfc8c5fd56f3 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=bfc8c5fd56f3
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 13:15:27 2010 +0100

	Support HotSpot 19.

	2010-09-19 Andrew John Hughes <ahughes at redhat.com>

	 Support HotSpot 19.
		* patches/icedtea-alpha-fixes.patch,
		* patches/icedtea-gcc-suffix-hotspot.patch,
		* patches/icedtea-print-lsb-release.patch,
		* patches/params-cast-size_t.patch,
		* patches/update-bootclasspath.patch: Split into original and
	hs19 versions.
		* Makefile.am: Apply some patches only when hs17 is built.
	Apply different variants of above patches depending on
	HotSpot build used.
		* hotspot.map: Add hs19.
		* patches/hotspot/hs19/alpha-fixes.patch,
		* patches/hotspot/hs19/gcc-suffix.patch,
		* patches/hotspot/hs19/params-cast-size_t.patch,
		* patches/hotspot/hs19/print_lsb_release.patch,
		* patches/hotspot/hs19/update-bootclasspath.patch: HotSpot 19
	variants of patches moved above.
		* patches/hotspot/original/alpha-fixes.patch,
		* patches/hotspot/original/gcc-suffix.patch,
		* patches/hotspot/original/params-cast-size_t.patch,
		* patches/hotspot/original/print_lsb_release.patch,
		* patches/hotspot/original/update-bootclasspath.patch: HotSpot
	17 patches moved from patches above.

	2010-09-10 Matthias Klose <doko at ubuntu.com>

	 * patches/params-cast-size_t.patch: Update, fix build
	failure on s390.


changeset 963f94dddd81 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=963f94dddd81
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 13:17:37 2010 +0100

	Apply icedtea-shark-build.patch for both HotSpots (top-level patch).

	2010-09-20 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Enable icedtea-shark-build.patch on
	all builds as it applies to the top-level makefiles and not
	HotSpot.


changeset 323cc6c6abc0 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=323cc6c6abc0
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 22 16:27:14 2010 +0100

	Split arm assembler and Shark into different directories so that
	Shark is not copied for hs19 builds (hs19 includes Shark).

	2010-09-22 Andrew John Hughes <ahughes at redhat.com>

	 * ports/hotspot/make/linux/makefiles/shark.make,
		* 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/cpu/zero/vm/shark_globals_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/thumb2.cpp,
		* ports/hotspot/src/share/vm/includeDB_shark,
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
		* ports/hotspot/src/share/vm/shark/llvmValue.hpp,
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
		* ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
		* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
		* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
		* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
		* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
		* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
		* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
		* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
		* ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
		* ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
		* ports/hotspot/src/share/vm/shark/sharkContext.cpp,
		* ports/hotspot/src/share/vm/shark/sharkContext.hpp,
		* ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
		* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
		* ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
		* ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
		* ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
		* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
		* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
		* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
		* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
		* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
		* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
		* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
		* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
		* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
		* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
		* ports/hotspot/src/share/vm/shark/sharkStack.cpp,
		* ports/hotspot/src/share/vm/shark/sharkStack.hpp,
		* ports/hotspot/src/share/vm/shark/sharkState.cpp,
		* ports/hotspot/src/share/vm/shark/sharkState.hpp,
		* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
		* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
		* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
		* ports/hotspot/src/share/vm/shark/sharkType.hpp,
		* ports/hotspot/src/share/vm/shark/sharkValue.cpp,
		* ports/hotspot/src/share/vm/shark/sharkValue.hpp,
		* ports/hotspot/src/share/vm/shark/shark_globals.cpp,
		* ports/hotspot/src/share/vm/shark/shark_globals.hpp,
		* ports/hotspot/tools/mkbc.c: Split into arm_port and shark
	directories.
		* Makefile.am: Only copy Shark when hs17 is built. hs19
	includes Shark and the in-tree Shark fails to build with it.
		* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp,
		* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
		* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
		* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp,
		* arm_port/hotspot/tools/mkbc.c: New location of arm assembler
	files.
		* shark/hotspot/make/linux/makefiles/shark.make,
		* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
		* shark/hotspot/src/share/vm/includeDB_shark,
		* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
		* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
		* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
		* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
		* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
		* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
		* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
		* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
		* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
		* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
		* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
		* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
		* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
		* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
		* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
		* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
		* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
		* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
		* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
		* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
		* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
		* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
		* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
		* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
		* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
		* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
		* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
		* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
		* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
		* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
		* shark/hotspot/src/share/vm/shark/sharkState.cpp,
		* shark/hotspot/src/share/vm/shark/sharkState.hpp,
		* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
		* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
		* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
		* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
		* shark/hotspot/src/share/vm/shark/sharkType.hpp,
		* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
		* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
		* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
		* shark/hotspot/src/share/vm/shark/shark_globals.hpp: New
	location of Shark.


changeset a7db7550a1e4 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=a7db7550a1e4
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 14:37:42 2010 +0100

	Merge


changeset b2807c6fe23b in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=b2807c6fe23b
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 14:59:01 2010 +0100

	Document support for HotSpot 19 and make the macro clearer.

	2010-09-30 Andrew John Hughes <ahughes at redhat.com>

	 * INSTALL: Mention new hs19 option.
		* NEWS: Add HotSpot 19 and S390 fix.
		* acinclude.m4: (AC_CHECK_WITH_HOTSPOT_BUILD): Set
	ALTERNATE_BUILD to hs19 rather than the non-existent hs16
	(used when
		--with-hotspot-build or
		--with-hotspot-build=yes is passed). This has been renamed
	from DEFAULT_BUILD which now correctly refers to the
	actual default ('original').


diffstat:

124 files changed, 35817 insertions(+), 35067 deletions(-)
ChangeLog                                               |  179 
INSTALL                                                 |   13 
Makefile.am                                             |   82 
NEWS                                                    |   11 
acinclude.m4                                            |   11 
arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp         |  583 +
arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def      | 7695 +++++++++++++++
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S   | 6336 ++++++++++++
arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp             | 7456 ++++++++++++++
arm_port/hotspot/tools/mkbc.c                           |  607 +
hotspot.map                                             |    1 
netx/javaws.1                                           |  123 
patches/hotspot/hs19/alpha-fixes.patch                  |   21 
patches/hotspot/hs19/gcc-suffix.patch                   |   31 
patches/hotspot/hs19/params-cast-size_t.patch           |  264 
patches/hotspot/hs19/print_lsb_release.patch            |   49 
patches/hotspot/hs19/update-bootclasspath.patch         |   13 
patches/hotspot/original/alpha-fixes.patch              |   31 
patches/hotspot/original/gcc-suffix.patch               |   25 
patches/hotspot/original/params-cast-size_t.patch       |  274 
patches/hotspot/original/print_lsb_release.patch        |   48 
patches/hotspot/original/update-bootclasspath.patch     |   13 
patches/icedtea-alpha-fixes.patch                       |   31 
patches/icedtea-gcc-suffix-hotspot.patch                |   25 
patches/icedtea-print-lsb-release.patch                 |   48 
patches/params-cast-size_t.patch                        |  252 
patches/update-bootclasspath.patch                      |   13 
ports/hotspot/make/linux/makefiles/shark.make           |   32 
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp            |  583 -
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def         | 7695 ---------------
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S      | 6336 ------------
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp    |   62 
ports/hotspot/src/cpu/zero/vm/thumb2.cpp                | 7456 --------------
ports/hotspot/src/share/vm/includeDB_shark              |  369 
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp        |   82 
ports/hotspot/src/share/vm/shark/llvmValue.hpp          |   62 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp         | 1260 --
ports/hotspot/src/share/vm/shark/sharkBlock.hpp         |  281 
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp       |  591 -
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp       |  209 
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp  |  259 
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp  |  417 
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp    |   87 
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp      |  340 
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp      |  119 
ports/hotspot/src/share/vm/shark/sharkConstant.cpp      |  128 
ports/hotspot/src/share/vm/shark/sharkConstant.hpp      |   64 
ports/hotspot/src/share/vm/shark/sharkContext.cpp       |  180 
ports/hotspot/src/share/vm/shark/sharkContext.hpp       |  187 
ports/hotspot/src/share/vm/shark/sharkEntry.hpp         |   58 
ports/hotspot/src/share/vm/shark/sharkFunction.cpp      |  188 
ports/hotspot/src/share/vm/shark/sharkFunction.hpp      |  111 
ports/hotspot/src/share/vm/shark/sharkInliner.cpp       |  749 -
ports/hotspot/src/share/vm/shark/sharkInliner.hpp       |   32 
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp    |  277 
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp    |   54 
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp    |   37 
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp    |  167 
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |  116 
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |   88 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |  352 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp |  182 
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp       |  251 
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp       |   83 
ports/hotspot/src/share/vm/shark/sharkStack.cpp         |  263 
ports/hotspot/src/share/vm/shark/sharkStack.hpp         |  290 
ports/hotspot/src/share/vm/shark/sharkState.cpp         |  389 
ports/hotspot/src/share/vm/shark/sharkState.hpp         |  188 
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp  |   99 
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp  |   75 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 ---
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |  430 
ports/hotspot/src/share/vm/shark/sharkType.hpp          |  112 
ports/hotspot/src/share/vm/shark/sharkValue.cpp         |  260 
ports/hotspot/src/share/vm/shark/sharkValue.hpp         |  332 
ports/hotspot/src/share/vm/shark/shark_globals.cpp      |   29 
ports/hotspot/src/share/vm/shark/shark_globals.hpp      |   54 
ports/hotspot/tools/mkbc.c                              |  607 -
shark/hotspot/make/linux/makefiles/shark.make           |   32 
shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp    |   62 
shark/hotspot/src/share/vm/includeDB_shark              |  369 
shark/hotspot/src/share/vm/shark/llvmHeaders.hpp        |   82 
shark/hotspot/src/share/vm/shark/llvmValue.hpp          |   62 
shark/hotspot/src/share/vm/shark/sharkBlock.cpp         | 1260 ++
shark/hotspot/src/share/vm/shark/sharkBlock.hpp         |  281 
shark/hotspot/src/share/vm/shark/sharkBuilder.cpp       |  591 +
shark/hotspot/src/share/vm/shark/sharkBuilder.hpp       |  209 
shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp  |  259 
shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp  |  417 
shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp    |   87 
shark/hotspot/src/share/vm/shark/sharkCompiler.cpp      |  340 
shark/hotspot/src/share/vm/shark/sharkCompiler.hpp      |  119 
shark/hotspot/src/share/vm/shark/sharkConstant.cpp      |  128 
shark/hotspot/src/share/vm/shark/sharkConstant.hpp      |   64 
shark/hotspot/src/share/vm/shark/sharkContext.cpp       |  180 
shark/hotspot/src/share/vm/shark/sharkContext.hpp       |  187 
shark/hotspot/src/share/vm/shark/sharkEntry.hpp         |   58 
shark/hotspot/src/share/vm/shark/sharkFunction.cpp      |  188 
shark/hotspot/src/share/vm/shark/sharkFunction.hpp      |  111 
shark/hotspot/src/share/vm/shark/sharkInliner.cpp       |  749 +
shark/hotspot/src/share/vm/shark/sharkInliner.hpp       |   32 
shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp    |  277 
shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp    |   54 
shark/hotspot/src/share/vm/shark/sharkInvariants.cpp    |   37 
shark/hotspot/src/share/vm/shark/sharkInvariants.hpp    |  167 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |  116 
shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |   88 
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |  352 
shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp |  182 
shark/hotspot/src/share/vm/shark/sharkRuntime.cpp       |  251 
shark/hotspot/src/share/vm/shark/sharkRuntime.hpp       |   83 
shark/hotspot/src/share/vm/shark/sharkStack.cpp         |  263 
shark/hotspot/src/share/vm/shark/sharkStack.hpp         |  290 
shark/hotspot/src/share/vm/shark/sharkState.cpp         |  389 
shark/hotspot/src/share/vm/shark/sharkState.hpp         |  188 
shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp  |   99 
shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp  |   75 
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 +++
shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |  430 
shark/hotspot/src/share/vm/shark/sharkType.hpp          |  112 
shark/hotspot/src/share/vm/shark/sharkValue.cpp         |  260 
shark/hotspot/src/share/vm/shark/sharkValue.hpp         |  332 
shark/hotspot/src/share/vm/shark/shark_globals.cpp      |   29 
shark/hotspot/src/share/vm/shark/shark_globals.hpp      |   54 

diffs (truncated from 71553 to 500 lines):

diff -r 358b64f8f0bf -r b2807c6fe23b ChangeLog
--- a/ChangeLog	Wed Sep 08 13:35:51 2010 +0100
+++ b/ChangeLog	Thu Sep 30 14:59:01 2010 +0100
@@ -1,3 +1,182 @@ 2010-09-08  Andrew John Hughes  <ahughes
+2010-09-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* INSTALL: Mention new hs19 option.
+	* NEWS: Add HotSpot 19 and S390 fix.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Set
+	ALTERNATE_BUILD to hs19 rather than the
+	non-existent hs16 (used when
+	--with-hotspot-build or
+	--with-hotspot-build=yes is passed).
+	This has been renamed from DEFAULT_BUILD
+	which now correctly refers to
+	the actual default ('original').
+
+2010-09-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make,
+	* 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/cpu/zero/vm/shark_globals_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/thumb2.cpp,
+	* ports/hotspot/src/share/vm/includeDB_shark,
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	* ports/hotspot/src/share/vm/shark/llvmValue.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp,
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp,
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp,
+	* ports/hotspot/src/share/vm/shark/shark_globals.cpp,
+	* ports/hotspot/src/share/vm/shark/shark_globals.hpp,
+	* ports/hotspot/tools/mkbc.c:
+	Split into arm_port and shark directories.
+	* Makefile.am: Only copy Shark when hs17 is built.
+	hs19 includes Shark and the in-tree Shark fails to build with it.
+	* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp,
+	* arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def,
+	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S,
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp,
+	* arm_port/hotspot/tools/mkbc.c:
+	New location of arm assembler files.
+	* shark/hotspot/make/linux/makefiles/shark.make,
+	* shark/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+	* shark/hotspot/src/share/vm/includeDB_shark,
+	* shark/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+	* shark/hotspot/src/share/vm/shark/llvmValue.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkConstant.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkContext.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkEntry.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkFunction.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInliner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStack.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkState.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkType.hpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.cpp,
+	* shark/hotspot/src/share/vm/shark/sharkValue.hpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.cpp,
+	* shark/hotspot/src/share/vm/shark/shark_globals.hpp:
+	New location of Shark.
+
+2010-09-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Enable icedtea-shark-build.patch on all builds
+	as it applies to the top-level makefiles and not
+	HotSpot.
+
+2010-09-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	Support HotSpot 19.
+	* patches/icedtea-alpha-fixes.patch,
+	* patches/icedtea-gcc-suffix-hotspot.patch,
+	* patches/icedtea-print-lsb-release.patch,
+	* patches/params-cast-size_t.patch,
+	* patches/update-bootclasspath.patch:
+	Split into original and hs19 versions.
+	* Makefile.am: Apply some patches only when
+	hs17 is built.  Apply different variants of
+	above patches depending on HotSpot build used.
+	* hotspot.map: Add hs19.
+	* patches/hotspot/hs19/alpha-fixes.patch,
+	* patches/hotspot/hs19/gcc-suffix.patch,
+	* patches/hotspot/hs19/params-cast-size_t.patch,
+	* patches/hotspot/hs19/print_lsb_release.patch,
+	* patches/hotspot/hs19/update-bootclasspath.patch:
+	HotSpot 19 variants of patches moved above.
+	* patches/hotspot/original/alpha-fixes.patch,
+	* patches/hotspot/original/gcc-suffix.patch,
+	* patches/hotspot/original/params-cast-size_t.patch,
+	* patches/hotspot/original/print_lsb_release.patch,
+	* patches/hotspot/original/update-bootclasspath.patch:
+	HotSpot 17 patches moved from patches above.
+
+2010-09-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Fix Sun bug ID and use of &amp; rather than &.
+
+2010-09-13  Omair Majid  <omajid at redhat.com>
+
+	Add a new man page for netx's javaws.
+	* NEWS: Updated to indicate the new man page for javaws.
+	* Makefile.am
+	(stamps/add-netx.stamp): Copy over the javaws man page into the build.
+	(clean-add-netx): Remove the javaws man pages on clean.
+	(stamps/add-netx-debug.stamp): Copy over the javaws man page.
+	(clean-add-netx-debug): Remove the javaws man page.
+	(add-netx): New target. Alias for stamps/add-netx.stamp.
+	(add-netx-debug): New target. Alias for stamps/add-netx-debug.stamp.
+	* netx/javaws.1: New man page for netx's javaws.
+
+2010-09-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/params-cast-size_t.patch: Update, fix build failure on s390.
+
 2010-09-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* configure.ac: Bump to 1.9.1pre.
diff -r 358b64f8f0bf -r b2807c6fe23b INSTALL
--- a/INSTALL	Wed Sep 08 13:35:51 2010 +0100
+++ b/INSTALL	Thu Sep 30 14:59:01 2010 +0100
@@ -165,7 +165,7 @@ These are documented fully in the releva
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
 * --disable-plugin: Don't build the browser plugin.
 * --disable-npplugin: Build the old unsupported plugin rather than NPPlugin.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs17 as bundled with OpenJDK.
 * --with-rhino: Include Javascript support using Rhino.
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
@@ -318,8 +318,15 @@ download stage and just verifies that th
 download stage and just verifies that the zip's MD5 sum matches that
 of the requested build.
 
-At present, IcedTea6 only supports the 'original' HotSpot (hs17)
-provided as part of the upstream tarball.
+At present, IcedTea6 supports the 'original' HotSpot 17 provided as
+part of the upstream tarball and HotSpot 19 ('hs19') from the stable
+hs19 tree at http://hg.openjdk.java.net/hsx/hsx19/master.  The default
+is 'original'; passing --with-hotspot-build=hs19 to configure will
+download and build with HotSpot 19.  Note that the norm. is for up to
+one alternate (non-default) build to be supported and just passing
+--with-hotspot-build (equivalent to --with-hotspot-build=yes) will
+cause the alternate HotSpot to be used (currently hs19).  Conversely,
+passing --with-hotspot-build=no retains the default.
 
 Javascript Support
 ==================
diff -r 358b64f8f0bf -r b2807c6fe23b Makefile.am
--- a/Makefile.am	Wed Sep 08 13:35:51 2010 +0100
+++ b/Makefile.am	Thu Sep 30 14:59:01 2010 +0100
@@ -200,7 +200,6 @@ ICEDTEA_FSG_PATCHES =
 ICEDTEA_FSG_PATCHES =
 
 ICEDTEA_PATCHES = \
-	patches/shark_do_nothing_on_stub_frame.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
@@ -214,7 +213,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-headers.patch \
 	patches/icedtea-headers-hotspot.patch \
 	patches/icedtea-gcc-suffix.patch \
-	patches/icedtea-gcc-suffix-hotspot.patch \
+	patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
 	patches/icedtea-bytebuffer-compact.patch \
 	patches/memory-limits.patch \
 	patches/icedtea-sunsrc.patch \
@@ -223,22 +222,19 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-jvmtiEnv.patch \
 	patches/icedtea-lcms.patch \
 	patches/icedtea-timerqueue.patch \
-	patches/icedtea-print-lsb-release.patch \
+	patches/hotspot/$(HSBUILD)/print_lsb_release.patch \
 	patches/icedtea-jpegclasses.patch \
 	patches/icedtea-uname.patch \
 	patches/icedtea-freetypeversion.patch \
-	patches/icedtea-shark-build.patch \
-	patches/icedtea-shark-build-hotspot.patch \
 	patches/icedtea-nomotif-6706121.patch \
 	patches/icedtea-nomotif.patch \
 	patches/icedtea-nomotif-mtoolkit.patch \
-	patches/icedtea-alpha-fixes.patch \
+	patches/hotspot/$(HSBUILD)/alpha-fixes.patch \
 	patches/icedtea-alt-jar.patch \
 	patches/icedtea-jdk-use-ssize_t.patch \
 	patches/icedtea-use-idx_t.patch \
-	patches/params-cast-size_t.patch \
+	patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
 	patches/icedtea-clean-crypto.patch \
-	patches/icedtea-shark.patch \
 	patches/icedtea-arch.patch \
 	patches/icedtea-lc_ctype.patch \
 	patches/icedtea-xjc.patch \
@@ -266,18 +262,15 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-explicit-target-arch.patch \
 	patches/icedtea-gcc-stack-markings.patch \
 	patches/icedtea-no-precompiled.patch \
-	patches/icedtea-linux-separate-debuginfo.patch \
 	patches/icedtea-parisc.patch \
 	patches/icedtea-sh4-support.patch \
 	patches/icedtea-policy-evaluation.patch \
-	patches/update-bootclasspath.patch \
+	patches/hotspot/$(HSBUILD)/update-bootclasspath.patch \
 	patches/libpng.patch \
-	patches/shark.patch \
 	patches/extensions/netx.patch \
 	patches/extensions/netx-umask.patch \
 	patches/icedtea-jtreg-httpTest.patch \
 	patches/arm.patch \
-	patches/shark-debug-option.patch \
 	patches/openjdk/6678385-window_movement_crasher.patch \
 	patches/openjdk/6961732-negative_leading.patch \
 	patches/debug-dir.patch \
@@ -290,11 +283,22 @@ ICEDTEA_PATCHES = \
 	patches/fonts-gentoo.patch \
 	patches/ipv4-mapped-ipv6-addresses.patch \
 	patches/openjdk/6795060-icu_crash.patch \
-	patches/openjdk/6951319-sparc_build_fixes.patch \
 	patches/icedtea-too-many-args.patch \
 	patches/icedtea-jtreg-OpenGLContextInit.patch \
 	patches/openjdk/6969395-net_bugs.patch \
-	patches/openjdk/6510892-httpserver_test.patch
+	patches/openjdk/6510892-httpserver_test.patch \
+	patches/icedtea-shark-build.patch
+
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += \
+	patches/shark_do_nothing_on_stub_frame.patch \
+	patches/icedtea-shark-build-hotspot.patch \
+	patches/shark.patch \
+	patches/shark-debug-option.patch \
+	patches/icedtea-shark.patch \
+	patches/icedtea-linux-separate-debuginfo.patch \
+	patches/openjdk/6951319-sparc_build_fixes.patch
+endif
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -511,7 +515,7 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 
 EXTRA_DIST = generated $(NETX_SRCDIR) \
 	$(abs_top_srcdir)/patches/* \
-	contrib ports \
+	contrib shark arm_port \
 	extra overlays \
 	javaws.png javaws.desktop \
 	jconsole.desktop policytool.desktop \
@@ -868,11 +872,11 @@ clean-replace-hotspot:
 
 # Copy ports sources into tree
 stamps/ports.stamp: stamps/replace-hotspot.stamp
-	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/tools \
-		      $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
+if !WITH_ALT_HSBUILD
+	for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
+		      $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
+		      $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
+	  link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
 	  cp -rv $$target $$link; \
 	done
 	if ! test "x$(WITH_CACAO)" = "xno" ; then \
@@ -884,19 +888,31 @@ stamps/ports.stamp: stamps/replace-hotsp
 	  ln -sf $(abs_top_builddir)/ergo.c \
 	    openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
 	fi
+endif
+	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+	  cp -rv $$target $$link; \
+	done
 	mkdir -p stamps
 	touch stamps/ports.stamp
 
 clean-ports:
-	for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
-		      $(abs_top_srcdir)/ports/hotspot/tools \
-		      $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
-		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(echo $$target | sed 's/^.*ports/openjdk/'); \
+if !WITH_ALT_HSBUILD
+	for target in $(abs_top_srcdir)/shark/hotspot/make/*/makefiles/* \
+		      $(abs_top_srcdir)/shark/hotspot/src/*cpu/* \
+		      $(abs_top_srcdir)/shark/hotspot/src/share/vm/*; do \
+	  link=$$(dirname $$target | sed 's/^.*shark/openjdk/'); \
 	  rm -rf $$link; \
 	done
 	rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg
 	rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c 
+endif
+	for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
+		      $(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
+	  link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
+	  rm -rf $$link; \
+	done
 	rm -f stamps/ports.stamp
 
 stamps/generated.stamp: stamps/ports.stamp
@@ -1418,6 +1434,10 @@ stamps/add-netx.stamp: stamps/netx-dist.
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
 	touch stamps/add-netx.stamp
 
 clean-add-netx:
@@ -1427,6 +1447,8 @@ clean-add-netx:
 	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
 	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
 	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+	rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
 	rm -f stamps/add-netx.stamp
 
 stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
@@ -1438,6 +1460,10 @@ stamps/add-netx-debug.stamp: stamps/netx
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
+	cp $(NETX_SRCDIR)/javaws.1 \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
 	touch stamps/add-netx-debug.stamp
 
 clean-add-netx-debug:
@@ -1447,6 +1473,8 @@ clean-add-netx-debug:
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
 	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
+	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
 	rm -f stamps/add-netx-debug.stamp
 
 # OpenJDK ecj Targets
@@ -2162,6 +2190,10 @@ netx: stamps/netx.stamp
 
 netx-dist: stamps/netx-dist.stamp
 
+add-netx: stamps/add-netx.stamp
+
+add-netx-debug: stamps/add-netx-debug.stamp
+
 overlay: stamps/overlay.stamp
 
 patch: stamps/patch.stamp
diff -r 358b64f8f0bf -r b2807c6fe23b NEWS
--- a/NEWS	Wed Sep 08 13:35:51 2010 +0100
+++ b/NEWS	Thu Sep 30 14:59:01 2010 +0100
@@ -1,12 +1,19 @@ Key:
 Key:
 
-SX  - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6969395
+SX  - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X
 PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X
 RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X
 DX  - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
 GX  - http://bugs.gentoo.org/show_bug.cgi?id=X
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+
+New in release 1.9.1 (2010-XX-XX):
+* HotSpot 19 supported; use --with-hotspot-build=hs19 to enable.
+* NetX
+ - New man page for javaws
+* Fixes
+ - Fix build failure on S390
 
 New in release 1.9 (2010-09-07):
 
@@ -113,7 +120,7 @@ New in release 1.9 (2010-09-07):
   - S6786346: intermittent Internal Error (src/share/vm/memory/cardTableModRefBS.cpp:226)
   - S6786503: Overflow list performance can be improved
   - S6786948: SA on core file fails on solaris-amd64 if vm started with -XX:+StartAttachListener
-  - S6787106: Hotspot 32 bit build fails on platforms having different definitions for intptr_t &amp; int32_t
+  - S6787106: Hotspot 32 bit build fails on platforms having different definitions for intptr_t & int32_t
   - S6787254: Work queue capacity can be increased substantially on some platforms
   - S6788347: C2Compiler crash 6u7
   - S6788376: allow to ignore unrecognized VM options
diff -r 358b64f8f0bf -r b2807c6fe23b acinclude.m4
--- a/acinclude.m4	Wed Sep 08 13:35:51 2010 +0100
+++ b/acinclude.m4	Thu Sep 30 14:59:01 2010 +0100
@@ -938,7 +938,8 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
 
 AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
 [
-  DEFAULT_BUILD="hs16"
+  DEFAULT_BUILD="original"
+  ALTERNATE_BUILD="hs19"
   AC_MSG_CHECKING([which HotSpot build to use])
   AC_ARG_WITH([hotspot-build],
 	      [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
@@ -946,16 +947,16 @@ AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
     HSBUILD="${withval}"
   ],
   [ 
-    HSBUILD="original"
+    HSBUILD="${DEFAULT_BUILD}"
   ])
   if test "x${HSBUILD}" = xyes; then
+	HSBUILD="${ALTERNATE_BUILD}"
+  elif test "x${HSBUILD}" = xno; then
 	HSBUILD="${DEFAULT_BUILD}"
-  elif test "x${HSBUILD}" = xno; then
-	HSBUILD="original"
   fi
   AC_MSG_RESULT([${HSBUILD}])
   AC_SUBST([HSBUILD])
-  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xoriginal")
+  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${DEFAULT_BUILD}")
 ])
 
 AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],
diff -r 358b64f8f0bf -r b2807c6fe23b arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Thu Sep 30 14:59:01 2010 +0100
@@ -0,0 +1,583 @@
+/*
+ * Copyright 2009, 2010 Edward Nevill
+ *
+ * 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

More information about the distro-pkg-dev mailing list