diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:49:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:49:28 +0100 |
commit | a7574a36afa1ccf5b170e4e827050710bd280899 (patch) | |
tree | ef67d7f557c3bfccdd7b68e11620290b77a2b7a5 | |
parent | bf90abe1dd51b692a4ebdf466151f0788f2c5ca2 (diff) | |
parent | e3fec3f095ab5ea08ee662942d98526aaf5e3635 (diff) | |
download | ffmpeg-a7574a36afa1ccf5b170e4e827050710bd280899.tar.gz |
Merge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'
* commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635':
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavutil/arm/asm.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index c71c5753f6..b795e8b707 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -72,11 +72,14 @@ ELF .size \name, . - \name .align \align .if \export .global EXTERN_ASM\name +ELF .type EXTERN_ASM\name, %function + .func EXTERN_ASM\name EXTERN_ASM\name: - .endif + .else ELF .type \name, %function .func \name \name: + .endif .endm .macro const name, align=2 |