From 7de998bd4b1d2417fc4702756668da58bdb977bd Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 15 Nov 2005 17:33:42 +0000 Subject: 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. --- packages/db/db-4.3.29/.mtn2git_empty | 0 packages/db/db-4.3.29/arm-thumb-mutex.patch | 36 ----------------------------- packages/db/files/.mtn2git_empty | 0 packages/db/files/arm-thumb-mutex.patch | 36 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 packages/db/db-4.3.29/.mtn2git_empty delete mode 100644 packages/db/db-4.3.29/arm-thumb-mutex.patch create mode 100644 packages/db/files/.mtn2git_empty create mode 100644 packages/db/files/arm-thumb-mutex.patch (limited to 'packages/db') diff --git a/packages/db/db-4.3.29/.mtn2git_empty b/packages/db/db-4.3.29/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/db/db-4.3.29/arm-thumb-mutex.patch b/packages/db/db-4.3.29/arm-thumb-mutex.patch deleted file mode 100644 index acd446fcd8..0000000000 --- a/packages/db/db-4.3.29/arm-thumb-mutex.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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) diff --git a/packages/db/files/.mtn2git_empty b/packages/db/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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) -- cgit 1.2.3-korg