[FFmpeg-cvslog] aarch64: Add parentheses around the offset parameter in movrel

Martin Storsjö git at videolan.org
Sat Mar 11 13:53:24 EET 2017


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Feb 16 09:18:25 2017 +0200| [dda45c087b2c09ba9e485c51ff9c8f2aaca709a9] | committer: Martin Storsjö

aarch64: Add parentheses around the offset parameter in movrel

This fixes building with clang for linux with PIC enabled.

This is cherrypicked from libav commit
8847eeaa141898850381400000fb2b8a7adc7100.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

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

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 523b8c5..4289729 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -83,8 +83,8 @@ ELF     .size   \name, . - \name
         add             \rd, \rd, \val+(\offset)@PAGEOFF
     .endif
 #elif CONFIG_PIC
-        adrp            \rd, \val+\offset
-        add             \rd, \rd, :lo12:\val+\offset
+        adrp            \rd, \val+(\offset)
+        add             \rd, \rd, :lo12:\val+(\offset)
 #else
         ldr             \rd, =\val+\offset
 #endif



More information about the ffmpeg-cvslog mailing list