[SCM] libav/experimental: aarch64: add darwin style PAGE/PAGEOFF relocations

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:23 UTC 2014


The following commit has been merged in the experimental branch:
commit fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e
Author: Janne Grunau <janne-libav at jannau.net>
Date:   Sun Jun 1 15:50:42 2014 +0200

    aarch64: add darwin style PAGE/PAGEOFF relocations

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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list