diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 18:14:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 18:16:15 +0200 |
| commit | 232959f184e106c08ba196f800f15047e74ce4e8 (patch) | |
| tree | 7ef6ba481eb6f718eb37e56e353741dcc3f347db /libavutil/aarch64 | |
| parent | fba0ac28055d3dca2846ea41d3326f08455d1a4d (diff) | |
| parent | 08cd92144e73195eecc28ed0348e66e255516b82 (diff) | |
| download | ffmpeg-232959f184e106c08ba196f800f15047e74ce4e8.tar.gz | |
Merge commit '08cd92144e73195eecc28ed0348e66e255516b82'
* commit '08cd92144e73195eecc28ed0348e66e255516b82':
aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aarch64')
| -rw-r--r-- | libavutil/aarch64/asm.S | 4 |
1 files changed, 2 insertions, 2 deletions
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 |