MacOSX: use Yasm to build Twofish 64-bit assembly code on OSX since native compiler doesn't support GAS syntax
This commit is contained in:
parent
9b0669da29
commit
3d978c31a7
|
@ -39,6 +39,7 @@ export AR ?= ar
|
|||
export CC ?= gcc
|
||||
export CXX ?= g++
|
||||
export AS := nasm
|
||||
export YASM := yasm
|
||||
export RANLIB ?= ranlib
|
||||
|
||||
export CFLAGS := -Wall
|
||||
|
@ -251,6 +252,7 @@ ifeq "$(shell uname -s)" "Darwin"
|
|||
endif
|
||||
|
||||
AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm
|
||||
YASM := $(BASE_DIR)/Build/Tools/MacOSX/yasm
|
||||
ASFLAGS += --prefix _
|
||||
|
||||
ifeq "$(TC_BUILD_CONFIG)" "Release"
|
||||
|
|
|
@ -76,7 +76,7 @@ ifeq "$(PLATFORM)" "MacOSX"
|
|||
rm -fr ../Crypto/Aes_x86.o ../Crypto/Aes_x64.o
|
||||
../Crypto/Twofish_asm.oo: ../Crypto/Twofish_x64.S
|
||||
@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
|
||||
|
||||
include $(BUILD_INC)/Makefile.inc
|
||||
|
|
Loading…
Reference in New Issue