virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Merge commit '5584abf69d83169a010aca404cd1cf95c23ad9ef'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-02-20 13:51:30 -03:00
commit b2f32d60ee
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/arm/asm.S
View File

@ -46,6 +46,12 @@
# define FPU @ # define FPU @
#endif #endif
#if CONFIG_THUMB && defined(__APPLE__)
# define TFUNC
#else
# define TFUNC @
#endif
#if HAVE_AS_ARCH_DIRECTIVE #if HAVE_AS_ARCH_DIRECTIVE
#if HAVE_NEON #if HAVE_NEON
.arch armv7-a .arch armv7-a
@ -98,10 +104,12 @@ FUNC .endfunc
.global EXTERN_ASM\name .global EXTERN_ASM\name
ELF .type EXTERN_ASM\name, %function ELF .type EXTERN_ASM\name, %function
FUNC .func EXTERN_ASM\name FUNC .func EXTERN_ASM\name
TFUNC .thumb_func EXTERN_ASM\name
EXTERN_ASM\name: EXTERN_ASM\name:
.else .else
ELF .type \name, %function ELF .type \name, %function
FUNC .func \name FUNC .func \name
TFUNC .thumb_func \name
\name: \name:
.endif .endif
.endm .endm