VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto/Twofish_x86.S
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-26 16:53:12 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-27 00:55:22 +0200
commit3d8260d3d3243ff5747b846cde296642156f51b0 (patch)
treec12fe1bfa0c8619a3dbdafbc3fd1d7411b30c0ae /src/Crypto/Twofish_x86.S
parente8bafa6a378852977326c060c505b6487232664b (diff)
downloadVeraCrypt-3d8260d3d3243ff5747b846cde296642156f51b0.tar.gz
VeraCrypt-3d8260d3d3243ff5747b846cde296642156f51b0.zip
MacOSX: various changes for assembly files build. Don't use 32-bit assembly code of SHA-512 since it is not compatible with PIE configuration of OSX compiler (absolute addressing used)
Diffstat (limited to 'src/Crypto/Twofish_x86.S')
-rw-r--r--src/Crypto/Twofish_x86.S14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/Crypto/Twofish_x86.S b/src/Crypto/Twofish_x86.S
index d4af8cea..46f0e986 100644
--- a/src/Crypto/Twofish_x86.S
+++ b/src/Crypto/Twofish_x86.S
@@ -1,11 +1,5 @@
- .ifndef WINABI
-%ifidn __OUTPUT_FORMAT__,elf
-section .note.GNU-stack noalloc noexec nowrite progbits
-%endif
-%ifidn __OUTPUT_FORMAT__,elf32
-section .note.GNU-stack noalloc noexec nowrite progbits
-%endif
-%ifidn __OUTPUT_FORMAT__,elf64
-section .note.GNU-stack noalloc noexec nowrite progbits
-%endif
+ .ifndef __YASM__
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
.endif \ No newline at end of file