diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 17:30:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 18:02:42 +0200 |
| commit | ab9afcdf0483925b492fc590c383c866e1f1dc31 (patch) | |
| tree | 6430ec475b7e850a9ae63b4f2357513c2f9fae8d /libavutil | |
| parent | a4ed51ab40878daf8b2128bbcbf7a6d7b4d41649 (diff) | |
| parent | fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e (diff) | |
| download | ffmpeg-ab9afcdf0483925b492fc590c383c866e1f1dc31.tar.gz | |
Merge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'
* commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e':
aarch64: add darwin style PAGE/PAGEOFF relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/aarch64/asm.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index 1f9e784cea..b6798c4da1 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -57,7 +57,10 @@ ELF .size \name, . - \name .endm .macro movrel rd, val -#if CONFIG_PIC +#if CONFIG_PIC && defined(__APPLE__) + adrp \rd, \val@PAGE + add \rd, \rd, \val@PAGEOFF +#elif CONFIG_PIC adrp \rd, :pg_hi21:\val add \rd, \rd, :lo12:\val #else |