From 5584abf69d83169a010aca404cd1cf95c23ad9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 12 Oct 2018 13:29:51 +0300 Subject: [PATCH] arm: Emit .thumb_func directives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prior to Xcode 9.3, the clang built-in assembler didn't support altmacro, and gas-preprocessor was used for assembling for arm/darwin. For thumb functions, gas-preprocessor took care of adding the .thumb_func directives, but when now being able to assemble without gas-preprocessor, we need to add these directives ourselves. Signed-off-by: Martin Storsjö --- libavutil/arm/asm.S | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index e7eea0271f..62ce493180 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