--- a/ChangeLog	Fri Mar 13 17:02:59 2009 -0400
+++ b/ChangeLog	Sat Mar 14 17:13:20 2009 +0100
@@ -1,3 +1,11 @@
+2009-03-14  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-s390-noinline.patch: Add special flags for javac on
+	s390 to work around a VM problem with bad code generation during
+	inlining.
+	* Makefile.am: Apply.
+	* HACKING: Document the above.
+
 2009-03-13  Omair Majid  <omajid@redhat.com>
 
 	* patches/icedtea-jtreg-6592792.patch: New file. Makes the

--- a/HACKING	Fri Mar 13 17:02:59 2009 -0400
+++ b/HACKING	Sat Mar 14 17:13:20 2009 +0100
@@ -86,6 +86,7 @@
 * icedtea-cc-interp-backedge.patch: Remove some duplicated code in DO_BACKEDGE_CHECKS.
 * icedtea-xml-encodinginfo.patch: Fix possible StackOverflowError in EncodingInfo (PR295).
 * icedtea-jtreg-6592792.patch: Fix jtreg test for bug 6592792 so that it compiles.
+* icedtea-s390-noinline.patch: Add special flags for javac on s390 to work around a VM problem with bad code generation during inlining.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 

--- a/Makefile.am	Fri Mar 13 17:02:59 2009 -0400
+++ b/Makefile.am	Sat Mar 14 17:13:20 2009 +0100
@@ -663,6 +663,7 @@
 	patches/icedtea-cc-interp-backedge.patch \
 	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-jtreg-6592792.patch \
+	patches/icedtea-s390-noinline.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-s390-noinline.patch	Sat Mar 14 17:13:20 2009 +0100
@@ -0,0 +1,22 @@
+--- openjdk/corba/make/common/shared/Defs-java.gmk.orig	2009-03-13 06:30:44.000000000 +0100
++++ openjdk/corba/make/common/shared/Defs-java.gmk	2009-03-13 06:30:04.000000000 +0100
+@@ -32,7 +32,7 @@
+ # Memory related -J flags that all uses of java tools should use.
+ #
+ JAVA_MEM_FLAGS   = -Xmx$(MAX_VM_MEMORY)m
+-ifeq ($(ARCH), ia64)
++ifneq (,$(filter $(ARCH), ia64 s390))
+   # Special flags for javac on ia64 to work around a VM problem with
+   #   bad code generation during inlining (what version had this problem?):
+   #   Suspect this may not be needed anymore.
+--- openjdk/jdk/make/common/shared/Defs-java.gmk.orig	2009-03-13 00:07:32.000000000 +0100
++++ openjdk/jdk/make/common/shared/Defs-java.gmk	2009-03-13 07:40:42.000000000 +0100
+@@ -36,7 +36,7 @@
+ # Memory related -J flags that all uses of java tools should use.
+ #
+ JAVA_MEM_FLAGS   = -Xmx$(MAX_VM_MEMORY)m
+-ifeq ($(ARCH), ia64)
++ifneq (,$(filter $(ARCH), ia64 s390))
+   # Special flags for javac on ia64 to work around a VM problem with
+   #   bad code generation during inlining (what version had this problem?):
+   #   Suspect this may not be needed anymore.