[SCM] libav/master: ppc: Fix compilation for ppc64le (ELFv2)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Jun 28 15:04:36 UTC 2014


The following commit has been merged in the master branch:
commit 0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01
Author: Thierry Fauck <thierry at linux.vnet.ibm.com>
Date:   Thu May 29 15:22:27 2014 +0300

    ppc: Fix compilation for ppc64le (ELFv2)
    
    CC: libav-stable at libav.org
    Signed-off-by: Martin Storsjö <martin at martin.st>
    (cherry picked from commit d6d767d93e532246cacf3567e6bcad76a821f838)
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavcodec/ppc/asm.S b/libavcodec/ppc/asm.S
index 4d4285b..141dee9 100644
--- a/libavcodec/ppc/asm.S
+++ b/libavcodec/ppc/asm.S
@@ -36,12 +36,20 @@
 
 .macro extfunc name
     .global X(\name)
+#if _CALL_ELF == 2
+    .text
+X(\name):
+    addis %r2, %r12, .TOC.-X(\name)@ha
+    addi %r2, %r2, .TOC.-X(\name)@l
+    .localentry X(\name), .-X(\name)
+#else
     .section .opd, "aw"
 X(\name):
     .quad L(\name), .TOC. at tocbase, 0
     .previous
     .type X(\name), STT_FUNC
 L(\name):
+#endif
 .endm
 
 .macro movrel rd, sym, gp

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list