[FFmpeg-cvslog] r25150 - trunk/libavcodec/arm/asm.S

mru subversion
Mon Sep 20 23:50:46 CEST 2010


Author: mru
Date: Mon Sep 20 23:50:46 2010
New Revision: 25150

Log:
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.

Modified:
   trunk/libavcodec/arm/asm.S

Modified: trunk/libavcodec/arm/asm.S
==============================================================================
--- trunk/libavcodec/arm/asm.S	Mon Sep 20 23:48:03 2010	(r25149)
+++ trunk/libavcodec/arm/asm.S	Mon Sep 20 23:50:46 2010	(r25150)
@@ -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



More information about the ffmpeg-cvslog mailing list