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

diff --cc src/Makefile
index 591798129b855fc24ed4a94b8d698d3da1622729,340b3008381be752d1d9edf1cd3020bffd323961..4818066015a3e598bbe853ff3ea125a3011df224
--- 1/src/Makefile
--- 2/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/main.cpp
Simple merge

diff --cc src/misc.cpp
Simple merge

diff --cc src/position.cpp
Simple merge

diff --cc src/syzygy/tbprobe.cpp
Simple merge

diff --cc src/ucioption.cpp
index 79a2385a1319b15c62824b2ca6175e1801f73676,5e747a7f13fdda58c953209c19c1b9be7470e8eb..df6283cbc00dfadb75ddccf0912c9161342705f7
--- 1/src/ucioption.cpp
--- 2/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);
  }