Makefile: support lto on mingw, default to 64bits

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 41c2aff6b645ace4420d544564ba10b1c61a7cd8..81731e6675c0134d21a994da1c5c048adbd4db8b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,7 +54,7 @@ endif
 ### Section 2. High-level Configuration
 ### ==========================================================================
 #
-# flag                --- Comp switch --- Description
+# flag                --- Comp switch      --- Description
 # ----------------------------------------------------------------------------
 #
 # debug = yes/no      --- -DNDEBUG         --- Enable/Disable debug mode
@@ -77,43 +77,42 @@ endif
 optimize = yes
 debug = no
 sanitize = no
-bits = 32
+bits = 64
 prefetch = no
 popcnt = no
 sse = no
 pext = no
 
 ### 2.2 Architecture specific
-
 ifeq ($(ARCH),general-32)
        arch = any
+       bits = 32
 endif
 
 ifeq ($(ARCH),x86-32-old)
        arch = i386
+       bits = 32
 endif
 
 ifeq ($(ARCH),x86-32)
        arch = i386
+       bits = 32
        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),general-64)
        arch = any
-       bits = 64
 endif
 
 ifeq ($(ARCH),x86-64)
        arch = x86_64
-       bits = 64
        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),x86-64-modern)
        arch = x86_64
-       bits = 64
        prefetch = yes
        popcnt = yes
        sse = yes
@@ -121,7 +120,6 @@ endif
 
 ifeq ($(ARCH),x86-64-bmi2)
        arch = x86_64
-       bits = 64
        prefetch = yes
        popcnt = yes
        sse = yes
@@ -131,26 +129,31 @@ endif
 ifeq ($(ARCH),armv7)
        arch = armv7
        prefetch = yes
+       bits = 32
+endif
+
+ifeq ($(ARCH),armv8)
+       arch = armv8-a
+       bits = 64
+       prefetch = yes
 endif
 
 ifeq ($(ARCH),ppc-32)
        arch = ppc
+       bits = 32
 endif
 
 ifeq ($(ARCH),ppc-64)
        arch = ppc64
-       bits = 64
        popcnt = yes
        prefetch = yes
 endif
 
-
 ### ==========================================================================
-### Section 3. Low-level configuration
+### Section 3. Low-level Configuration
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)
-
 CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -std=c++11 $(EXTRACXXFLAGS)
 DEPENDFLAGS += -std=c++11
 LDFLAGS += $(EXTRALDFLAGS)
@@ -164,7 +167,7 @@ ifeq ($(COMP),gcc)
        CXX=g++
        CXXFLAGS += -pedantic -Wextra -Wshadow
 
-       ifeq ($(ARCH),armv7)
+       ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
                ifeq ($(OS),Android)
                        CXXFLAGS += -m$(bits)
                        LDFLAGS += -m$(bits)
@@ -221,7 +224,7 @@ ifeq ($(COMP),clang)
        endif
        endif
 
-       ifeq ($(ARCH),armv7)
+       ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
                ifeq ($(OS),Android)
                        CXXFLAGS += -m$(bits)
                        LDFLAGS += -m$(bits)
@@ -341,17 +344,10 @@ endif
 ### needs access to the optimization flags.
 ifeq ($(optimize),yes)
 ifeq ($(debug), no)
-       ifeq ($(comp),$(filter $(comp),gcc clang))
-               CXXFLAGS += -flto
-               LDFLAGS += $(CXXFLAGS)
-       endif
-
-       ifeq ($(comp),mingw)
-       ifeq ($(KERNEL),Linux)
+       ifeq ($(comp),$(filter $(comp),gcc clang mingw))
                CXXFLAGS += -flto
                LDFLAGS += $(CXXFLAGS)
        endif
-       endif
 endif
 endif
 
@@ -362,9 +358,8 @@ ifeq ($(OS), Android)
        LDFLAGS += -fPIE -pie
 endif
 
-
 ### ==========================================================================
-### Section 4. Public targets
+### Section 4. Public Targets
 ### ==========================================================================
 
 help:
@@ -391,6 +386,7 @@ help:
        @echo "ppc-64                  > PPC 64-bit"
        @echo "ppc-32                  > PPC 32-bit"
        @echo "armv7                   > ARMv7 32-bit"
+       @echo "armv8                   > ARMv8 64-bit"
        @echo "general-64              > unspecified 64-bit"
        @echo "general-32              > unspecified 32-bit"
        @echo ""
@@ -461,7 +457,7 @@ default:
        help
 
 ### ==========================================================================
-### Section 5. Private targets
+### Section 5. Private Targets
 ### ==========================================================================
 
 all: $(EXE) .depend
@@ -492,7 +488,8 @@ config-sanity:
        @test "$(sanitize)" = "undefined" || test "$(sanitize)" = "thread" || test "$(sanitize)" = "address" || test "$(sanitize)" = "no"
        @test "$(optimize)" = "yes" || test "$(optimize)" = "no"
        @test "$(arch)" = "any" || test "$(arch)" = "x86_64" || test "$(arch)" = "i386" || \
-        test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7"
+        test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || \
+        test "$(arch)" = "armv7" || test "$(arch)" = "armv8-a"
        @test "$(bits)" = "32" || test "$(bits)" = "64"
        @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no"
        @test "$(popcnt)" = "yes" || test "$(popcnt)" = "no"
@@ -543,4 +540,3 @@ icc-profile-use:
        -@$(CXX) $(DEPENDFLAGS) -MM $(SRCS) > $@ 2> /dev/null
 
 -include .depend
-