diff options
| author | James Almer <jamrial@gmail.com> | 2019-02-20 13:51:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-02-20 13:51:30 -0300 |
| commit | b2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72 (patch) | |
| tree | df224875431a88946ab85c676ca3f57e8795564b | |
| parent | 22b6e1011caa9102fafcb4d120792c772c554ba9 (diff) | |
| parent | 5584abf69d83169a010aca404cd1cf95c23ad9ef (diff) | |
| download | ffmpeg-b2f32d60eeaf883bb7d9e1b8cc2fb9a983d08f72.tar.gz | |
Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'
* commit '5584abf69d83169a010aca404cd1cf95c23ad9ef':
arm: Emit .thumb_func directives
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/arm/asm.S | 8 |
1 files changed, 8 insertions, 0 deletions
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 |