From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 11 Sep 2020 17:49:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into HEAD
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=2c097c81268e083f472bccfb47ecf56db3e3853e

Merge remote-tracking branch 'upstream/master' into HEAD
---

2c097c81268e083f472bccfb47ecf56db3e3853e
diff --cc src/Makefile
index 59179812,340b3008..48180660
--- a/src/Makefile
+++ b/src/Makefile
@@@ -270,9 -307,9 +310,9 @@@ endi
  ifeq ($(COMP),gcc)
  	comp=gcc
  	CXX=g++
 -	CXXFLAGS += -pedantic -Wextra -Wshadow
 +	CXXFLAGS += -pedantic -Wextra
  
- 	ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
+ 	ifeq ($(arch),$(filter $(arch),armv7 armv8))
  		ifeq ($(OS),Android)
  			CXXFLAGS += -m$(bits)
  			LDFLAGS += -m$(bits)
diff --cc src/ucioption.cpp
index 79a2385a,5e747a7f..df6283cb
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -87,9 -79,8 +88,9 @@@ void init(OptionsMap& o) 
    o["SyzygyProbeDepth"]      << Option(1, 1, 100);
    o["Syzygy50MoveRule"]      << Option(true);
    o["SyzygyProbeLimit"]      << Option(7, 0, 7);
-   o["Use NNUE"]              << Option(false, on_use_NNUE);
-   o["EvalFile"]              << Option("nn-9931db908a9b.nnue", on_eval_file);
+   o["Use NNUE"]              << Option(true, on_use_NNUE);
+   o["EvalFile"]              << Option(EvalFileDefaultName, on_eval_file);
 +  o["RPCServerAddress"]      << Option("<empty>", on_rpc_server_address);
  }