summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2008-10-27 14:45:16 +0000
committerPhil Blundell <philb@gnu.org>2008-10-27 14:45:16 +0000
commit54a436a3b781a5daa6afa51f022ca3ceb263f55f (patch)
treedd4ccf408264744bc572aee6ab1ddcf4b579221c
parenta9d0016a420aa6f55db6261db86d85f0fe92efbe (diff)
bluez-utils: avoid inline asm when compiling for thumb
-rw-r--r--packages/bluez/bluez-utils/sbc-thumb.patch11
-rw-r--r--packages/bluez/bluez-utils3.inc3
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 0000000000..3505426053
--- /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 c4debd01b2..703788f0f8 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}"