diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-16 23:18:10 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-21 01:39:51 +0200 |
| commit | 78803703e6d47462b6d883f61bfe750e5ff794c0 (patch) | |
| tree | 8e041a642d187899d97a6929fcfd71a9f05bbc34 /src/Crypto | |
| parent | 5d0321291f4df297b0d9f9837099a36cdf1c83b6 (diff) | |
| download | VeraCrypt-78803703e6d47462b6d883f61bfe750e5ff794c0.tar.gz VeraCrypt-78803703e6d47462b6d883f61bfe750e5ff794c0.zip | |
Windows: fix compilation error of assembly files after latest changes on Linux.
Diffstat (limited to 'src/Crypto')
| -rw-r--r-- | src/Crypto/Twofish_x64.S | 3 | ||||
| -rw-r--r-- | src/Crypto/Twofish_x86.S | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Crypto/Twofish_x64.S b/src/Crypto/Twofish_x64.S index c3483e33..e5fa5ea8 100644 --- a/src/Crypto/Twofish_x64.S +++ b/src/Crypto/Twofish_x64.S @@ -312,8 +312,9 @@ movq %r8, %rdx; .endif ret; + .ifndef WINABI #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits #endif - + .endif diff --git a/src/Crypto/Twofish_x86.S b/src/Crypto/Twofish_x86.S index 4f654871..d4af8cea 100644 --- a/src/Crypto/Twofish_x86.S +++ b/src/Crypto/Twofish_x86.S @@ -1,3 +1,4 @@ + .ifndef WINABI %ifidn __OUTPUT_FORMAT__,elf section .note.GNU-stack noalloc noexec nowrite progbits %endif @@ -7,4 +8,4 @@ section .note.GNU-stack noalloc noexec nowrite progbits %ifidn __OUTPUT_FORMAT__,elf64 section .note.GNU-stack noalloc noexec nowrite progbits %endif - + .endif
\ No newline at end of file |