# HG changeset patch
# User mru
# Date 1254472920 0
# Node ID f12b7ea2df2ad4abd493c3ea773d527aa7474975
# Parent  294c444866f76b62ff1d74e85482f8595021fa59
ARM: apply extern symbol prefix where needed

diff -r 294c444866f7 -r f12b7ea2df2a arm/asm.S
--- a/arm/asm.S	Thu Oct 01 15:54:55 2009 +0000
+++ b/arm/asm.S	Fri Oct 02 08:42:00 2009 +0000
@@ -36,7 +36,8 @@
 
         .macro function name, export=0
 .if \export
-        .global \name
+        .global EXTERN_ASM\name
+EXTERN_ASM\name:
 .endif
 ELF     .type   \name, %function
         .func   \name
@@ -60,3 +61,7 @@
 #   define VFP   @
 #   define NOVFP
 #endif
+
+#define GLUE(a, b) a ## b
+#define JOIN(a, b) GLUE(a, b)
+#define X(s) JOIN(EXTERN_ASM, s)
diff -r 294c444866f7 -r f12b7ea2df2a arm/fft_neon.S
--- a/arm/fft_neon.S	Thu Oct 01 15:54:55 2009 +0000
+++ b/arm/fft_neon.S	Fri Oct 02 08:42:00 2009 +0000
@@ -141,7 +141,7 @@
         vswp            d29, d30                @ q14{r12,i12,i14,r15} q15{r13,i13,i15,r14}
         vadd.f32        q0,  q12, q13           @ {t1,t2,t5,t6}
         vadd.f32        q1,  q14, q15           @ {t1a,t2a,t5a,t6a}
-        movrel          r2,  ff_cos_16
+        movrel          r2,  X(ff_cos_16)
         vsub.f32        q13, q12, q13           @ {t3,t4,t7,t8}
         vrev64.32       d1,  d1
         vsub.f32        q15, q14, q15           @ {t3a,t4a,t7a,t8a}
@@ -288,7 +288,7 @@
         bl              fft\n4\()_neon
         mov             r0,  r4
         pop             {r4, lr}
-        movrel          r1,  ff_cos_\n
+        movrel          r1,  X(ff_cos_\n)
         mov             r2,  #\n4/2
         b               fft_pass_neon
 .endfunc
diff -r 294c444866f7 -r f12b7ea2df2a arm/mdct_neon.S
--- a/arm/mdct_neon.S	Thu Oct 01 15:54:55 2009 +0000
+++ b/arm/mdct_neon.S	Fri Oct 02 08:42:00 2009 +0000
@@ -24,6 +24,8 @@
         .fpu neon
         .text
 
+#define ff_fft_calc_neon X(ff_fft_calc_neon)
+
 function ff_imdct_half_neon, export=1
         push            {r4-r8,lr}