summaryrefslogtreecommitdiff
path: root/packages/db/files/arm-thumb-mutex.patch
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-11-15 17:33:42 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-15 17:33:42 +0000
commit7de998bd4b1d2417fc4702756668da58bdb977bd (patch)
tree49766943dd7e7eb1b6c6762e017baabfa8ec86c0 /packages/db/files/arm-thumb-mutex.patch
parent46a0af08c57518f16c489588caa93bff791ad74e (diff)
db-native: unbreak build of 4.3.29
- adding a patch to db_4.3.29 breaks db-native, which needs the same - patch, moved the patch to 'files' since it should work on all versions - which require it.
Diffstat (limited to 'packages/db/files/arm-thumb-mutex.patch')
-rw-r--r--packages/db/files/arm-thumb-mutex.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/packages/db/files/arm-thumb-mutex.patch b/packages/db/files/arm-thumb-mutex.patch
new file mode 100644
index 0000000000..acd446fcd8
--- /dev/null
+++ b/packages/db/files/arm-thumb-mutex.patch
@@ -0,0 +1,36 @@
+--- db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:33:27.761042518 -0800
++++ db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:55:24.823920060 -0800
+@@ -470,6 +470,25 @@
+ #ifdef LOAD_ACTUAL_MUTEX_CODE
+ #define MUTEX_SET_TEST 1 /* 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( \
+@@ -480,6 +499,7 @@
+ ); \
+ __r & 1; \
+ })
++#endif
+
+ #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
+ #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)