[SCM] libav/experimental: aarch64: Use the correct syntax for relocations

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


The following commit has been merged in the experimental branch:
commit 08cd92144e73195eecc28ed0348e66e255516b82
Author: Martin Storsjö <martin at martin.st>
Date:   Thu May 29 14:37:31 2014 +0300

    aarch64: Use the correct syntax for relocations
    
    This fixes building in PIC mode with gas. The examples in the gas
    manual showed using a # here even though gas itself actually didn't
    support that syntax (and the gas test suite only tests it without
    the extra hash sign).
    
    CC: libav-stable at libav.org
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 6c93d11..8ac5c18 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -58,8 +58,8 @@ ELF     .size   \name, . - \name
 
 .macro  movrel rd, val
 #if CONFIG_PIC
-        adrp            \rd, #:pg_hi21:\val
-        add             \rd, \rd, #:lo12:\val
+        adrp            \rd, :pg_hi21:\val
+        add             \rd, \rd, :lo12:\val
 #else
         ldr             \rd, =\val
 #endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list