diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 10:02:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 10:02:43 -0300 |
| commit | 28bb96c408e3d5d1da7f2788dfbdbfd25a3cff76 (patch) | |
| tree | c66023a02f63f82cae3a84b22568eead0b74a8b1 /libavutil/aarch64 | |
| parent | 87681ba97b707e460af266d5a1ff89e32a3184ef (diff) | |
| parent | 7b7760ad6efb7b96122aa7133ad21e22653ae222 (diff) | |
| download | ffmpeg-28bb96c408e3d5d1da7f2788dfbdbfd25a3cff76.tar.gz | |
Merge commit '7b7760ad6efb7b96122aa7133ad21e22653ae222'
* commit '7b7760ad6efb7b96122aa7133ad21e22653ae222':
aarch64: Fix negative movrel offsets for windows
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/aarch64')
| -rw-r--r-- | libavutil/aarch64/asm.S | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index 4289729428..2a36de14fa 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -82,6 +82,15 @@ ELF .size \name, . - \name adrp \rd, \val+(\offset)@PAGE add \rd, \rd, \val+(\offset)@PAGEOFF .endif +#elif CONFIG_PIC && defined(_WIN32) + .if \offset < 0 + adrp \rd, \val + add \rd, \rd, :lo12:\val + sub \rd, \rd, -(\offset) + .else + adrp \rd, \val+(\offset) + add \rd, \rd, :lo12:\val+(\offset) + .endif #elif CONFIG_PIC adrp \rd, \val+(\offset) add \rd, \rd, :lo12:\val+(\offset) |