apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-12-24 11:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-04 12:45:29 +02:00
parent d5c9d055ea d5a5598198
commit a40c338a00
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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