Merge official-stockfish/master

bench: 5113210

diff --cc src/Makefile
index d7c0ab4,81731e6..e401d7d
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -180,12 -165,9 +183,12 @@@ endi
  ifeq ($(COMP),gcc)
        comp=gcc
        CXX=g++
 -      CXXFLAGS += -pedantic -Wextra -Wshadow
 +      CXXFLAGS += -Wextra -Wshadow
 +      ifeq ($(largeboards),no)
 +              CXXFLAGS += -pedantic
 +      endif
  
-       ifeq ($(ARCH),armv7)
+       ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
                ifeq ($(OS),Android)
                        CXXFLAGS += -m$(bits)
                        LDFLAGS += -m$(bits)

diff --cc src/evaluate.cpp
index 6d01a5a,8b4a27b..c133569
--- 1/src/evaluate.cpp
--- 2/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@@ -436,8 -372,12 +437,12 @@@ namespace 
          {
              // Penalty if any relative pin or discovered attack against the queen
              Bitboard queenPinners;
 -            if (pos.slider_blockers(pos.pieces(Them, ROOK, BISHOP), s, queenPinners))
 +            if (pos.slider_blockers(pos.pieces(Them, ROOK, BISHOP), s, queenPinners, Them))
                  score -= WeakQueen;
+ 
+             // Bonus for queen on weak square in enemy camp
+             if (relative_rank(Us, s) > RANK_4 && (~pe->pawn_attacks_span(Them) & s))
+                 score += QueenInfiltration;    
          }
      }
      if (T)

diff --cc src/search.cpp
Simple merge

diff --cc src/timeman.cpp
index 4998a4b,a61c36d..936f44a
--- 1/src/timeman.cpp
--- 2/src/timeman.cpp
+++ b/src/timeman.cpp
@@@ -34,9 -33,8 +34,8 @@@ TimeManagement Time; // Our global tim
  //      1) x basetime (+z increment)
  //      2) x moves in y seconds (+z increment)
  
 -void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) {
 +void TimeManagement::init(const Position& pos, Search::LimitsType& limits, Color us, int ply) {
  
-   TimePoint minThinkingTime = TimePoint(Options["Minimum Thinking Time"]);
    TimePoint moveOverhead    = TimePoint(Options["Move Overhead"]);
    TimePoint slowMover       = TimePoint(Options["Slow Mover"]);
    TimePoint npmsec          = TimePoint(Options["nodestime"]);

diff --cc src/ucioption.cpp
index e0e3c70,871edb2..2e52ed4
--- 1/src/ucioption.cpp
--- 2/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@@ -147,9 -66,8 +147,8 @@@ void init(OptionsMap& o) 
    o["Clear Hash"]            << Option(on_clear_hash);
    o["Ponder"]                << Option(false);
    o["MultiPV"]               << Option(1, 1, 500);
 -  o["Skill Level"]           << Option(20, 0, 20);
 +  o["Skill Level"]           << Option(20, -20, 20);
    o["Move Overhead"]         << Option(10, 0, 5000);
-   o["Minimum Thinking Time"] << Option( 0, 0, 5000);
    o["Slow Mover"]            << Option(100, 10, 1000);
    o["nodestime"]             << Option(0, 0, 10000);
    o["UCI_Chess960"]          << Option(false);