diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-12-30 03:13:52 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-12-30 03:13:52 +0000 |
| commit | 172a39d13c77bda27ac77535d1df45f85b751fcb (patch) | |
| tree | decec1efc808e094aa37f44bb94d6c43da57de16 /libavcodec/arm/asm.S | |
| parent | 2e35e68434352d44ea133b9fa0f623c87c6a95b6 (diff) | |
| download | ffmpeg-172a39d13c77bda27ac77535d1df45f85b751fcb.tar.gz | |
ARM: work around linker bug with movw/movt relocations in shared libs
Originally committed as revision 16395 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm/asm.S')
| -rw-r--r-- | libavcodec/arm/asm.S | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index e2595f4789..0aa1639998 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + .macro require8, val=1 .eabi_attribute 24, \val .endm @@ -34,3 +36,12 @@ .func \name \name: .endm + + .macro movrel rd, val +#if defined(HAVE_ARMV6T2) && !defined(CONFIG_SHARED) + movw \rd, #:lower16:\val + movt \rd, #:upper16:\val +#else + ldr \rd, =\val +#endif + .endm |