VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-16 21:18:10 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-20 23:39:51 (GMT)
commit78803703e6d47462b6d883f61bfe750e5ff794c0 (patch)
tree8e041a642d187899d97a6929fcfd71a9f05bbc34 /src/Crypto
parent5d0321291f4df297b0d9f9837099a36cdf1c83b6 (diff)
downloadVeraCrypt-78803703e6d47462b6d883f61bfe750e5ff794c0.zip
VeraCrypt-78803703e6d47462b6d883f61bfe750e5ff794c0.tar.gz
Windows: fix compilation error of assembly files after latest changes on Linux.
Diffstat (limited to 'src/Crypto')
-rw-r--r--src/Crypto/Twofish_x64.S3
-rw-r--r--src/Crypto/Twofish_x86.S3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Crypto/Twofish_x64.S b/src/Crypto/Twofish_x64.S
index c3483e3..e5fa5ea 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 4f65487..d4af8ce 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