revert arm conditional code

2 files changed, 1 insertions, 20 deletions

diff --git a/sbc/sbc.c b/sbc/sbc.c
index 7d57b283..97614fb9 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -708,15 +708,10 @@ static void sbc_encoder_init(struct sbc_encoder_state *state,
 	state->position[0] = state->position[1] = 9 * frame->subbands;
 }
 
-#ifdef __arm__
-void _sbc_analyze_four(const int16_t *in, int32_t *out)
-{
-	sbc_extended_t register res asm("r4");
-#else
+
 static inline void _sbc_analyze_four(const int16_t *in, int32_t *out)
 {
 	sbc_extended_t res;
-#endif
 	sbc_fixed_t t[8];
 	sbc_extended_t s[5];
 
@@ -799,15 +794,9 @@ static inline void sbc_analyze_four(struct sbc_encoder_state *state,
 		state->position[ch] = 36;
 }
 
-#ifdef __arm__
-void _sbc_analyze_eight(const int16_t *in, int32_t *out)
-{
-	sbc_extended_t register res asm("r4");
-#else
 static inline void _sbc_analyze_eight(const int16_t *in, int32_t *out)
 {
 	sbc_extended_t res;
-#endif
 	sbc_fixed_t t[8];
 	sbc_extended_t s[8];
 
diff --git a/sbc/sbc_math.h b/sbc/sbc_math.h
index 68b0f197..8c5ec3a7 100644
--- a/sbc/sbc_math.h
+++ b/sbc/sbc_math.h
@@ -66,12 +66,4 @@ typedef long long sbc_extended_t;
 #define SUB(dst, src)    { dst -= src; }
 #define MUL(dst, a, b)   { dst = (sbc_extended_t) (a) * (b); }
 #define DIV2(dst, src)   { dst = ASR(src, 1); }
-
-#ifdef __arm__
-#define MULA(res, a, b) __asm__(               \
-               "smlal %Q0, %R0, %2, %3"        \
-               : "=&r" (res)                   \
-               : "0" (res), "r" (a), "r" (b));
-#else
 #define MULA(dst, a, b)  { dst += (sbc_extended_t) (a) * (b); }
-#endif