Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  Add stackmarkings to stream_salsa20_amd64_xmm6.s
This commit is contained in:
Frank Denis 2013-08-05 09:05:53 -07:00
commit 4ec678157a

View File

@ -1,4 +1,3 @@
#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__) #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
.text .text
@ -945,3 +944,7 @@ add $64,%rsi
jmp ._bytesbetween1and255 jmp ._bytesbetween1and255
#endif #endif
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
#endif