aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/cacao/files
diff options
context:
space:
mode:
authorHenning Heinold <henning@itconsulting-heinold.de>2014-01-03 21:42:17 +0100
committerHenning Heinold <henning@itconsulting-heinold.de>2014-01-09 01:25:35 +0100
commitb229a38bdb5cc0ebadcd36d6f71380aa932efec3 (patch)
tree545ae58f8099fc490ecc48c05ba92f8a5514d4b6 /recipes-core/cacao/files
parent14d6ad1608c66b8970d4052dce4cd1fc64fb6ea2 (diff)
downloadmeta-java-b229a38bdb5cc0ebadcd36d6f71380aa932efec3.tar.gz
meta-java-b229a38bdb5cc0ebadcd36d6f71380aa932efec3.tar.bz2
meta-java-b229a38bdb5cc0ebadcd36d6f71380aa932efec3.zip
cacao-initial: add cacao-initial recipe from oe-classic
Diffstat (limited to 'recipes-core/cacao/files')
-rw-r--r--recipes-core/cacao/files/cacao-0.98-initial.patch45
-rw-r--r--recipes-core/cacao/files/disable_hw_exceptions.patch22
2 files changed, 67 insertions, 0 deletions
diff --git a/recipes-core/cacao/files/cacao-0.98-initial.patch b/recipes-core/cacao/files/cacao-0.98-initial.patch
new file mode 100644
index 0000000..30b6d14
--- /dev/null
+++ b/recipes-core/cacao/files/cacao-0.98-initial.patch
@@ -0,0 +1,45 @@
+Index: cacao-0.98/configure.ac
+===================================================================
+--- cacao-0.98.orig/configure.ac 2007-12-19 22:07:55.000000000 +0100
++++ cacao-0.98/configure.ac 2007-12-19 22:08:02.000000000 +0100
+@@ -27,7 +27,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+
+-AC_INIT(cacao, 0.98, cacao@cacaojvm.org)
++AC_INIT(cacao-initial, 0.98, cacao@cacaojvm.org)
+ AC_CONFIG_SRCDIR(src/cacao/cacao.c)
+ AC_CANONICAL_HOST
+ AC_PREREQ(2.59)
+Index: cacao-0.98/src/vm/vm.c
+===================================================================
+--- cacao-0.98.orig/src/vm/vm.c 2007-12-19 22:31:19.000000000 +0100
++++ cacao-0.98/src/vm/vm.c 2007-12-19 22:32:36.000000000 +0100
+@@ -623,7 +623,7 @@
+ #else
+ puts(" java.boot.class.path : "CLASSPATH_CLASSES"");
+ #endif
+- puts(" gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR"/classpath\n");
++ puts(" gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR"/classpath-initial\n");
+
+ puts("Runtime variables:\n");
+ printf(" maximum heap size : %d\n", opt_heapmaxsize);
+@@ -828,15 +828,15 @@
+
+ /* and finally set the path to GNU Classpath libraries */
+
+- len = strlen(cacao_prefix) + strlen("/lib/classpath") + strlen("0");
++ len = strlen(cacao_prefix) + strlen("/lib/classpath-initial") + strlen("0");
+
+ classpath_libdir = MNEW(char, len);
+ strcpy(classpath_libdir, cacao_prefix);
+- strcat(classpath_libdir, "/lib/classpath");
++ strcat(classpath_libdir, "/lib/classpath-initial");
+ #else
+ cacao_prefix = CACAO_PREFIX;
+ cacao_libjvm = CACAO_LIBDIR"/libjvm";
+- classpath_libdir = CLASSPATH_LIBDIR"/classpath";
++ classpath_libdir = CLASSPATH_LIBDIR"/classpath-initial";
+ #endif
+
+ /* set the bootclasspath */
diff --git a/recipes-core/cacao/files/disable_hw_exceptions.patch b/recipes-core/cacao/files/disable_hw_exceptions.patch
new file mode 100644
index 0000000..bf2e998
--- /dev/null
+++ b/recipes-core/cacao/files/disable_hw_exceptions.patch
@@ -0,0 +1,22 @@
+Index: cacao-0.98/src/vm/exceptions.c
+===================================================================
+--- cacao-0.98.orig/src/vm/exceptions.c 2007-06-05 09:41:07.000000000 +0200
++++ cacao-0.98/src/vm/exceptions.c 2014-01-03 16:21:42.430783148 +0100
+@@ -89,17 +89,6 @@
+
+ bool exceptions_init(void)
+ {
+- int pagesize;
+-
+- /* mmap a memory page at address 0x0, so our hardware-exceptions
+- work. */
+-
+- pagesize = getpagesize();
+-
+- (void) memory_mmap_anon(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED);
+-
+- /* check if we get into trouble with our hardware-exceptions */
+-
+ if (OFFSET(java_bytearray, data) <= EXCEPTION_HARDWARE_PATCHER)
+ vm_abort("signal_init: array-data offset is less or equal the maximum hardware-exception displacement: %d <= %d", OFFSET(java_bytearray, data), EXCEPTION_HARDWARE_PATCHER);
+