diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch deleted file mode 100644 index 4ce5a48a07..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com> | ||
2 | |||
3 | Upstream-Status: Inappropriate [embedded specific] | ||
4 | |||
5 | Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
6 | =================================================================== | ||
7 | --- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c | ||
8 | +++ pulseaudio-0.9.21/src/pulsecore/svolume_arm.c | ||
9 | @@ -37,6 +37,14 @@ | ||
10 | |||
11 | #if defined (__arm__) | ||
12 | |||
13 | +/* | ||
14 | + the code below uses armv6 instructions; we can safely ifdef this away as the code is only | ||
15 | + called if the arm architecture is v6 or higher | ||
16 | +*/ | ||
17 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
18 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
19 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
20 | + | ||
21 | #define MOD_INC() \ | ||
22 | " subs r0, r6, %2 \n\t" \ | ||
23 | " addcs r0, %1 \n\t" \ | ||
24 | @@ -179,11 +187,15 @@ static void run_test (void) { | ||
25 | } | ||
26 | #endif | ||
27 | |||
28 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
29 | #endif /* defined (__arm__) */ | ||
30 | |||
31 | |||
32 | void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) { | ||
33 | #if defined (__arm__) | ||
34 | +#if (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
35 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
36 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
37 | pa_log_info("Initialising ARM optimized functions."); | ||
38 | |||
39 | #ifdef RUN_TEST | ||
40 | @@ -191,5 +203,6 @@ void pa_volume_func_init_arm (pa_cpu_arm | ||
41 | #endif | ||
42 | |||
43 | pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm); | ||
44 | +#endif /* (!defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) ... */ | ||
45 | #endif /* defined (__arm__) */ | ||
46 | } | ||
47 | Index: pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
48 | =================================================================== | ||
49 | --- pulseaudio-0.9.21.orig/src/modules/bluetooth/sbc_math.h | ||
50 | +++ pulseaudio-0.9.21/src/modules/bluetooth/sbc_math.h | ||
51 | @@ -47,7 +47,9 @@ typedef int32_t sbc_fixed_t; | ||
52 | |||
53 | #define SBC_FIXED_0(val) { val = 0; } | ||
54 | #define MUL(a, b) ((a) * (b)) | ||
55 | -#ifdef __arm__ | ||
56 | +#if (defined(__arm__) && !defined (__ARM_ARCH_4__) && !defined (__ARM_ARCH_4T__) \ | ||
57 | + && !defined (__ARM_ARCH_5__)&& !defined (__ARM_ARCH_5E__) && !defined (__ARM_ARCH_5T__) \ | ||
58 | + && !defined (__ARM_ARCH_5TE__) && !defined (__ARM_ARCH_5TEJ__)) | ||
59 | #define MULA(a, b, res) ({ \ | ||
60 | int tmp = res; \ | ||
61 | __asm__( \ | ||