From 75c490f467655bf7be664abdde6858c6f8db5f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 20 Sep 2010 21:50:46 +0000 Subject: [PATCH] ARM: disable movw/movt for relocated values on Apple platforms Apparently Apple platforms do not handle movw/movt relocations properly, leading to runtime crashes in code using them. Originally committed as revision 25150 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/arm/asm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index f364a24f9b..e0507834f2 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -62,7 +62,7 @@ ELF .type \name, %function .endm .macro movrel rd, val -#if HAVE_ARMV6T2 && !CONFIG_PIC +#if HAVE_ARMV6T2 && !CONFIG_PIC && !defined(__APPLE__) movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else