Merge commit '543156d7518f5e5d731123da066d86278f9fa492'

[ffmpeg] / libavutil / arm / asm.S

diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index c71c5753f6a97a04f47cee70e6f836bb4edd3fc5..2ac2c2bfc4f466d13ff990ff8a7452b4cd35f9ae 100644 (file)
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -53,6 +53,7 @@
         .syntax unified
 T       .thumb
 ELF     .eabi_attribute 25, 1           @ Tag_ABI_align_preserved
+ELF     .section .note.GNU-stack,"",%progbits @ Mark stack as non-executable
 
 .macro  function name, export=0, align=2
         .set            .Lpic_idx, 0
@@ -72,11 +73,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