diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2014-02-21 00:21:46 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2014-02-22 13:06:29 +0200 |
| commit | b0a04d8031f9efd983f76c379a2982cf7ee769f5 (patch) | |
| tree | b30199044a8ca1b9a57edc0e0bfb2a28f231c7df /src/pulsecore | |
| parent | 3152226502014129d03a50564b1914ce267817f9 (diff) | |
sconv, svolume: Fix compilation on 32-bit FreeBSD
Don't try to compile this code on 32-bit FreeBSD, it will error out complain
about registers only being available in 64-bit mode.
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/sconv_sse.c | 4 | ||||
| -rw-r--r-- | src/pulsecore/svolume_mmx.c | 8 | ||||
| -rw-r--r-- | src/pulsecore/svolume_sse.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c index 2f84f5ab2..10943bad0 100644 --- a/src/pulsecore/sconv_sse.c +++ b/src/pulsecore/sconv_sse.c @@ -33,7 +33,7 @@ #include "cpu-x86.h" #include "sconv.h" -#if !defined(__APPLE__) && defined (__i386__) || defined (__amd64__) +#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) static const PA_DECLARE_ALIGNED (16, float, scale[4]) = { 0x8000, 0x8000, 0x8000, 0x8000 }; @@ -163,7 +163,7 @@ static void pa_sconv_s16le_from_f32ne_sse2(unsigned n, const float *a, int16_t * #endif /* defined (__i386__) || defined (__amd64__) */ void pa_convert_func_init_sse(pa_cpu_x86_flag_t flags) { -#if !defined(__APPLE__) && defined (__i386__) || defined (__amd64__) +#if (!defined(__APPLE__) && !defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) if (flags & PA_CPU_X86_SSE2) { pa_log_info("Initialising SSE2 optimized conversions."); diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c index d68a1059d..279af8a48 100644 --- a/src/pulsecore/svolume_mmx.c +++ b/src/pulsecore/svolume_mmx.c @@ -34,7 +34,7 @@ #include "sample-util.h" -#if defined (__i386__) || defined (__amd64__) +#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) /* in s: 2 int16_t samples * in v: 2 int32_t volumes, fixed point 16:16 * out s: contains scaled and clamped int16_t samples. @@ -240,15 +240,15 @@ static void pa_volume_s16re_mmx(int16_t *samples, const int32_t *volumes, unsign ); } -#endif /* defined (__i386__) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) { -#if defined (__i386__) || defined (__amd64__) +#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) { pa_log_info("Initialising MMX optimized volume functions."); pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_mmx); pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_mmx); } -#endif /* defined (__i386__) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ } diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c index 9979087b4..eafa92c09 100644 --- a/src/pulsecore/svolume_sse.c +++ b/src/pulsecore/svolume_sse.c @@ -34,7 +34,7 @@ #include "sample-util.h" -#if defined (__i386__) || defined (__amd64__) +#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \ " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \ @@ -251,15 +251,15 @@ static void pa_volume_s16re_sse2(int16_t *samples, const int32_t *volumes, unsig ); } -#endif /* defined (__i386__) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) { -#if defined (__i386__) || defined (__amd64__) +#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) if (flags & PA_CPU_X86_SSE2) { pa_log_info("Initialising SSE2 optimized volume functions."); pa_set_volume_func(PA_SAMPLE_S16NE, (pa_do_volume_func_t) pa_volume_s16ne_sse2); pa_set_volume_func(PA_SAMPLE_S16RE, (pa_do_volume_func_t) pa_volume_s16re_sse2); } -#endif /* defined (__i386__) || defined (__amd64__) */ +#endif /* (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__) */ } |