# HG changeset patch
# User Andrew Haley  <aph@redhat.com>
# Date 1231155456 0
# Node ID b97986da0d62c8f16d7c4fa552b38202fac64f5c
# Parent  136f40a0dae4dbfb3a92d09c1ef9fea743ec6030
2008-12-24  Andrew Haley  <aph@redhat.com>

	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
	(SharkFunction::initialize): Work around bug in
	ciTypeFlow::Block::pre_order_at().
	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::compile_method): Allow "*" as a wildcard.
	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (llvm::IRBuilder):
	type2aelembytes now a mamber function.
	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp (class
	SharkBlock): is_private_copy renamed is_backedge_copy.
	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp (SharkBlock::parse):
	force_bci if there's a trap.
	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Delete
	everything.

diff -r 136f40a0dae4 -r b97986da0d62 Makefile.am
--- a/Makefile.am	Wed Dec 24 13:12:52 2008 -0500
+++ b/Makefile.am	Mon Jan 05 11:37:36 2009 +0000
@@ -554,6 +554,12 @@
 
 ICEDTEA_FSG_PATCHES =
 
+DISTRIBUTION_PATCHES = \
+	patches/mixtec-assertions.patch \
+	patches/mixtec-no-log-vm-output.patch \
+	patches/mixtec-no-print-vm-options.patch \
+	patches/mixtec-optimization.patch
+
 ICEDTEA_PATCHES = \
 	$(ZERO_PATCHES_COND) \
 	patches/icedtea-version.patch \