[FFmpeg-cvslog] Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Feb 20 13:51:30 2019 -0300| [b2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72] | committer: James Almer

Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

* commit '5584abf69d83169a010aca404cd1cf95c23ad9ef':
  arm: Emit .thumb_func directives

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72
---

 libavutil/arm/asm.S | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 6744f2a200..5fc85591dd 100644
--- 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


======================================================================