diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-13 23:04:55 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-13 23:04:55 +0000 |
| commit | 441006cc6f921178cc13f9da76e5bcfee45d472a (patch) | |
| tree | a5d5011e903ea74f61a038c3f229a17beecbdca8 /meta/packages/db/files | |
| parent | 705fe2f2f871fcefb2bc2f244c509f04516ba3a2 (diff) | |
| download | poky-441006cc6f921178cc13f9da76e5bcfee45d472a.tar.gz | |
db: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/db/files')
| -rw-r--r-- | meta/packages/db/files/arm-thumb-mutex.patch | 36 | ||||
| -rw-r--r-- | meta/packages/db/files/configure_fixes.patch | 18 |
2 files changed, 0 insertions, 54 deletions
diff --git a/meta/packages/db/files/arm-thumb-mutex.patch b/meta/packages/db/files/arm-thumb-mutex.patch deleted file mode 100644 index acd446fcd8..0000000000 --- a/meta/packages/db/files/arm-thumb-mutex.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | --- db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:33:27.761042518 -0800 | ||
| 2 | +++ db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:55:24.823920060 -0800 | ||
| 3 | @@ -470,6 +470,25 @@ | ||
| 4 | #ifdef LOAD_ACTUAL_MUTEX_CODE | ||
| 5 | #define MUTEX_SET_TEST 1 /* gcc/arm: 0 is clear, 1 is set. */ | ||
| 6 | |||
| 7 | +#if defined __thumb__ | ||
| 8 | +#define MUTEX_SET(tsl) ({ \ | ||
| 9 | + int __r, __p; \ | ||
| 10 | + asm volatile( \ | ||
| 11 | + ".align 2\n\t" \ | ||
| 12 | + "bx pc\n\t" \ | ||
| 13 | + "nop\n\t" \ | ||
| 14 | + ".arm\n\t" \ | ||
| 15 | + "swpb %0, %2, [%3]\n\t" \ | ||
| 16 | + "eor %0, %0, #1\n\t" \ | ||
| 17 | + "orr %1, pc, #1\n\t" \ | ||
| 18 | + "bx %1\n\t" \ | ||
| 19 | + ".force_thumb" \ | ||
| 20 | + : "=&r" (__r), "=r" (__p) \ | ||
| 21 | + : "r" (1), "r" (tsl) \ | ||
| 22 | + ); \ | ||
| 23 | + __r & 1; \ | ||
| 24 | +}) | ||
| 25 | +#else | ||
| 26 | #define MUTEX_SET(tsl) ({ \ | ||
| 27 | int __r; \ | ||
| 28 | asm volatile( \ | ||
| 29 | @@ -480,6 +499,7 @@ | ||
| 30 | ); \ | ||
| 31 | __r & 1; \ | ||
| 32 | }) | ||
| 33 | +#endif | ||
| 34 | |||
| 35 | #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) | ||
| 36 | #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl) | ||
diff --git a/meta/packages/db/files/configure_fixes.patch b/meta/packages/db/files/configure_fixes.patch deleted file mode 100644 index 80aa0e7c1c..0000000000 --- a/meta/packages/db/files/configure_fixes.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | If LD is a binary name + parameters db will fail to work out its GNU ld | ||
| 2 | and disable shared libraries. We don't want this. | ||
| 3 | |||
| 4 | RP - 22/11/2007 | ||
| 5 | |||
| 6 | Index: dist/configure | ||
| 7 | =================================================================== | ||
| 8 | --- dist.orig/configure 2007-11-23 00:47:27.000000000 +0000 | ||
| 9 | +++ dist/configure 2007-11-23 00:53:22.000000000 +0000 | ||
| 10 | @@ -5658,7 +5661,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set | ||
| 11 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
| 12 | else | ||
| 13 | # I'd rather use --version here, but apparently some GNU ld's only accept -v. | ||
| 14 | -case `"$LD" -v 2>&1 </dev/null` in | ||
| 15 | +case `$LD -v 2>&1 </dev/null` in | ||
| 16 | *GNU* | *'with BFD'*) | ||
| 17 | lt_cv_prog_gnu_ld=yes | ||
| 18 | ;; | ||
