[FFmpeg-cvslog] arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols

Martin Storsjö git at videolan.org
Sat Feb 8 00:53:55 CET 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Feb  4 16:28:24 2014 +0200| [e3fec3f095ab5ea08ee662942d98526aaf5e3635] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3fec3f095ab5ea08ee662942d98526aaf5e3635
---

 libavutil/arm/asm.S |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 57efe97..f4523ea 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



More information about the ffmpeg-cvslog mailing list