diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 12:45:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 12:45:35 +0200 |
| commit | a40c338a00a4e1c7f2cce189db0f406f85d5792a (patch) | |
| tree | 02cc507c31e3f4071f881e2e87b934d0b09d5d38 | |
| parent | d5c9d055ea3d9b40e736257fd7b58125ada8cba8 (diff) | |
| parent | d5a55981986ac5d1a31aef3a8d16eaff8534a412 (diff) | |
Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'
* commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412':
build: check if AS supports the '.func' directive
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavutil/aarch64/asm.S | 12 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 12 |
3 files changed, 24 insertions, 6 deletions
@@ -1719,6 +1719,7 @@ SYSTEM_FUNCS=" TOOLCHAIN_FEATURES=" as_dn_directive + as_func asm_mod_q attribute_may_alias attribute_packed @@ -4280,6 +4281,11 @@ if enabled asm; then .endm m x EOF + + check_as <<EOF && enable as_func +.func test +.endfunc +EOF fi check_inline_asm inline_asm_labels '"1:\n"' diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index 557dfb51e8..d153df69d8 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -26,10 +26,16 @@ # define ELF # #endif +#if HAVE_AS_FUNC +# define FUNC +#else +# define FUNC # +#endif + .macro function name, export=0, align=2 .macro endfunc ELF .size \name, . - \name - .endfunc +FUNC .endfunc .purgem endfunc .endm .text @@ -37,11 +43,11 @@ ELF .size \name, . - \name .if \export .global EXTERN_ASM\name ELF .type EXTERN_ASM\name, %function - .func EXTERN_ASM\name +FUNC .func EXTERN_ASM\name EXTERN_ASM\name: .else ELF .type \name, %function - .func \name +FUNC .func \name \name: .endif .endm diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 08669f043c..35559ce27a 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -34,6 +34,12 @@ # define T @ #endif +#if HAVE_AS_FUNC +# define FUNC +#else +# define FUNC @ +#endif + #if HAVE_NEON .arch armv7-a #elif HAVE_ARMV6T2 @@ -66,7 +72,7 @@ ELF .section .note.GNU-stack,"",%progbits @ Mark stack as non-executable .noaltmacro .endif ELF .size \name, . - \name - .endfunc +FUNC .endfunc .purgem endfunc .endm .text @@ -74,11 +80,11 @@ ELF .size \name, . - \name .if \export .global EXTERN_ASM\name ELF .type EXTERN_ASM\name, %function - .func EXTERN_ASM\name +FUNC .func EXTERN_ASM\name EXTERN_ASM\name: .else ELF .type \name, %function - .func \name +FUNC .func \name \name: .endif .endm |