diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-26 16:53:12 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-27 00:55:22 +0200 |
| commit | 3d8260d3d3243ff5747b846cde296642156f51b0 (patch) | |
| tree | c12fe1bfa0c8619a3dbdafbc3fd1d7411b30c0ae /src/Volume | |
| parent | e8bafa6a378852977326c060c505b6487232664b (diff) | |
| download | VeraCrypt-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/Volume')
| -rw-r--r-- | src/Volume/Volume.make | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make index e15ee2c4..b8f69429 100644 --- a/src/Volume/Volume.make +++ b/src/Volume/Volume.make @@ -36,14 +36,14 @@ ifeq "$(PLATFORM)" "MacOSX" OBJSEX += ../Crypto/Twofish_asm.oo OBJSEX += ../Crypto/Camellia_asm.oo OBJSEX += ../Crypto/Camellia_aesni_asm.oo - OBJS += ../Crypto/sha256-nayuki.oo - OBJS += ../Crypto/sha512-nayuki.oo - OBJS += ../Crypto/sha256_avx1.oo - OBJS += ../Crypto/sha256_avx2.oo - OBJS += ../Crypto/sha256_sse4.oo - OBJS += ../Crypto/sha512_avx1.oo - OBJS += ../Crypto/sha512_avx2.oo - OBJS += ../Crypto/sha512_sse4.oo + OBJSEX += ../Crypto/sha256-nayuki.oo + OBJSEX += ../Crypto/sha512-nayuki.oo + OBJSEX += ../Crypto/sha256_avx1.oo + OBJSEX += ../Crypto/sha256_avx2.oo + OBJSEX += ../Crypto/sha256_sse4.oo + OBJSEX += ../Crypto/sha512_avx1.oo + OBJSEX += ../Crypto/sha512_avx2.oo + OBJSEX += ../Crypto/sha512_sse4.oo else ifeq "$(CPU_ARCH)" "x86" OBJS += ../Crypto/Aes_x86.o OBJS += ../Crypto/Aes_hw_cpu.o @@ -106,7 +106,10 @@ ifeq "$(PLATFORM)" "MacOSX" $(AS) $(ASFLAGS64) -p gas -o ../Crypto/Camellia_aesni_asm.oo ../Crypto/Camellia_aesni_x64.S ../Crypto/sha256-nayuki.oo: ../Crypto/sha256-x86-nayuki.S @echo Assembling $(<F) - $(AS) $(ASFLAGS32) -p gas -o ../Crypto/sha256-nayuki.oo ../Crypto/sha256-x86-nayuki.S + $(AS) $(ASFLAGS32) -p gas -o ../Crypto/sha256-x86-nayuki.o ../Crypto/sha256-x86-nayuki.S + $(AS) $(ASFLAGS64) -p gas -o ../Crypto/sha256-x64-nayuki.o ../Crypto/sha256-x64-nayuki.S + lipo -create ../Crypto/sha256-x86-nayuki.o ../Crypto/sha256-x64-nayuki.o -output ../Crypto/sha256-nayuki.oo + rm -fr ../Crypto/sha256-x86-nayuki.o ../Crypto/sha256-x64-nayuki.o ../Crypto/sha256_avx1.oo: ../Crypto/sha256_avx1_x64.asm @echo Assembling $(<F) $(AS) $(ASFLAGS64) -o ../Crypto/sha256_avx1.oo ../Crypto/sha256_avx1_x64.asm @@ -116,12 +119,9 @@ ifeq "$(PLATFORM)" "MacOSX" ../Crypto/sha256_sse4.oo: ../Crypto/sha256_sse4_x64.asm @echo Assembling $(<F) $(AS) $(ASFLAGS64) -o ../Crypto/sha256_sse4.oo ../Crypto/sha256_sse4_x64.asm -../Crypto/sha512-nayuki.oo: ../Crypto/sha512-x86-nayuki.S ../Crypto/sha512-x64-nayuki.S +../Crypto/sha512-nayuki.oo: ../Crypto/sha512-x64-nayuki.S @echo Assembling $(<F) - $(AS) -p gas $(ASFLAGS32) -o ../Crypto/sha512-x86-nayuki.o ../Crypto/sha512-x86-nayuki.S - $(AS) -p gas $(ASFLAGS64) -o ../Crypto/sha512-x64-nayuki.o ../Crypto/sha512-x64-nayuki.S - lipo -create ../Crypto/sha512-x86-nayuki.o ../Crypto/sha512-x64-nayuki.o -output ../Crypto/sha512-nayuki.oo - rm -fr ../Crypto/sha512-x86-nayuki.o ../Crypto/sha512-x64-nayuki.o + $(AS) -p gas $(ASFLAGS64) -o ../Crypto/sha512-nayuki.oo ../Crypto/sha512-x64-nayuki.S ../Crypto/sha512_avx1.oo: ../Crypto/sha512_avx1_x64.asm @echo Assembling $(<F) $(AS) $(ASFLAGS64) -o ../Crypto/sha512_avx1.oo ../Crypto/sha512_avx1_x64.asm |