[FFmpeg-cvslog] Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr  4 16:04:29 2017 -0300| [d1ee6fb72945d43d55aa0e7f946a957274cd94c9] | committer: James Almer

Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f'

* commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f':
  arm: warn/error on movrelx usage problematic with PIC on ELF

Merged-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index f488289..7d33a64 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -184,6 +184,15 @@ T       ldr             \rd, [\rd]
 .endm
 
 .macro  movrelx         rd,  val, gp
+    .ifc \rd,\gp
+        .error      "movrelx needs two distinct registers"
+    .endif
+    .ifc \rd\()_\gp,r12_
+        .warning    "movrelx rd=\rd without explicit set gp"
+    .endif
+    .ifc \rd\()_\gp,ip_
+        .warning    "movrelx rd=\rd without explicit set gp"
+    .endif
 #if CONFIG_PIC && defined(__ELF__)
     .ifnb \gp
       .if .Lpic_gp


======================================================================