add algo equihash

.gitignore

@@ -1,7 +1,9 @@
-
-minerd
-minerd.exe
+minerd*
+cpuminer
+*.exe
 *.o
+*.d
+gmon.out
 
 autom4te.cache
 .deps
@@ -29,3 +31,21 @@ mingw32-config.cache
 */.dirstamp
 
 *.iml
+
+*.vcxproj.user
+*.opensdf
+*.sdf
+*.suo
+Release/
+Debug/
+x64/Release/
+x64/Debug/
+*.pdb/
+
+installer/
+res/cpuminer.aps
+res/RC*
+sign/
+sign.sh
+
+compat/curl-for-windows/

.travis.yml

@@ -3,9 +3,14 @@ language: c
 compiler:
   - gcc
 
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install libcurl4-openssl-dev
+
 before_script:
   - ./autogen.sh
 
 script:
-  - ./configure
-  - make
+  - ./configure --with-crypto --with-curl
+  - make
+  - ./cpuminer --cputest

AUTHORS

@@ -13,3 +13,5 @@ Neisklar
 prettyhatemachine
 
 LucasJones
+
+tpruvot@github

Android.mk

@@ -0,0 +1,77 @@
+################################################################
+# Sample Android repo Makefile, used to test arm on the Tegra K1
+################################################################
+
+cpuminer-src := $(call my-dir)
+
+LOCAL_PATH := $(cpuminer-src)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE=cpuminer-jansson
+LOCAL_MODULE_TAGS=optional
+
+define all-c-files-under
+$(patsubst ./%,%, \
+  $(shell cd $(LOCAL_PATH) ; \
+          find -L $(1) -name "*.c" -and -not -name ".*") \
+ )
+endef
+
+LOCAL_SRC_FILES := $(call all-c-files-under,compat/jansson)
+LOCAL_C_INCLUDES := $(cpuminer-src)/compat/jansson
+
+include $(BUILD_STATIC_LIBRARY)
+
+################################################################
+
+
+LOCAL_PATH := $(cpuminer-src)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE=cpuminer
+LOCAL_MODULE_TAGS=optional
+LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
+LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
+LOCAL_MODULE_STEM := $(LOCAL_MODULE)
+
+LOCAL_C_INCLUDES := $(cpuminer-src)/compat/bionic \
+  $(cpuminer-src)/compat/jansson \
+  $(TARGET_OUT_INTERMEDIATES)/include/libcurl \
+  external/openssl/include \
+
+LOCAL_CFLAGS := -std=c99 -Wno-pointer-sign -Wno-missing-field-initializers \
+  -Wno-unused-parameter #-DNOASM
+LOCAL_CFLAGS += -DVERSION=\"1.3\"
+
+sph_files:=$(call all-c-files-under,sha3)
+
+LOCAL_SRC_FILES=\
+  cpu-miner.c util.c \
+  api.c sysinfos.c \
+  $(call all-c-files-under,algo) \
+  $(filter-out sha3/md_helper.c,$(sph_files)) \
+  $(call all-c-files-under,crypto) \
+  $(call all-c-files-under,lyra2) \
+  asm/sha2-$(TARGET_ARCH).S \
+  asm/scrypt-$(TARGET_ARCH).S \
+  asm/neoscrypt_asm.S
+
+LOCAL_STATIC_LIBRARIES := libm cpuminer-jansson
+LOCAL_STATIC_LIBRARIES += libz libcrypto_static
+LOCAL_STATIC_LIBRARIES += libssl_static
+
+# Require curl config changes and an addional
+# module definition in external/curl(_static?)
+#LOCAL_FORCE_STATIC_EXECUTABLE := true
+
+ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
+LOCAL_CFLAGS += -DCURL_STATICLIB # -DHTTP_ONLY
+LOCAL_STATIC_LIBRARIES += libcurl_static libc
+else
+LOCAL_SHARED_LIBRARIES := libssl libcrypto
+LOCAL_SHARED_LIBRARIES += libcurl
+#LOCAL_STATIC_LIBRARIES += libcurl_static
+endif
+
+include $(BUILD_EXECUTABLE)
+

Dockerfile

@@ -1,25 +1,16 @@
-#
-# Dockerfile for cpuminer
-# usage: docker run creack/cpuminer --url xxxx --user xxxx --pass xxxx
-# ex: docker run creack/cpuminer --url stratum+tcp://ltc.pool.com:80 --user creack.worker1 --pass abcdef
-#
-#
+# Usage: docker build .
+# Usage: docker run tpruvot/cpuminer-multi -a xevan --url=stratum+tcp://yiimp.ccminer.org:3739 --user=iGadPnKrdpW3pcdVC3aA77Ku4anrzJyaLG --pass=x
 
