From 1f4b11d5aba1b62492ef7aa7f24f35a579c0c8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Sun, 4 Aug 2013 04:42:56 +0200 Subject: [PATCH] Add stackmarkings to stream_salsa20_amd64_xmm6.s I'm trying to package libsodium for gentoo and received * !WX --- --- usr/lib64/libsodium.a:stream_salsa20_amd64_xmm6.o According to http://www.gentoo.org/proj/en/hardened/gnu-stack.xml this commit fixes it. --- .../salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s b/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s index 9fb04066ad..c96f710918 100644 --- a/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s +++ b/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.s @@ -1,4 +1,3 @@ - #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) .text @@ -945,3 +944,7 @@ add $64,%rsi jmp ._bytesbetween1and255 #endif + +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif