diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-14 00:43:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-14 01:55:02 +0200 |
| commit | c0f18b2893f64ee0f33a00f20f016e58ae3d78e8 (patch) | |
| tree | 631ae0eb7bae59e3885f50d4585e6655362a4798 | |
| parent | 47b383087d5e391caecf46bf621db48772f174da (diff) | |
Add ARM Thumb mutex implementation from a "arm-thumb-mutex.patch"
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 67a3da6d1dfb..5c099c22103c 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -1066,3 +1066,39 @@ + +.INCLUDE : target.mk + +--- misc/db-4.7.25.NC/dbinc/mutex_int.h ++++ misc/build/db-4.7.25.NC/dbinc/mutex_int.h +@@ -402,6 +402,25 @@ + + #ifdef LOAD_ACTUAL_MUTEX_CODE + /* gcc/arm: 0 is clear, 1 is set. */ ++#if defined __thumb__ ++#define MUTEX_SET(tsl) ({ \ ++ int __r, __p; \ ++ __asm__ volatile( \ ++ ".align 2\n\t" \ ++ "bx pc\n\t" \ ++ "nop\n\t" \ ++ ".arm\n\t" \ ++ "swpb %0, %2, [%3]\n\t" \ ++ "eor %0, %0, #1\n\t" \ ++ "orr %1, pc, #1\n\t" \ ++ "bx %1\n\t" \ ++ ".force_thumb" \ ++ : "=&r" (__r), "=r" (__p) \ ++ : "r" (1), "r" (tsl) \ ++ ); \ ++ __r & 1; \ ++}) ++#else + #define MUTEX_SET(tsl) ({ \ + int __r; \ + asm volatile( \ +@@ -484,6 +503,7 @@ + ); \ + __r & 1; \ + }) ++#endif + + #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) + #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) |