History

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

* commit '5bcbb516f2ff45290ef7995b081762e668693672': arm: Add X() around all references to extern symbols

Michael Niedermayer committed 12 years ago

Commit bf90abe2 parents 6427803 5bcbb518 files · +24 −24Browse files

Unified · Split

8 files
  1. libavcodec/arm/fmtconvert_neon.S +1 −1
  2. libavcodec/arm/h264idct_neon.S +8 −8
  3. libavcodec/arm/hpeldsp_armv6.S +2 −2
  4. libavcodec/arm/mdct_neon.S +1 −1
  5. libavcodec/arm/mpegvideo_neon.S +1 −1
  6. libavcodec/arm/videodsp_armv5te.S +1 −1
  7. libavcodec/arm/vp8dsp_armv6.S +8 −8
  8. libavresample/arm/audio_convert_neon.S +2 −2
libavcodec/arm/fmtconvert_neon.S+1−1
@@ -70,7 +70,7 @@ function ff_float_to_int16_interleave_neon, export=1 · 69 unmodified lines
7070 cmp r3, #2
7171 itt lt
7272 ldrlt r1, [r1]
73− blt ff_float_to_int16_neon
73+ blt X(ff_float_to_int16_neon)
7474 bne 4f
7575
7676 ldr r3, [r1]
libavcodec/arm/h264idct_neon.S+8−8
@@ -113,8 +113,8 @@ function ff_h264_idct_add16_neon, export=1 · 112 unmodified lines
113113 movne lr, #0
114114 cmp lr, #0
115115 ite ne
116− adrne lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB
117− adreq lr, ff_h264_idct_add_neon + CONFIG_THUMB
116+ adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
117+ adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
118118 blx lr
119119 2: subs ip, ip, #1
120120 add r1, r1, #32
@@ -138,8 +138,8 @@ function ff_h264_idct_add16intra_neon, export=1 · 17 unmodified lines
138138 cmp r8, #0
139139 ldrsh r8, [r1]
140140 iteet ne
141− adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB
142− adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB
141+ adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
142+ adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
143143 cmpeq r8, #0
144144 blxne lr
145145 subs ip, ip, #1
@@ -166,8 +166,8 @@ function ff_h264_idct_add8_neon, export=1 · 20 unmodified lines
166166 cmp r8, #0
167167 ldrsh r8, [r1]
168168 iteet ne
169− adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB
170− adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB
169+ adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
170+ adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
171171 cmpeq r8, #0
172172 blxne lr
173173 add r12, r12, #1
@@ -388,8 +388,8 @@ function ff_h264_idct8_add4_neon, export=1 · 214 unmodified lines
388388 movne lr, #0
389389 cmp lr, #0
390390 ite ne
391− adrne lr, ff_h264_idct8_dc_add_neon + CONFIG_THUMB
392− adreq lr, ff_h264_idct8_add_neon + CONFIG_THUMB
391+ adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
392+ adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB
393393 blx lr
394394 2: subs r12, r12, #4
395395 add r1, r1, #128
libavcodec/arm/hpeldsp_armv6.S+2−2
@@ -23,11 +23,11 @@ · 22 unmodified lines
2323 .macro call_2x_pixels type, subp
2424 function ff_\type\()_pixels16\subp\()_armv6, export=1
2525 push {r0-r3, lr}
26− bl ff_\type\()_pixels8\subp\()_armv6
26+ bl X(ff_\type\()_pixels8\subp\()_armv6)
2727 pop {r0-r3, lr}
2828 add r0, r0, #8
2929 add r1, r1, #8
30− b ff_\type\()_pixels8\subp\()_armv6
30+ b X(ff_\type\()_pixels8\subp\()_armv6)
3131 endfunc
3232 .endm
3333
libavcodec/arm/mdct_neon.S+1−1
@@ -129,7 +129,7 @@ function ff_imdct_calc_neon, export=1 · 128 unmodified lines
129129 lsl r4, r4, r3
130130 add r1, r1, r4
131131
132− bl ff_imdct_half_neon
132+ bl X(ff_imdct_half_neon)
133133
134134 add r0, r5, r4, lsl #2
135135 add r1, r5, r4, lsl #1
libavcodec/arm/mpegvideo_neon.S+1−1
@@ -100,7 +100,7 @@ function ff_dct_unquantize_h263_intra_neon, export=1 · 99 unmodified lines
100100 smulbb r4, r4, r6
101101 2: lsl r0, r3, #1
102102 add r3, r12, #1
103− bl ff_dct_unquantize_h263_neon
103+ bl X(ff_dct_unquantize_h263_neon)
104104 vmov.16 d0[0], r4
105105 vst1.16 {d0[0]}, [r5]
106106 pop {r4-r6,pc}
libavcodec/arm/videodsp_armv5te.S+1−1
@@ -26,6 +26,6 @@ function ff_prefetch_arm, export=1 · 25 unmodified lines
2626 subs r2, r2, #1
2727 pld [r0]
2828 add r0, r0, r1
29− bne ff_prefetch_arm
29+ bne X(ff_prefetch_arm)
3030 bx lr
3131 endfunc
libavcodec/arm/vp8dsp_armv6.S+8−8
@@ -359,14 +359,14 @@ endfunc · 358 unmodified lines
359359 function ff_vp8_idct_dc_add4uv_armv6, export=1
360360 push {r4, lr}
361361
362− bl ff_vp8_idct_dc_add_armv6
362+ bl X(ff_vp8_idct_dc_add_armv6)
363363 add r0, r0, #4
364− bl ff_vp8_idct_dc_add_armv6
364+ bl X(ff_vp8_idct_dc_add_armv6)
365365 add r0, r0, r2, lsl #2
366366 sub r0, r0, #4
367− bl ff_vp8_idct_dc_add_armv6
367+ bl X(ff_vp8_idct_dc_add_armv6)
368368 add r0, r0, #4
369− bl ff_vp8_idct_dc_add_armv6
369+ bl X(ff_vp8_idct_dc_add_armv6)
370370
371371 pop {r4, pc}
372372 endfunc
@@ -375,13 +375,13 @@ endfunc · 2 unmodified lines
375375 function ff_vp8_idct_dc_add4y_armv6, export=1
376376 push {r4, lr}
377377
378− bl ff_vp8_idct_dc_add_armv6
378+ bl X(ff_vp8_idct_dc_add_armv6)
379379 add r0, r0, #4
380− bl ff_vp8_idct_dc_add_armv6
380+ bl X(ff_vp8_idct_dc_add_armv6)
381381 add r0, r0, #4
382− bl ff_vp8_idct_dc_add_armv6
382+ bl X(ff_vp8_idct_dc_add_armv6)
383383 add r0, r0, #4
384− bl ff_vp8_idct_dc_add_armv6
384+ bl X(ff_vp8_idct_dc_add_armv6)
385385
386386 pop {r4, pc}
387387 endfunc
libavresample/arm/audio_convert_neon.S+2−2
@@ -133,8 +133,8 @@ function ff_conv_fltp_to_s16_neon, export=1 · 132 unmodified lines
133133 cmp r3, #2
134134 itt lt
135135 ldrlt r1, [r1]
136− blt ff_conv_flt_to_s16_neon
137− beq ff_conv_fltp_to_s16_2ch_neon
136+ blt X(ff_conv_flt_to_s16_neon)
137+ beq X(ff_conv_fltp_to_s16_2ch_neon)
138138
139139 push {r4-r8, lr}
140140 cmp r3, #4

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t