diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 22:34:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 22:34:22 +0200 |
| commit | 5cd2cdf33fcd5d6ce0485369e2506ccd9d8be4da (patch) | |
| tree | 2fa091ca30a54fc7d304241e4bb680ba28690033 | |
| parent | a5a6f6fec338112966d1bc21a52440c75831050f (diff) | |
| parent | 0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01 (diff) | |
| download | ffmpeg-5cd2cdf33fcd5d6ce0485369e2506ccd9d8be4da.tar.gz | |
Merge commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01' into release/2.2
* commit '0ec75a04e5fc714bc3cd6e2a6b783e6df834ad01':
ppc: Fix compilation for ppc64le (ELFv2)
aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ppc/asm.S | 8 | ||||
| -rw-r--r-- | libavutil/aarch64/asm.S | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/ppc/asm.S b/libavcodec/ppc/asm.S index bbbf8a4a66..a3edeed202 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.@tocbase, 0 .previous .type X(\name), STT_FUNC L(\name): +#endif .endm .macro movrel rd, sym, gp diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index 51850ec7ba..1f9e784cea 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -58,8 +58,8 @@ ELF .size \name, . - \name .macro movrel rd, val #if CONFIG_PIC - adrp \rd, #:pg_hi21:\val - add \rd, \rd, #:lo12:\val + adrp \rd, :pg_hi21:\val + add \rd, \rd, :lo12:\val #else ldr \rd, =\val #endif |