From f983154677dfa6940807783c0fa8f5fcecd339a2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Jan 2014 20:43:54 +0100 Subject: Mark assembler files as not needing executable stack --- src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s | 5 +++++ src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s | 5 +++++ src/crypto/cipher/salsa2012/xmm/salsa2012_amd64_xmm6.s | 5 +++++ src/crypto/cipher/salsa2012/xmm/salsa2012_x86_xmm5.s | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s b/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s index 82a897f..ce75445 100644 --- a/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s +++ b/src/crypto/cipher/salsa20/xmm/salsa20_amd64_xmm6.s @@ -4821,3 +4821,8 @@ add $64,%rsi # qhasm: goto bytesbetween1and255 jmp ._bytesbetween1and255 + + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s b/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s index 9e32ea4..408f201 100644 --- a/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s +++ b/src/crypto/cipher/salsa20/xmm/salsa20_x86_xmm5.s @@ -5076,3 +5076,8 @@ add $64,%esi # qhasm: goto bytesbetween1and255 jmp ._bytesbetween1and255 + + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/src/crypto/cipher/salsa2012/xmm/salsa2012_amd64_xmm6.s b/src/crypto/cipher/salsa2012/xmm/salsa2012_amd64_xmm6.s index 0e26dc9..71249b7 100644 --- a/src/crypto/cipher/salsa2012/xmm/salsa2012_amd64_xmm6.s +++ b/src/crypto/cipher/salsa2012/xmm/salsa2012_amd64_xmm6.s @@ -4821,3 +4821,8 @@ add $64,%rsi # qhasm: goto bytesbetween1and255 jmp ._bytesbetween1and255 + + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif diff --git a/src/crypto/cipher/salsa2012/xmm/salsa2012_x86_xmm5.s b/src/crypto/cipher/salsa2012/xmm/salsa2012_x86_xmm5.s index c511b0d..a03e652 100644 --- a/src/crypto/cipher/salsa2012/xmm/salsa2012_x86_xmm5.s +++ b/src/crypto/cipher/salsa2012/xmm/salsa2012_x86_xmm5.s @@ -5076,3 +5076,8 @@ add $64,%esi # qhasm: goto bytesbetween1and255 jmp ._bytesbetween1and255 + + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif -- cgit v1.2.3