[FFmpeg-cvslog] x86: fft: elf64: fix PIC build

Mans Rullgard git at videolan.org
Wed Jun 27 00:02:54 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jun 25 15:25:55 2012 +0100| [059533489250e58f1726ed2d1cb61869b2e00ed0] | committer: Mans Rullgard

x86: fft: elf64: fix PIC build

In a 64-bit PIC build, external functions must be called
through the PLT.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=059533489250e58f1726ed2d1cb61869b2e00ed0
---

 libavcodec/x86/fft_mmx.asm |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm
index 5143611..007f5ca 100644
--- a/libavcodec/x86/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
@@ -647,7 +647,11 @@ cglobal fft_permute, 2,7,1
     add     rsp, 8
     RET
 %elif ARCH_X86_64
+%ifdef PIC
+    jmp     memcpy wrt ..plt
+%else
     jmp     memcpy
+%endif
 %else
     push    r2
     push    r5



More information about the ffmpeg-cvslog mailing list