videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

aarch64: Add an offset parameter to the movrel macro 

With apple tools, the linker fails with errors like these, if the
offset is negative:

ld: in section __TEXT,__text reloc 8: symbol index out of range for architecture arm64

This is cherry-picked from libav commit
c44a8a3eab.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Martin Storsjö 2016-11-14 12:32:24 +02:00 committed by Ronald S. Bultje
parent 6bec60a683
commit 7fe898dbb9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/aarch64/asm.S
View File

@ -72,15 +72,21 @@ ELF .size \name, . - \name
\name:
.endm
.macro movrel rd, val
.macro movrel rd, val, offset=0
#if CONFIG_PIC && defined(__APPLE__)
.if \offset < 0
adrp \rd, \val@PAGE
add \rd, \rd, \val@PAGEOFF
sub \rd, \rd, -(\offset)
.else
adrp \rd, \val+(\offset)@PAGE
add \rd, \rd, \val+(\offset)@PAGEOFF
.endif
#elif CONFIG_PIC
adrp \rd, \val
add \rd, \rd, :lo12:\val
adrp \rd, \val+\offset
add \rd, \rd, :lo12:\val+\offset
#else
ldr \rd, =\val
ldr \rd, =\val+\offset
#endif
.endm