Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'

* commit 'd6d767d93e532246cacf3567e6bcad76a821f838': ppc: Fix compilation for ppc64le (ELFv2) Conflicts: libavcodec/ppc/asm.S See: 41b928c5fa Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 83b8987df7
parent 1fe40e1b05 d6d767d93e
commit 83b8987df7
1 changed files with 3 additions and 3 deletions
--- a/libavcodec/ppc/asm.S
+++ b/libavcodec/ppc/asm.S
@ -39,9 +39,9 @@
 #if _CALL_ELF == 2
    .text
 X(\name):
-    addis %r2,%r12,.TOC.-X(\name)@ha
-    addi %r2,%r2,.TOC.-X(\name)@l
-//    .localentry \name,-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):