-FROM		ubuntu:12.10
-MAINTAINER	Guillaume J. Charmes <[email protected]>
+FROM		ubuntu:14.04
+MAINTAINER	Tanguy Pruvot <[email protected]>
 
 RUN		apt-get update -qq
 
-RUN		apt-get install -qqy automake
-RUN		apt-get install -qqy libcurl4-openssl-dev
-RUN		apt-get install -qqy git
-RUN		apt-get install -qqy make
+RUN		apt-get install -qy automake autoconf pkg-config libcurl4-openssl-dev libssl-dev libjansson-dev libgmp-dev make g++ git
 
-RUN		git clone https://github.com/pooler/cpuminer
+RUN		git clone https://github.com/tpruvot/cpuminer-multi -b linux
 
-RUN		cd cpuminer && ./autogen.sh
-RUN		cd cpuminer && ./configure CFLAGS="-O3"
-RUN		cd cpuminer && make
+RUN		cd cpuminer-multi && ./build.sh
 
-WORKDIR		/cpuminer
-ENTRYPOINT	["./minerd"]
+WORKDIR		/cpuminer-multi
+ENTRYPOINT	["./cpuminer"]

Makefile.am

@@ -9,72 +9,145 @@ EXTRA_DIST	= example-cfg.json nomacro.pl
 
 SUBDIRS		= compat
 
-INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
-
-bin_PROGRAMS	= minerd
-
-dist_man_MANS	= minerd.1
-
-minerd_SOURCES	= elist.h \
-		  miner.h \
-		  compat.h \
-		  cpu-miner.c \
-		  util.c \
-		  sha2.c \
-		  scrypt.c \
-		  keccak.c \
-		  heavy.c \
-		  quark.c \
-		  skein.c \
-		  ink.c \
-		  blake.c \
-		  cryptonight.c \
-		  fresh.c \
-		  x11.c \
-		  x13.c \
-		  x14.c \
-		  x15.c \
-		  sha3/sph_keccak.c \
-		  sha3/sph_hefty1.c \
-		  sha3/sph_groestl.c \
-		  sha3/sph_skein.c \
-		  sha3/sph_bmw.c \
-		  sha3/sph_jh.c \
-		  sha3/sph_shavite.c \
-		  sha3/sph_blake.c \
-		  sha3/sph_luffa.c \
-		  sha3/sph_cubehash.c \
-		  sha3/sph_simd.c \
-		  sha3/sph_echo.c \
-		  sha3/sph_hamsi.c \
-		  sha3/sph_fugue.c \
-		  sha3/sph_shabal.c \
-		  sha3/sph_whirlpool.c \
-		  crypto/oaes_lib.c \
-		  crypto/c_keccak.c \
-		  crypto/c_groestl.c \
-		  crypto/c_blake256.c \
-		  crypto/c_jh.c \
-		  crypto/c_skein.c \
-		  crypto/hash.c \
-		  crypto/aesb.c
+ALL_INCLUDES	= @PTHREAD_FLAGS@ -fno-strict-aliasing $(JANSSON_INCLUDES) -I.
+
+bin_PROGRAMS	= cpuminer
+
+dist_man_MANS	= cpuminer.1
+
+cpuminer_SOURCES = \
+  cpu-miner.c util.c \
+  api.c sysinfos.c \
+  uint256.cpp \
+  sha3/sph_keccak.c \
+  sha3/sph_hefty1.c \
+  sha3/sph_groestl.c \
+  sha3/sph_skein.c \
+  sha3/sph_bmw.c \
+  sha3/sph_jh.c \
+  sha3/sph_shavite.c \
+  sha3/sph_blake.c \
+  sha3/mod_blakecoin.c \
+  sha3/sph_luffa.c \
+  sha3/sph_cubehash.c \
+  sha3/sph_simd.c \
+  sha3/sph_echo.c \
+  sha3/sph_hamsi.c \
+  sha3/sph_haval.c \
+  sha3/sph_fugue.c \
+  sha3/sph_ripemd.c \
+  sha3/sph_sha2.c \
+  sha3/sph_sha2big.c \
+  sha3/sph_shabal.c \
+  sha3/sph_whirlpool.c \
+  sha3/gost_streebog.c \
+  crypto/blake2s.c \
+  crypto/blake2b.c \
+  crypto/oaes_lib.c \
+  crypto/c_keccak.c \
+  crypto/c_groestl.c \
+  crypto/c_blake256.c \
+  crypto/c_jh.c \
+  crypto/c_skein.c \
+  crypto/hash.c \
+  crypto/aesb.c \
+  lyra2/Lyra2.c lyra2/Sponge.c \
+  yescrypt/yescrypt-common.c yescrypt/yescrypt-best.c \
+  yescrypt/sha256_Y.c \
+  algo/axiom.c \
+  algo/bastion.c \
+  algo/blake.c \
+  algo/blakecoin.c \
+  algo/blake2.c \
+  algo/bmw256.c \
+  algo/c11.c \
+  algo/cryptonight.c \
+  algo/cryptolight.c \
+  algo/decred.c \
+  algo/drop.c \
+  algo/fresh.c \
+  algo/groestl.c \
+  algo/heavy.c \
+  algo/ink.c \
+  algo/jha.c \
+  algo/lbry.c \
+  algo/luffa.c \
+  algo/lyra2re.c \
+  algo/lyra2rev2.c \
+  algo/myr-groestl.c \
+  algo/keccak.c \
+  algo/pentablake.c \
+  algo/quark.c \
+  algo/neoscrypt.c \
+  algo/nist5.c \
+  algo/pluck.c \
+  algo/qubit.c \
+  algo/scrypt.c \
+  algo/scrypt-jane.c \
+  algo/sha2.c \
+  algo/sia.c \
+  algo/sibcoin.c \
+  algo/skein.c \
+  algo/skein2.c \
+  algo/s3.c \
+  algo/bitcore.c \
+  algo/timetravel.c \
+  algo/tribus.c \
+  algo/veltor.c \
+  algo/x11evo.c \
+  algo/x11.c \
+  algo/x13.c \
+  algo/x14.c \
+  algo/x15.c \
+  algo/x17.c \
+  algo/xevan.c \
+  algo/yescrypt.c \
+  algo/zr5.c
+
+disable_flags =
+
 if USE_ASM
