RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-05-30 23:12:45 +02:00
parent 1fe40e1b05 d6d767d93e
commit 83b8987df7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ppc/asm.S
View File

@ -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):