Makefile: support lto on mingw, default to 64bits

Clean and organize uppercase and spaces

fixes https://github.com/official-stockfish/Stockfish/issues/2731

closes  https://github.com/official-stockfish/Stockfish/pull/2763

No functional change

diff --git a/AUTHORS b/AUTHORS
index 1cd7ff54b0f6c9ea380dd3c7bf3d2eedf2a3ce71..f08d71d301e0fc824f7b2725c88f0ef97f4240b7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -155,6 +155,7 @@ Tom Vijlbrief (tomtor)
 Tomasz Sobczyk (Sopel97)
 Torsten Franz (torfranz, tfranzer)
 Tracey Emery (basepr1me)
 Tomasz Sobczyk (Sopel97)
 Torsten Franz (torfranz, tfranzer)
 Tracey Emery (basepr1me)

+Unai Corzo (unaiic)

 Uri Blass (uriblass)
 Vince Negri (cuddlestmonkey)
 
 Uri Blass (uriblass)
 Vince Negri (cuddlestmonkey)
 

diff --git a/src/Makefile b/src/Makefile
index 83e0bb14651bc6288e2af8cb27b63cd57016ef12..81731e6675c0134d21a994da1c5c048adbd4db8b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -54,7 +54,7 @@ endif
 ### Section 2. High-level Configuration
 ### ==========================================================================
 #
 ### Section 2. High-level Configuration
 ### ==========================================================================
 #

-# flag                --- Comp switch --- Description
+# flag                --- Comp switch      --- Description

 # ----------------------------------------------------------------------------
 #
 # debug = yes/no      --- -DNDEBUG         --- Enable/Disable debug mode
 # ----------------------------------------------------------------------------
 #
 # debug = yes/no      --- -DNDEBUG         --- Enable/Disable debug mode


@@ -77,43 +77,42 @@ endif
 optimize = yes
 debug = no
 sanitize = no
 optimize = yes
 debug = no
 sanitize = no

-bits = 32
+bits = 64

 prefetch = no
 popcnt = no
 sse = no
 pext = no
 
 ### 2.2 Architecture specific
 prefetch = no
 popcnt = no
 sse = no
 pext = no
 
 ### 2.2 Architecture specific

-

 ifeq ($(ARCH),general-32)
        arch = any
 ifeq ($(ARCH),general-32)
        arch = any

+       bits = 32

 endif
 
 ifeq ($(ARCH),x86-32-old)
        arch = i386
 endif
 
 ifeq ($(ARCH),x86-32-old)
        arch = i386

+       bits = 32

 endif
 
 ifeq ($(ARCH),x86-32)
        arch = i386
 endif
 
 ifeq ($(ARCH),x86-32)
        arch = i386

+       bits = 32

        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),general-64)
        arch = any
        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),general-64)
        arch = any

-       bits = 64

 endif
 
 ifeq ($(ARCH),x86-64)
        arch = x86_64
 endif
 
 ifeq ($(ARCH),x86-64)
        arch = x86_64

-       bits = 64

        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),x86-64-modern)
        arch = x86_64
        prefetch = yes
        sse = yes
 endif
 
 ifeq ($(ARCH),x86-64-modern)
        arch = x86_64

-       bits = 64

        prefetch = yes
        popcnt = yes
        sse = yes
        prefetch = yes
        popcnt = yes
        sse = yes


@@ -121,7 +120,6 @@ endif
 
 ifeq ($(ARCH),x86-64-bmi2)
        arch = x86_64
 
 ifeq ($(ARCH),x86-64-bmi2)
        arch = x86_64

-       bits = 64

        prefetch = yes
        popcnt = yes
        sse = yes
        prefetch = yes
        popcnt = yes
        sse = yes


@@ -131,6 +129,7 @@ endif
 ifeq ($(ARCH),armv7)
        arch = armv7
        prefetch = yes
 ifeq ($(ARCH),armv7)
        arch = armv7
        prefetch = yes

+       bits = 32

 endif
 
 ifeq ($(ARCH),armv8)
 endif
 
 ifeq ($(ARCH),armv8)


@@ -141,22 +140,20 @@ endif
 
 ifeq ($(ARCH),ppc-32)
        arch = ppc
 
 ifeq ($(ARCH),ppc-32)
        arch = ppc

+       bits = 32

 endif
 
 ifeq ($(ARCH),ppc-64)
        arch = ppc64
 endif
 
 ifeq ($(ARCH),ppc-64)
        arch = ppc64

-       bits = 64

        popcnt = yes
        prefetch = yes
 endif
 
        popcnt = yes
        prefetch = yes
 endif
 

-

 ### ==========================================================================
 ### ==========================================================================

-### Section 3. Low-level configuration
+### Section 3. Low-level Configuration

 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)
 ### ==========================================================================
 
 ### 3.1 Selecting compiler (default = gcc)

-

 CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -std=c++11 $(EXTRACXXFLAGS)
 DEPENDFLAGS += -std=c++11
 LDFLAGS += $(EXTRALDFLAGS)
 CXXFLAGS += -Wall -Wcast-qual -fno-exceptions -std=c++11 $(EXTRACXXFLAGS)
 DEPENDFLAGS += -std=c++11
 LDFLAGS += $(EXTRALDFLAGS)


@@ -347,17 +344,10 @@ endif
 ### needs access to the optimization flags.
 ifeq ($(optimize),yes)
 ifeq ($(debug), no)
 ### 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
                CXXFLAGS += -flto
                LDFLAGS += $(CXXFLAGS)
        endif

-       endif

 endif
 endif
 
 endif
 endif
 


@@ -368,9 +358,8 @@ ifeq ($(OS), Android)
        LDFLAGS += -fPIE -pie
 endif
 
        LDFLAGS += -fPIE -pie
 endif
 

-

 ### ==========================================================================
 ### ==========================================================================

-### Section 4. Public targets
+### Section 4. Public Targets

 ### ==========================================================================
 
 help:
 ### ==========================================================================
 
 help:


@@ -468,7 +457,7 @@ default:
        help
 
 ### ==========================================================================
        help
 
 ### ==========================================================================

-### Section 5. Private targets
+### Section 5. Private Targets

 ### ==========================================================================
 
 all: $(EXE) .depend
 ### ==========================================================================
 
 all: $(EXE) .depend


@@ -551,4 +540,3 @@ icc-profile-use:
        -@$(CXX) $(DEPENDFLAGS) -MM $(SRCS) > $@ 2> /dev/null
 
 -include .depend
        -@$(CXX) $(DEPENDFLAGS) -MM $(SRCS) > $@ 2> /dev/null
 
 -include .depend

-