aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-02-04 16:28:24 +0200
committerMartin Storsjö <martin@martin.st>2014-02-07 15:14:06 +0200
commite3fec3f095ab5ea08ee662942d98526aaf5e3635 (patch)
tree41414a90ac705c8b06255a2d8004c28bdbed8c16
parent5bcbb516f2ff45290ef7995b081762e668693672 (diff)
downloadffmpeg-e3fec3f095ab5ea08ee662942d98526aaf5e3635.tar.gz
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
This makes the generated assembly more internally consistent, avoiding declaring two labels for the same function (for cases where EXTERN_ASM is empty) and not declaring a separate unprefixed label in other cases. This also makes sure the .func and .type delcarations have the same prefix. They have previously not been used on the platforms that have prefixed symbols on arm (iOS), but gas-preprocessor has recently started using the .func declarations for adding .thumb_func declarations for such functions. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavutil/arm/asm.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 57efe977ed..f4523ea310 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