diff options
| author | Jonathan Lennox <jonathan@vidyo.com> | 2015-11-02 21:56:23 +0900 |
|---|---|---|
| committer | Timothy B. Terriberry <tterribe@xiph.org> | 2015-11-02 18:56:13 -0800 |
| commit | 19677f6b060aa895cb254c04ef8432f1e1d25a1f (patch) | |
| tree | 94d4fdfeb39ff333107331a2bff5f9b0bb0e1105 | |
| parent | ca5c3888940c3c7219498644cce0f4b19d23b16c (diff) | |
| download | opus-19677f6b060aa895cb254c04ef8432f1e1d25a1f.tar.gz | |
Fix unit tests on ARM without RTCD (e.g. aarch64 or iOS).
| -rw-r--r-- | celt/tests/test_unit_dft.c | 3 | ||||
| -rw-r--r-- | celt/tests/test_unit_mathops.c | 3 | ||||
| -rw-r--r-- | celt/tests/test_unit_mdct.c | 3 | ||||
| -rw-r--r-- | celt/tests/test_unit_rotation.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/celt/tests/test_unit_dft.c b/celt/tests/test_unit_dft.c index bcee440f..484dc57e 100644 --- a/celt/tests/test_unit_dft.c +++ b/celt/tests/test_unit_dft.c @@ -47,8 +47,7 @@ #if defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1) # include "x86/x86cpu.c" -#elif defined(OPUS_HAVE_RTCD) && \ - (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)) +#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/armcpu.c" # include "celt_lpc.c" # include "pitch.c" diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c index 5b446b70..fd3319da 100644 --- a/celt/tests/test_unit_mathops.c +++ b/celt/tests/test_unit_mathops.c @@ -63,8 +63,7 @@ # include "x86/celt_lpc_sse.c" # endif # include "x86/x86_celt_map.c" -#elif defined(OPUS_HAVE_RTCD) && \ - (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)) +#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/armcpu.c" # if defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/celt_neon_intr.c" diff --git a/celt/tests/test_unit_mdct.c b/celt/tests/test_unit_mdct.c index 6437ccb8..9e0ac9f3 100644 --- a/celt/tests/test_unit_mdct.c +++ b/celt/tests/test_unit_mdct.c @@ -48,8 +48,7 @@ #if defined(OPUS_X86_MAY_HAVE_SSE2) || defined(OPUS_X86_MAY_HAVE_SSE4_1) # include "x86/x86cpu.c" -#elif defined(OPUS_HAVE_RTCD) && \ - (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)) +#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/armcpu.c" # include "pitch.c" # include "celt_lpc.c" diff --git a/celt/tests/test_unit_rotation.c b/celt/tests/test_unit_rotation.c index ddcbfa07..1080c208 100644 --- a/celt/tests/test_unit_rotation.c +++ b/celt/tests/test_unit_rotation.c @@ -61,8 +61,7 @@ # include "x86/celt_lpc_sse.c" # endif # include "x86/x86_celt_map.c" -#elif defined(OPUS_HAVE_RTCD) && \ - (defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR)) +#elif defined(OPUS_ARM_ASM) || defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/armcpu.c" # if defined(OPUS_ARM_MAY_HAVE_NEON_INTR) # include "arm/celt_neon_intr.c" |