changeset 6:5f5a10c8d662 default tip

Updated arm-decouple-bionic.patch to patch the corerct tree. * icedrobot/arm-decouple-bionic.patch: Apply against vm instead of dalvik/vm tree.
author Xerxes R?nby <xerxes@zafena.se>
date Fri, 01 Apr 2011 16:25:10 +0200
parents 504bb4fc3135
children
files icedrobot/arm-decouple-bionic.patch
diffstat 1 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/icedrobot/arm-decouple-bionic.patch	Thu Mar 31 22:40:28 2011 +0200
+++ b/icedrobot/arm-decouple-bionic.patch	Fri Apr 01 16:25:10 2011 +0200
@@ -1,7 +1,7 @@
-Index: dalvik/vm/Atomic.c
+Index: vm/Atomic.c
 ===================================================================
---- dalvik.orig/vm/Atomic.c	2011-03-31 16:28:20.000000000 +0200
-+++ dalvik/vm/Atomic.c	2011-03-31 16:28:37.000000000 +0200
+--- vm.orig/Atomic.c	2011-03-31 16:28:20.000000000 +0200
++++ vm/Atomic.c	2011-03-31 16:28:37.000000000 +0200
 @@ -66,7 +66,7 @@
  #define NEED_QUASIATOMICS 1
  
@@ -11,10 +11,10 @@
  
  #ifdef __ARM_HAVE_LDREXD
  int64_t dvmQuasiAtomicSwap64(int64_t newvalue, volatile int64_t* addr)
-Index: dalvik/vm/alloc/clz.h
+Index: vm/alloc/clz.h
 ===================================================================
---- dalvik.orig/vm/alloc/clz.h	2011-03-31 16:28:48.000000000 +0200
-+++ dalvik/vm/alloc/clz.h	2011-03-31 16:29:00.000000000 +0200
+--- vm.orig/alloc/clz.h	2011-03-31 16:28:48.000000000 +0200
++++ vm/alloc/clz.h	2011-03-31 16:29:00.000000000 +0200
 @@ -29,7 +29,7 @@
  #ifndef _DALVIK_CLZ
  
@@ -24,10 +24,10 @@
  # if defined(__ARM_HAVE_CLZ)
  #  define CLZ(x) __builtin_clz(x)
  #  define HAVE_BUILTIN_CLZ
-Index: dalvik/vm/arch/arm/CallEABI.S
+Index: vm/arch/arm/CallEABI.S
 ===================================================================
---- dalvik.orig/vm/arch/arm/CallEABI.S	2011-03-31 16:29:23.000000000 +0200
-+++ dalvik/vm/arch/arm/CallEABI.S	2011-03-31 16:29:30.000000000 +0200
+--- vm.orig/arch/arm/CallEABI.S	2011-03-31 16:29:23.000000000 +0200
++++ vm/arch/arm/CallEABI.S	2011-03-31 16:29:30.000000000 +0200
 @@ -21,7 +21,7 @@
   * This version supports the "new" ARM EABI.
   */
@@ -37,10 +37,10 @@
  
  #ifdef __ARM_EABI__
  
-Index: dalvik/vm/arch/arm/CallOldABI.S
+Index: vm/arch/arm/CallOldABI.S
 ===================================================================
---- dalvik.orig/vm/arch/arm/CallOldABI.S	2011-03-31 16:29:36.000000000 +0200
-+++ dalvik/vm/arch/arm/CallOldABI.S	2011-03-31 16:29:41.000000000 +0200
+--- vm.orig/arch/arm/CallOldABI.S	2011-03-31 16:29:36.000000000 +0200
++++ vm/arch/arm/CallOldABI.S	2011-03-31 16:29:41.000000000 +0200
 @@ -22,7 +22,7 @@
   * This version supports the "old" ARM ABI.
   */
@@ -50,10 +50,10 @@
  
  #ifndef __ARM_EABI__
  
-Index: dalvik/vm/test/AtomicTest.c
+Index: vm/test/AtomicTest.c
 ===================================================================
---- dalvik.orig/vm/test/AtomicTest.c	2011-03-31 16:29:07.000000000 +0200
-+++ dalvik/vm/test/AtomicTest.c	2011-03-31 16:29:13.000000000 +0200
+--- vm.orig/test/AtomicTest.c	2011-03-31 16:29:07.000000000 +0200
++++ vm/test/AtomicTest.c	2011-03-31 16:29:13.000000000 +0200
 @@ -29,7 +29,7 @@
  #include <unistd.h>
  #include <cutils/atomic.h>