summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/svolume_arm.c
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2010-11-26 11:55:57 +0530
committerColin Guthrie <cguthrie@mandriva.org>2010-11-28 16:23:18 +0000
commit12b900858ae82d435c100d6eb94cb7bb22fe5e29 (patch)
treec53218901e1ba933393bedd755c9f477c9ce932c /src/pulsecore/svolume_arm.c
parent6828c594e3fdc3d4553dbf9aae018afe861e047c (diff)
volume: Add explicit checks for ARMv6 instructionsv0.98-dev
This ensures that the build does not fail if the ssat and pkhbt instructions are not available (armv5te and below). Fixes: http://www.pulseaudio.org/ticket/790
Diffstat (limited to 'src/pulsecore/svolume_arm.c')
-rw-r--r--src/pulsecore/svolume_arm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
index fdd8f09a..3973e518 100644
--- a/src/pulsecore/svolume_arm.c
+++ b/src/pulsecore/svolume_arm.c
@@ -35,7 +35,7 @@
#include "sample-util.h"
#include "endianmacros.h"
-#if defined (__arm__)
+#if defined (__arm__) && defined (HAVE_ARMV6)
#define MOD_INC() \
" subs r0, r6, %2 \n\t" \
@@ -182,11 +182,11 @@ static void run_test (void) {
}
#endif
-#endif /* defined (__arm__) */
+#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
-#if defined (__arm__)
+#if defined (__arm__) && defined (HAVE_ARMV6)
pa_log_info("Initialising ARM optimized functions.");
#ifdef RUN_TEST
@@ -194,5 +194,5 @@ void pa_volume_func_init_arm (pa_cpu_arm_flag_t flags) {
#endif
pa_set_volume_func (PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_arm);
-#endif /* defined (__arm__) */
+#endif /* defined (__arm__) && defined (HAVE_ARMV6) */
}