opus - Nov 2015 - [PATCH 2/2] Fix unit tests on ARM without RTCD (e.g. aarch64 or iOS).

Fixes build failure on platforms with MAY_HAVE_SSE4_1 (but not PRESUME_SSE4_1)
with --enable-intrinsics.
---
 silk/fixed/main_FIX.h   | 11 +++++++++++
 silk/x86/x86_silk_map.c |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/silk/fixed/main_FIX.h b/silk/fixed/main_FIX.h
index ffeb4f3..375b5eb 100644
--- a/silk/fixed/main_FIX.h
+++ b/silk/fixed/main_FIX.h
@@ -97,6 +97,17 @@ void silk_prefilter_FIX(
     const opus_int16                x[]                                     /*
I    Speech signal                                                              
*/
 );
 
+void silk_warped_LPC_analysis_filter_FIX_c(
+          opus_int32            state[],                    /* I/O  State
[order + 1]                   */
+          opus_int32            res_Q2[],                   /* O    Residual
signal [length]            */
+    const opus_int16            coef_Q13[],                 /* I   
Coefficients [order]                */
+    const opus_int16            input[],                    /* I    Input
signal [length]               */
+    const opus_int16            lambda_Q16,                 /* I    Warping
factor                      */
+    const opus_int              length,                     /* I    Length of
input signal              */
+    const opus_int              order                       /* I    Filter
order (even)                 */
+);
+
+
 /**************************/
 /* Noise shaping analysis */
 /**************************/
diff --git a/silk/x86/x86_silk_map.c b/silk/x86/x86_silk_map.c
index ad9fef2..6e79675 100644
--- a/silk/x86/x86_silk_map.c
+++ b/silk/x86/x86_silk_map.c
@@ -39,6 +39,8 @@
 
 #if defined(FIXED_POINT)
 
+#include "fixed/main_FIX.h"
+
 opus_int64 (*const SILK_INNER_PROD16_ALIGNED_64_IMPL[ OPUS_ARCHMASK + 1 ] )(
     const opus_int16 *inVec1,
     const opus_int16 *inVec2,
-- 
2.4.9 (Apple Git-60)

---
 celt/tests/test_unit_dft.c      | 3 +--
 celt/tests/test_unit_mathops.c  | 3 +--
 celt/tests/test_unit_mdct.c     | 3 +--
 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 bcee440..484dc57 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 5b446b7..fd3319d 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 6437ccb..9e0ac9f 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 ddcbfa0..1080c20 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"
-- 
2.4.9 (Apple Git-60)