volume: Add explicit checks for ARMv6 instructions

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
This commit is contained in:
Arun Raghavan 2010-11-26 11:55:57 +05:30 committed by Colin Guthrie
parent 70f69ac519
commit f6574c8c22
2 changed files with 36 additions and 5 deletions

View file

@ -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) */
}