ffmpeg/F-11/ffmpeg-textrel.patch

diff -up ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm
--- ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel     2009-02-13 01:57:22.000000000 +0100
+++ ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm     2010-03-05 21:40:24.000000000 +0100
@@ -417,18 +417,23 @@ DECL_PASS pass_interleave_3dn, PASS_BIG 
 %define pass_3dn2 pass_3dn
 %define pass_interleave_3dn2 pass_interleave_3dn
 
+%ifdef PIC
+%define SECTION_REL - $$
+%else
+%define SECTION_REL
+%endif
 
 %macro DECL_FFT 2-3 ; nbits, cpu, suffix
-%xdefine list_of_fft fft4%2, fft8%2
+%xdefine list_of_fft fft4%2 SECTION_REL, fft8%2 SECTION_REL
 %if %1==5
-%xdefine list_of_fft list_of_fft, fft16%2
+%xdefine list_of_fft list_of_fft, fft16%2 SECTION_REL
 %endif
 
 %assign n 1<<%1
 %rep 17-%1
 %assign n2 n/2
 %assign n4 n/4
-%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2
+%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2 SECTION_REL
 
 align 16
 fft %+ n %+ %3%2:
@@ -460,6 +465,10 @@ section .text
 cglobal fft_dispatch%3%2, 2,5,0, z, nbits
     lea r2, [dispatch_tab%3%2 GLOBAL]
     mov r2, [r2 + (nbitsq-2)*gprsize]
+%ifdef PIC
+    lea r3, [$$ GLOBAL]
+    add r2, r3
+%endif
     call r2
     RET
 %endmacro ; DECL_FFT
Revision:	1.2
Committed:	Fri May 7 17:11:56 2010 UTC (3 years ago) by rathann
Branch:	MAIN
CVS Tags:	ffmpeg-0_5_1-1_fc11, ffmpeg-0_5_2-1_fc11, HEAD
Changes since 1.1:	+37 -8 lines
Log Message:	* Fri Mar 05 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.5.1-1 - updated to latest point release - fix textrels on x86_64 in a different way (patch by Reimar Döffinger) - use -mlongcall instead of -fPIC to fix rfbz#804, it's faster - replaced amr.b with opencore-amr - dropped separate SIMDified libs for x86 and ppc(64), runtime CPU detection should be enough
Line	File contents
1	diff -up ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm
2	--- ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm.textrel 2009-02-13 01:57:22.000000000 +0100
3	+++ ffmpeg-0.5.1/libavcodec/x86/fft_mmx.asm 2010-03-05 21:40:24.000000000 +0100
4	@@ -417,18 +417,23 @@ DECL_PASS pass_interleave_3dn, PASS_BIG
5	%define pass_3dn2 pass_3dn
6	%define pass_interleave_3dn2 pass_interleave_3dn
7
8	+%ifdef PIC
9	+%define SECTION_REL - $$
10	+%else
11	+%define SECTION_REL
12	+%endif
13
14	%macro DECL_FFT 2-3 ; nbits, cpu, suffix
15	-%xdefine list_of_fft fft4%2, fft8%2
16	+%xdefine list_of_fft fft4%2 SECTION_REL, fft8%2 SECTION_REL
17	%if %1==5
18	-%xdefine list_of_fft list_of_fft, fft16%2
19	+%xdefine list_of_fft list_of_fft, fft16%2 SECTION_REL
20	%endif
21
22	%assign n 1<<%1
23	%rep 17-%1
24	%assign n2 n/2
25	%assign n4 n/4
26	-%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2
27	+%xdefine list_of_fft list_of_fft, fft %+ n %+ %3%2 SECTION_REL
28
29	align 16
30	fft %+ n %+ %3%2:
31	@@ -460,6 +465,10 @@ section .text
32	cglobal fft_dispatch%3%2, 2,5,0, z, nbits
33	lea r2, [dispatch_tab%3%2 GLOBAL]
34	mov r2, [r2 + (nbitsq-2)*gprsize]
35	+%ifdef PIC
36	+ lea r3, [$$ GLOBAL]
37	+ add r2, r3
38	+%endif
39	call r2
40	RET
41	%endmacro ; DECL_FFT