From: Måns Rullgård <mans@mansr.com>
Date: Sun, 11 Oct 2009 10:15:48 +0000 (+0000)
Subject: ARM: simplify movrel definition as CONFIG_PIC is now set for shared libs
X-Git-Tag: v0.6~2984
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3e6015cc18d39b38188cd79a47cb8b374d5d5c68;p=coroid%2Flibav_saccubus.git

ARM: simplify movrel definition as CONFIG_PIC is now set for shared libs

Originally committed as revision 20204 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index 0fbd641dc..1ee431d94 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -45,7 +45,7 @@ ELF     .type   \name, %function
         .endm
 
         .macro movrel rd, val
-#if HAVE_ARMV6T2 && !CONFIG_SHARED && !CONFIG_PIC
+#if HAVE_ARMV6T2 && !CONFIG_PIC
         movw            \rd, #:lower16:\val
         movt            \rd, #:upper16:\val
 #else