Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

[ffmpeg] / libavutil / arm / asm.S

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 6744f2a20049089303ec2f7e5a0494cfdec53932..5fc85591dddd9997f59c38193692bdeefd327bb4 100644 (file)
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -46,6 +46,12 @@
 #   define FPU @
 #endif
 
+#if CONFIG_THUMB && defined(__APPLE__)
+#   define TFUNC
+#else
+#   define TFUNC @
+#endif
+
 #if HAVE_AS_ARCH_DIRECTIVE
 #if   HAVE_NEON
         .arch           armv7-a
@@ -98,10 +104,12 @@ FUNC    .endfunc
         .global EXTERN_ASM\name
 ELF     .type   EXTERN_ASM\name, %function
 FUNC    .func   EXTERN_ASM\name
+TFUNC   .thumb_func EXTERN_ASM\name
 EXTERN_ASM\name:
     .else
 ELF     .type   \name, %function
 FUNC    .func   \name
+TFUNC   .thumb_func \name
 \name:
     .endif
 .endm