+   cpuminer_SOURCES += asm/neoscrypt_asm.S
 if ARCH_x86
-minerd_SOURCES += sha2-x86.S scrypt-x86.S aesb-x86.S crypto/aesb-x86-impl.c
+   cpuminer_SOURCES += asm/sha2-x86.S asm/scrypt-x86.S asm/aesb-x86.S
 endif
 if ARCH_x86_64
-minerd_SOURCES += sha2-x64.S scrypt-x64.S aesb-x64.S
+   cpuminer_SOURCES += asm/sha2-x64.S asm/scrypt-x64.S asm/aesb-x64.S
 endif
 if ARCH_ARM
-minerd_SOURCES += sha2-arm.S scrypt-arm.S
+   cpuminer_SOURCES += asm/sha2-arm.S asm/scrypt-arm.S
+endif
+else
+   disable_flags += -DNOASM
 endif
+
+if HAVE_WINDOWS
+   cpuminer_SOURCES += compat/winansi.c
 endif
 
-minerd_LDFLAGS	= $(PTHREAD_FLAGS)
-minerd_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
-minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@
-minerd_CFLAGS   = -Ofast -flto -fuse-linker-plugin
+cpuminer_LDFLAGS	= @LDFLAGS@
+cpuminer_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
+cpuminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(ALL_INCLUDES)
+cpuminer_CFLAGS   = -Wno-pointer-sign -Wno-pointer-to-int-cast $(disable_flags)
+
+if HAVE_WINDOWS
+cpuminer_CFLAGS += -Wl,--stack,10485760
+cpuminer_LDADD += -lcrypt32 -lgdi32 -lgcc -lgcc_eh
+endif
 
 if HAVE_WINDOWS
-minerd_CFLAGS += -Wl,--stack,10485760
+# use to profile an object
+# gprof_cflags = -pg -g3
+# cpuminer_LDFLAGS += -pg
+# cpuminer_CFLAGS += -fno-inline-functions -static
+
+# copy/paste from generated Makefile
+common_ccflags = $(DEFS) $(ALL_INCLUDES) $(cpuminer_CPPFLAGS) $(CPPFLAGS) $(cpuminer_CFLAGS) $(CFLAGS)
+
+# special CFLAGS (if you find a simpler way to do that tell me ;)
+cpuminer-neoscrypt.o: neoscrypt.c
+	@echo "CUSTOM ${@}: ${filter %.o,${^}} ${filter %.c,${^}}"
+	$(CC) $(common_ccflags) -g -O3 $(gprof_cflags) -MT $@ -MD -MP -c -o $@ $<
+
+
 endif