[FFmpeg-cvslog] aarch64: add darwin style PAGE/PAGEOFF relocations

Janne Grunau git at videolan.org
Tue Jun 3 18:02:58 CEST 2014


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Sun Jun  1 15:50:42 2014 +0200| [fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e] | committer: Janne Grunau

aarch64: add darwin style PAGE/PAGEOFF relocations

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e
---

 libavutil/aarch64/asm.S |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 8ac5c18..fb635d0 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 at PAGE
+        add             \rd, \rd, \val at PAGEOFF
+#elif CONFIG_PIC
         adrp            \rd, :pg_hi21:\val
         add             \rd, \rd, :lo12:\val
 #else



More information about the ffmpeg-cvslog mailing list