# HG changeset patch
# User doko@ubuntu.com
# Date 1242411145 -7200
# Node ID b7e4278456bce579c7d44f2b45b075047022123f
# Parent  002142bdaa0dd72a20c665a17721e6c75dfc76ec
2009-05-15  Matthias Klose  <doko@ubuntu.com>

        * patches/icedtea-cacao-no-mmap-first-page.patch: New.
        * Makefile.am (ICEDTEA_PATCHES): Apply above patch.
        * HACKING: Update.

diff -r 002142bdaa0d -r b7e4278456bc ChangeLog
--- a/ChangeLog	Fri May 15 14:05:51 2009 -0400
+++ b/ChangeLog	Fri May 15 20:12:25 2009 +0200
@@ -1,3 +1,9 @@
+2009-05-15  Matthias Klose  <doko@ubuntu.com>
+
+	* patches/icedtea-cacao-no-mmap-first-page.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Apply above patch.
+	* HACKING: Update.
+
 2009-05-15  Lillian Angel  <langel@redhat.com>
 
 	* configure.ac: Changed version back to 1.5.
diff -r 002142bdaa0d -r b7e4278456bc HACKING
--- a/HACKING	Fri May 15 14:05:51 2009 -0400
+++ b/HACKING	Fri May 15 20:12:25 2009 +0200
@@ -95,6 +95,7 @@
 * icedtea-java2d-stroker-internal-joint.patch: Fix penultimate joint created by GeneralPath.closePath().
 * icedtea-java2d-stroker-internal-close-joint.patch: Fix final joint created by GeneralPath.closePath().
 * icedtea-cacao.patch: For the 'java' command, create new thread depending on the current VM.
+* icedtea-cacao-no-mmap-first-page.patch: Don't mmap the first memory page.
 * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
 * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
 * icedtea-signature-iterator.patch: Add zero-specific signature handling.
diff -r 002142bdaa0d -r b7e4278456bc Makefile.am
--- a/Makefile.am	Fri May 15 14:05:51 2009 -0400
+++ b/Makefile.am	Fri May 15 20:12:25 2009 +0200
@@ -587,7 +587,8 @@
 
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
-	patches/icedtea-cacao.patch
+	patches/icedtea-cacao.patch \
+	patches/icedtea-cacao-no-mmap-first-page.patch
 endif
 if WITH_CACAO
 ICEDTEA_PATCHES += \
diff -r 002142bdaa0d -r b7e4278456bc patches/icedtea-cacao-no-mmap-first-page.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cacao-no-mmap-first-page.patch	Fri May 15 20:12:25 2009 +0200
@@ -0,0 +1,23 @@
+--- cacao/cacao/src/vm/jit/trap.c.orig	2008-07-07 13:36:19.000000000 +0200
++++ cacao/cacao/src/vm/jit/trap.c	2008-07-23 10:45:30.480113152 +0200
+@@ -59,20 +59,6 @@
+  */
+ void trap_init(void)
+ {
+-#if !(defined(__ARM__) && defined(__LINUX__))
+-	/* On arm-linux the first memory page can't be mmap'ed, as it
+-	   contains the exception vectors. */
+-
+-	int pagesize;
+-
+-	/* mmap a memory page at address 0x0, so our hardware-exceptions
+-	   work. */
+-
+-	pagesize = system_getpagesize();
+-
+-	(void) system_mmap_anonymous(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED);
+-#endif
+-
+ 	TRACESUBSYSTEMINITIALIZATION("trap_init");
+ 
+ #if !defined(TRAP_INSTRUCTION_IS_LOAD)