[FFmpeg-cvslog] arm: Clear the gp register alias at the end of functions

Martin Storsjö git at videolan.org
Tue Nov 15 22:14:05 EET 2016


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Nov 14 12:32:20 2016 +0200| [86c5a23ee5236aa0996435247a2141ac90fc491e] | committer: Ronald S. Bultje

arm: Clear the gp register alias at the end of functions

We reset .Lpic_gp to zero at the start of each function, which means
that the logic within movrelx for clearing gp when necessary will
be missed.

This fixes using movrelx in different functions with a different
helper register.

This is cherry-picked from libav commit
824e8c284054f323f854892d1b4739239ed1fdc7.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

 libavutil/arm/asm.S | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index e9b0bca..b0a6e50 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -77,6 +77,9 @@ ELF     .section .note.GNU-stack,"",%progbits @ Mark stack as non-executable
         put_pic         %(.Lpic_idx - 1)
         .noaltmacro
       .endif
+      .if .Lpic_gp
+        .unreq          gp
+      .endif
 ELF     .size   \name, . - \name
 FUNC    .endfunc
         .purgem endfunc



More information about the ffmpeg-cvslog mailing list