diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:01:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:07:26 +0100 |
| commit | 53d11f7b2d380c19ae862331d7283039b49c9f0e (patch) | |
| tree | 8e60ba7da969c207a0a125d118260f1a4e82f8e8 /libavutil | |
| parent | 36fb07d1abc7738427c98cfb154e2d1b9bcc40fe (diff) | |
| parent | 543156d7518f5e5d731123da066d86278f9fa492 (diff) | |
| download | ffmpeg-53d11f7b2d380c19ae862331d7283039b49c9f0e.tar.gz | |
Merge commit '543156d7518f5e5d731123da066d86278f9fa492'
* commit '543156d7518f5e5d731123da066d86278f9fa492':
arm: Mark the stack as non-executable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index b795e8b707..2ac2c2bfc4 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 |