diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-11-28 00:29:36 +0100 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-12-07 12:36:04 +0100 |
commit | 263abeee3a8c97e98fec49ee0ce628d6c5c5df50 (patch) | |
tree | c6a326a7c90280cb3926c58275f361b999bd2ba3 /src/Crypto/Makefile.inc | |
parent | 68fababbe88cf213b3f2f3a71d66c2b05196aaed (diff) | |
download | VeraCrypt-263abeee3a8c97e98fec49ee0ce628d6c5c5df50.tar.gz VeraCrypt-263abeee3a8c97e98fec49ee0ce628d6c5c5df50.zip |
Crypto: Add optimized Twofish assembly implementation for x86_64.
Diffstat (limited to 'src/Crypto/Makefile.inc')
-rw-r--r-- | src/Crypto/Makefile.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Crypto/Makefile.inc b/src/Crypto/Makefile.inc index bd5b80d9..e014976a 100644 --- a/src/Crypto/Makefile.inc +++ b/src/Crypto/Makefile.inc @@ -1,9 +1,12 @@ TC_ASFLAGS = -Xvc -Ox +VC_YASMFLAGS = -Xvc -p gas -D WINABI !if "$(TC_ARCH)" == "x86" TC_ASFLAGS = $(TC_ASFLAGS) -f win32 --prefix _ -D MS_STDCALL -D DLL_EXPORT +VC_YASMFLAGS = $(VC_YASMFLAGS) -f win32 !else TC_ASFLAGS = $(TC_ASFLAGS) -f win64 +VC_YASMFLAGS = $(VC_YASMFLAGS) -f win64 !endif TC_ASM_ERR_LOG = ..\Driver\build_errors_asm.log @@ -16,3 +19,6 @@ TC_ASM_ERR_LOG = ..\Driver\build_errors_asm.log "$(OBJ_PATH)\$(O)\Aes_hw_cpu.obj": Aes_hw_cpu.asm nasm.exe $(TC_ASFLAGS) -o "$@" -l "$(OBJ_PATH)\$(O)\Aes_hw_cpu.lst" Aes_hw_cpu.asm 2>$(TC_ASM_ERR_LOG) + +"$(OBJ_PATH)\$(O)\Twofish_$(TC_ARCH).obj": Twofish_$(TC_ARCH).S + yasm.exe $(VC_YASMFLAGS) -o "$@" -l "$(OBJ_PATH)\$(O)\Twofish_$(TC_ARCH).lst" Twofish_$(TC_ARCH).S 2>$(TC_ASM_ERR_LOG) |