/hg/icedtea6: 2009-10-06 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset f61b94ebf46a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f61b94ebf46a
author: Gary Benson <gbenson at redhat.com>
date: Tue Oct 06 13:42:46 2009 +0100

	2009-10-06 Gary Benson <gbenson at redhat.com>

	 * patches/icedtea-s390-serialize.patch: New file.
		* Makefile.am: Apply the above.
		* HACKING: Document the above.


diffstat:

4 files changed, 23 insertions(+)
ChangeLog                            |    6 ++++++
HACKING                              |    1 +
Makefile.am                          |    1 +
patches/icedtea-s390-serialize.patch |   15 +++++++++++++++

diffs (54 lines):

diff -r c7458f207acf -r f61b94ebf46a ChangeLog
--- a/ChangeLog	Mon Oct 05 14:13:48 2009 +0100
+++ b/ChangeLog	Tue Oct 06 13:42:46 2009 +0100
@@ -1,3 +1,9 @@ 2009-10-05  Edward Nevill    <ed at camswl.
+2009-10-06  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-s390-serialize.patch: New file.
+	* Makefile.am: Apply the above.
+	* HACKING: Document the above.
+
 2009-10-05  Edward Nevill    <ed at camswl.com>
 
 	* Support for generation of native libraries for JCK on ARM
diff -r c7458f207acf -r f61b94ebf46a HACKING
--- a/HACKING	Mon Oct 05 14:13:48 2009 +0100
+++ b/HACKING	Tue Oct 06 13:42:46 2009 +0100
@@ -106,6 +106,7 @@ The following patches are currently appl
 * icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
 * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
 * icedtea-shark.patch: Add support for the Shark JIT.
+* icedtea-s390-serialize.patch: Correctly detect serialization segfaults on s390.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r c7458f207acf -r f61b94ebf46a Makefile.am
--- a/Makefile.am	Mon Oct 05 14:13:48 2009 +0100
+++ b/Makefile.am	Tue Oct 06 13:42:46 2009 +0100
@@ -752,6 +752,7 @@ ICEDTEA_PATCHES += \
 	patches/openjdk/6648816.patch \
 	patches/openjdk/oj100103-debugger-socket-overflow.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-gcc-stack-markings.patch \
+	patches/icedtea-s390-serialize.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
diff -r c7458f207acf -r f61b94ebf46a patches/icedtea-s390-serialize.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-s390-serialize.patch	Tue Oct 06 13:42:46 2009 +0100
@@ -0,0 +1,15 @@
+diff -r 54de806cda4f -r 16b4f99fe54e openjdk-ecj/hotspot/src/share/vm/runtime/os.hpp
+--- openjdk/hotspot/src/share/vm/runtime/os.hpp	Fri Oct 02 14:46:11 2009 +0100
++++ openjdk/hotspot/src/share/vm/runtime/os.hpp	Fri Oct 02 15:28:00 2009 +0100
+@@ -300,6 +300,11 @@
+     // of the form:
+     // return ((_mem_serialize_page ^ addr) & -pagesize) == 0
+     //
++#ifdef S390
++    // s390 is one of those "some platforms"
++    if (addr == (address)_mem_serialize_page)
++      return true;
++#endif // S390
+     thr_addr  = (address)(((uintptr_t)thread >>
+                 get_serialize_page_shift_count()) &
+                 get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page;