cacao: Fix cache flushing.

  - removed workaround patch
  - added real fix OABI and EABI compliant cacheflushing

diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb
index 6520318..94919ad 100644 (file)
--- 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 (file)
index 0000000..4e63f50
--- /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