Browse Source

Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

* commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412':
  build: check if AS supports the '.func' directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
a40c338a00
3 changed files with 24 additions and 6 deletions
  1. +6
    -0
      configure
  2. +9
    -3
      libavutil/aarch64/asm.S
  3. +9
    -3
      libavutil/arm/asm.S

+ 6
- 0
configure View File

@@ -1719,6 +1719,7 @@ SYSTEM_FUNCS="

TOOLCHAIN_FEATURES="
as_dn_directive
as_func
asm_mod_q
attribute_may_alias
attribute_packed
@@ -4279,6 +4280,11 @@ if enabled asm; then
\n: .int 0
.endm
m x
EOF

check_as <<EOF && enable as_func
.func test
.endfunc
EOF
fi



+ 9
- 3
libavutil/aarch64/asm.S View File

@@ -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


+ 9
- 3
libavutil/arm/asm.S View File

@@ -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


Loading…
Cancel
Save