X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.osx;h=758c1ed9cebf4a91956dc79472e3e03a6f32c0c6;hb=1663f4a94dbb36331d2930c89eb51c0213200236;hp=cd13d12fc95ddbd5e3db4e2c15ac5c35dda13230;hpb=71bb258543e2a50555397336a0d1ad8f1fccfc4c;p=novacoin.git diff --git a/src/makefile.osx b/src/makefile.osx index cd13d12..758c1ed 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -59,6 +59,12 @@ else CFLAGS = -g -msse2 endif +ifeq (${USE_SSSE3}, 1) +# Intrinsic implementation of block copy +DEFS += -DUSE_SSSE3 +CFLAGS += -mssse3 +endif + # ppc doesn't work because we don't support big-endian CFLAGS += -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) @@ -132,6 +138,7 @@ endif ifeq (${USE_ASM}, 1) # Assembler implementation OBJS += crypto/scrypt/asm/obj/scrypt-arm.o crypto/scrypt/asm/obj/scrypt-x86.o crypto/scrypt/asm/obj/scrypt-x86_64.o crypto/scrypt/asm/obj/asm-wrapper.o +OBJS += crypto/sha2/asm/obj/sha2-arm.o crypto/sha2/asm/obj/sha2-x86.o crypto/sha2/asm/obj/sha2-x86_64.o crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S $(CXX) -c $(CFLAGS) -MMD -o $@ $< @@ -144,6 +151,18 @@ crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +DEFS += -DUSE_ASM + else ifeq (${USE_SSE2}, 1) # Intrinsic implementation @@ -194,6 +213,9 @@ clean: -rm -f crypto/scrypt/generic/obj/*.o -rm -f crypto/scrypt/generic/obj/*.P -rm -f crypto/scrypt/generic/obj/*.d + -rm -f crypto/sha2/asm/obj/*.o + -rm -f crypto/sha2/asm/obj/*.P + -rm -f crypto/sha2/asm/obj/*.d -rm -f obj/build.h FORCE: