Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

MacOSX: use Yasm to build Twofish 64-bit assembly code on OSX since native compiler doesn't support GAS syntax

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-12-18 12:06:58 +01:00
parent 9b0669da29
commit 3d978c31a7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@@ -39,6 +39,7 @@ export AR ?= ar
export CC ?= gcc export CC ?= gcc
export CXX ?= g++ export CXX ?= g++
export AS := nasm export AS := nasm
export YASM := yasm
export RANLIB ?= ranlib export RANLIB ?= ranlib
export CFLAGS := -Wall export CFLAGS := -Wall
@@ -251,6 +252,7 @@ ifeq "$(shell uname -s)" "Darwin"
endif endif
AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm
YASM := $(BASE_DIR)/Build/Tools/MacOSX/yasm
ASFLAGS += --prefix _ ASFLAGS += --prefix _
ifeq "$(TC_BUILD_CONFIG)" "Release" ifeq "$(TC_BUILD_CONFIG)" "Release"

2
src/Volume/Volume.make
View File

@@ -76,7 +76,7 @@ ifeq "$(PLATFORM)" "MacOSX"
rm -fr ../Crypto/Aes_x86.o ../Crypto/Aes_x64.o rm -fr ../Crypto/Aes_x86.o ../Crypto/Aes_x64.o
../Crypto/Twofish_asm.oo: ../Crypto/Twofish_x64.S ../Crypto/Twofish_asm.oo: ../Crypto/Twofish_x64.S
@echo Assembling $(<F) @echo Assembling $(<F)
$(CC) -arch x86_64 -c ../Crypto/Twofish_x64.S -o ../Crypto/Twofish_asm.oo $(YASM) -p gas -f macho64 -o ../Crypto/Twofish_asm.oo ../Crypto/Twofish_x64.S
endif endif
include $(BUILD_INC)/Makefile.inc include $(BUILD_INC)/Makefile.inc