summaryrefslogtreecommitdiff
path: root/packages/cacao
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-01-21 00:35:18 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-01-21 00:35:18 +0000
commitec293c5c0601f230f74e1d2e0212cfddaa009450 (patch)
tree91be29898c06f0bf7c01846032ee40bfea9324ac /packages/cacao
parent86c61ef2ae6d8c4d1c6b97a221874086f146c641 (diff)
cacao: Fix cache flushing.
- removed workaround patch - added real fix OABI and EABI compliant cacheflushing
Diffstat (limited to 'packages/cacao')
-rw-r--r--packages/cacao/cacao_0.98+hg20071001.bb4
-rw-r--r--packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch18
2 files changed, 20 insertions, 2 deletions
diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb
index 65203189b4..94919ad24a 100644
--- a/packages/cacao/cacao_0.98+hg20071001.bb
+++ b/packages/cacao/cacao_0.98+hg20071001.bb
@@ -1,12 +1,12 @@
require cacao.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "\
http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
file://cacao-0.98+svn-libdir.diff;patch=1 \
file://cacao-0.98+svn-classpath_var.patch;patch=1 \
- file://cacao-0.98+hg-arm-cacheflush-workaround.patch;patch=1 \
+ file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \
file://cacao-0.98+hg-attachthread.patch;patch=1 \
"
diff --git a/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch b/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
new file mode 100644
index 0000000000..4e63f501ff
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
@@ -0,0 +1,18 @@
+diff -r df1b780317c3 src/vm/jit/arm/asmpart.S
+--- a/src/vm/jit/arm/asmpart.S Thu Jan 17 01:01:35 2008 +0100
++++ b/src/vm/jit/arm/asmpart.S Mon Jan 21 00:14:41 2008 +0100
+@@ -323,10 +323,11 @@ asm_cacheflush:
+ mov a1, #0xff000000
+ #endif
+
++#if defined(__ARM_EABI__)
++ swi 0x0
++ ldmfd sp!, {r7}
++#else
+ swi sys_cacheflush
+-
+-#if defined(__ARM_EABI__)
+- ldmfd sp!, {r7}
+ #endif
+
+ mov pc, lr