Commit 83b8987d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd6d767d9'

* commit 'd6d767d9':
  ppc: Fix compilation for ppc64le (ELFv2)

Conflicts:
	libavcodec/ppc/asm.S

See: 41b928c5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1fe40e1b d6d767d9
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#if _CALL_ELF == 2 #if _CALL_ELF == 2
.text .text
X(\name): X(\name):
addis %r2,%r12,.TOC.-X(\name)@ha addis %r2, %r12, .TOC.-X(\name)@ha
addi %r2,%r2,.TOC.-X(\name)@l addi %r2, %r2, .TOC.-X(\name)@l
// .localentry \name,-X(\name) .localentry X(\name), .-X(\name)
#else #else
.section .opd, "aw" .section .opd, "aw"
X(\name): X(\name):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment