diff options
Diffstat (limited to 'src/modules/bluetooth')
-rw-r--r-- | src/modules/bluetooth/sbc/sbc_math.h | 2 | ||||
-rw-r--r-- | src/modules/bluetooth/sbc/sbc_primitives_armv6.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/bluetooth/sbc/sbc_math.h b/src/modules/bluetooth/sbc/sbc_math.h index 9f126c62..5476860d 100644 --- a/src/modules/bluetooth/sbc/sbc_math.h +++ b/src/modules/bluetooth/sbc/sbc_math.h @@ -48,7 +48,7 @@ typedef int32_t sbc_fixed_t; #define SBC_FIXED_0(val) { val = 0; } #define MUL(a, b) ((a) * (b)) -#ifdef __arm__ +#if defined(__arm__) && (!defined(__thumb__) || defined(__thumb2__)) #define MULA(a, b, res) ({ \ int tmp = res; \ __asm__( \ diff --git a/src/modules/bluetooth/sbc/sbc_primitives_armv6.h b/src/modules/bluetooth/sbc/sbc_primitives_armv6.h index 1862aede..6a9efe50 100644 --- a/src/modules/bluetooth/sbc/sbc_primitives_armv6.h +++ b/src/modules/bluetooth/sbc/sbc_primitives_armv6.h @@ -40,8 +40,8 @@ #if !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) && \ defined(__GNUC__) && defined(SBC_HAVE_ARMV6) && \ - defined(__ARM_EABI__) && !defined(__thumb__) && \ - !defined(__ARM_NEON__) + defined(__ARM_EABI__) && !defined(__ARM_NEON__) && \ + (!defined(__thumb__) || defined(__thumb2__)) #define SBC_BUILD_WITH_ARMV6_SUPPORT |