[oe-commits] Phil Blundell : bluez-utils: avoid inline asm when compiling for thumb

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 54a436a3b781a5daa6afa51f022ca3ceb263f55f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54a436a3b781a5daa6afa51f022ca3ceb263f55f

Author: Phil Blundell <philb at gnu.org>
Date:   Mon Oct 27 14:45:16 2008 +0000

bluez-utils: avoid inline asm when compiling for thumb

---

 packages/bluez/bluez-utils/sbc-thumb.patch |   11 +++++++++++
 packages/bluez/bluez-utils3.inc            |    3 ++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/packages/bluez/bluez-utils/sbc-thumb.patch b/packages/bluez/bluez-utils/sbc-thumb.patch
new file mode 100644
index 0000000..3505426
--- /dev/null
+++ b/packages/bluez/bluez-utils/sbc-thumb.patch
@@ -0,0 +1,11 @@
+--- bluez/sbc/sbc_math.h~	2008-03-05 20:18:03.000000000 +0000
++++ bluez/sbc/sbc_math.h	2008-10-27 13:39:27.000000000 +0000
+@@ -59,7 +59,7 @@
+ 
+ #define SBC_FIXED_0(val) { val = 0; }
+ #define MUL(a, b)        ((a) * (b))
+-#ifdef __arm__
++#if defined(__arm__) && !defined(__thumb__)
+ #define MULA(a, b, res) ({				\
+ 		int tmp = res;			\
+ 		__asm__(				\
diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index c4debd0..703788f 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -13,7 +13,8 @@ FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
 # ti patch should be sent it upstream!
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
            file://hcid.conf \
-           file://hciattach-ti-bts.patch;patch=1"
+           file://hciattach-ti-bts.patch;patch=1 \
+           file://sbc-thumb.patch;patch=1"
 
 
 S = "${WORKDIR}/bluez-utils-${PV}"