diff -pruN 4.2.52+dfsg-5.1/dbinc/mutex.h 4.2.52+dfsg-5.1ubuntu1/dbinc/mutex.h
--- 4.2.52+dfsg-5.1/dbinc/mutex.h	2009-12-28 23:25:01.000000000 +0000
+++ 4.2.52+dfsg-5.1ubuntu1/dbinc/mutex.h	2009-12-28 23:22:58.000000000 +0000
@@ -470,18 +470,18 @@ typedef unsigned char tsl_t;
 /*
  * For arm/gcc, 0 is clear, 1 is set.
  */
-#define	MUTEX_SET(tsl) ({						\
-	int __r;							\
-	asm volatile(							\
-		"swpb	%0, %1, [%2]\n\t"				\
-		"eor	%0, %0, #1\n\t"					\
-	    : "=&r" (__r)						\
-	    : "r" (1), "r" (tsl)					\
-	    );								\
-	__r & 1;							\
-})
+static inline int
+MUTEX_SET(tsl_t *tsl) { 
+	tsl_t __r = __sync_lock_test_and_set (tsl, 1);
+	return __r == 0;
+}
+
+static inline int
+MUTEX_UNSET(tsl_t *tsl) {
+	__sync_lock_release(tsl);
+	return *tsl == 0;
+}
 
-#define	MUTEX_UNSET(tsl)	(*(volatile tsl_t *)(tsl) = 0)
 #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
 #endif
 #endif
diff -pruN 4.2.52+dfsg-5.1/debian/changelog 4.2.52+dfsg-5.1ubuntu1/debian/changelog
--- 4.2.52+dfsg-5.1/debian/changelog	2009-12-28 23:25:01.000000000 +0000
+++ 4.2.52+dfsg-5.1ubuntu1/debian/changelog	2009-12-28 23:22:58.000000000 +0000
@@ -1,3 +1,10 @@
+db4.2 (4.2.52+dfsg-5.1ubuntu1) lucid; urgency=low
+
+  * dbinc/mutex.h: fix armel ftbfs by moving ARM atomic macros to gcc
+    atomic instrinsics
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 28 Dec 2009 21:36:26 +0100
+
 db4.2 (4.2.52+dfsg-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -pruN 4.2.52+dfsg-5.1/debian/control 4.2.52+dfsg-5.1ubuntu1/debian/control
--- 4.2.52+dfsg-5.1/debian/control	2009-12-28 23:25:01.000000000 +0000
+++ 4.2.52+dfsg-5.1ubuntu1/debian/control	2009-12-28 23:22:58.000000000 +0000
@@ -1,7 +1,8 @@
 Source: db4.2
 Section: libs
 Priority: standard
-Maintainer: Debian Berkeley DB Maintainers <pkg-db-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Berkeley DB Maintainers <pkg-db-devel@lists.alioth.debian.org>
 Uploaders: Matthew Wilcox <willy@debian.org>, Andreas Barth <aba@not.so.argh.org>, Adam Conrad <adconrad@0c3.net>, Florian Weimer <fw@deneb.enyo.de>
 Standards-Version: 3.8.0
 Build-Depends: tcl8.5-dev, procps [!hurd-i386]