aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-02-07 16:22:54 +0200
committerReinhard Tartler <siretart@tauware.de>2014-03-02 11:42:37 -0500
commitcd6281abef6e707bfd34b2f479af400a854ab149 (patch)
tree96506c776e2a8670018dad6f162ae303efeaa1f1
parent1779cd7695ab26a5f708df6f743d4d8fe806ce7b (diff)
downloadffmpeg-cd6281abef6e707bfd34b2f479af400a854ab149.tar.gz
arm: Mark the stack as non-executable
If linking in an object file without this attribute set, the linker will assume that an executable stack might be needed. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 543156d7518f5e5d731123da066d86278f9fa492)
-rw-r--r--libavutil/arm/asm.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index f4523ea310..45fdf55522 100644
--- 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