Enable BMI1 too when using BMI2 ARCH

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 3b8441a348d4a7d26734c61cd151d93962981b00..1ae8bfac884a7d878257c47f0f353f345b2e2e90 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -131,50 +131,15 @@ ifeq ($(ARCH),armv7)
        bsfq = yes
 endif
 
-ifeq ($(ARCH),osx-ppc-32)
+ifeq ($(ARCH),ppc-32)
        arch = ppc
-       os = osx
 endif
 
-ifeq ($(ARCH),osx-ppc-64)
+ifeq ($(ARCH),ppc-64)
        arch = ppc64
-       os = osx
        bits = 64
 endif
 
-ifeq ($(ARCH),linux-ppc-64)
-       arch = ppc64
-       bits = 64
-endif
-
-ifeq ($(ARCH),osx-x86-64)
-       arch = x86_64
-       os = osx
-       bits = 64
-       prefetch = yes
-       bsfq = yes
-       sse = yes
-endif
-
-ifeq ($(ARCH),osx-x86-64-modern)
-       arch = x86_64
-       os = osx
-       bits = 64
-       prefetch = yes
-       bsfq = yes
-       popcnt = yes
-       sse = yes
-endif
-
-ifeq ($(ARCH),osx-x86-32)
-       arch = i386
-       os = osx
-       prefetch = yes
-       bsfq = no
-       popcnt = no
-       sse = yes
-endif
-
 
 ### ==========================================================================
 ### Section 3. Low-level configuration
@@ -226,7 +191,7 @@ else
        profile_clean = gcc-profile-clean
 endif
 
-ifeq ($(os),osx)
+ifeq ($(UNAME),Darwin)
        CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
        LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6
 endif
@@ -255,7 +220,7 @@ ifeq ($(optimize),yes)
        ifeq ($(comp),gcc)
                CXXFLAGS += -O3
 
-               ifeq ($(os),osx)
+               ifeq ($(UNAME),Darwin)
                        ifeq ($(arch),i386)
                                CXXFLAGS += -mdynamic-no-pic
                        endif
@@ -274,7 +239,7 @@ ifeq ($(optimize),yes)
        endif
 
        ifeq ($(comp),icc)
-               ifeq ($(os),osx)
+               ifeq ($(UNAME),Darwin)
                        CXXFLAGS += -fast -mdynamic-no-pic
                else
                        CXXFLAGS += -fast
@@ -284,8 +249,11 @@ ifeq ($(optimize),yes)
        ifeq ($(comp),clang)
                CXXFLAGS += -O3
 
-               ifeq ($(os),osx)
-                       CXXFLAGS += -flto
+               ifeq ($(UNAME),Darwin)
+                       ifeq ($(pext),no)
+                               CXXFLAGS += -flto
+                               LDFLAGS += $(CXXFLAGS)
+                       endif
                        ifeq ($(arch),i386)
                                CXXFLAGS += -mdynamic-no-pic
                        endif
@@ -325,7 +293,7 @@ endif
 ifeq ($(pext),yes)
        CXXFLAGS += -DUSE_PEXT
        ifeq ($(comp),$(filter $(comp),gcc clang mingw))
-               CXXFLAGS += -mbmi2
+               CXXFLAGS += -mbmi -mbmi2
        endif
 endif
 
@@ -358,9 +326,7 @@ help:
        @echo "Supported targets:"
        @echo ""
        @echo "build                   > Standard build"
-       @echo "signature-build         > Standard build with embedded signature"
        @echo "profile-build           > PGO build"
-       @echo "signature-profile-build > PGO build with embedded signature"
        @echo "strip                   > Strip executable"
        @echo "install                 > Install executable"
        @echo "clean                   > Clean up"
@@ -372,13 +338,9 @@ help:
        @echo "x86-64-bmi2             > x86 64-bit with pext support"
        @echo "x86-32                  > x86 32-bit with SSE support"
        @echo "x86-32-old              > x86 32-bit fall back for old hardware"
-       @echo "linux-ppc-64            > PPC-Linux 64 bit"
-       @echo "osx-ppc-64              > PPC-Mac OS X 64 bit"
-       @echo "osx-ppc-32              > PPC-Mac OS X 32 bit"
-       @echo "osx-x86-64-modern       > x86-Mac OS X 64 bit with popcnt support"
-       @echo "osx-x86-64              > x86-Mac OS X 64 bit"
-       @echo "osx-x86-32              > x86-Mac OS X 32 bit"
-       @echo "armv7                   > ARMv7 32 bit"
+       @echo "ppc-64                  > PPC 64-bit"
+       @echo "ppc-32                  > PPC 32-bit"
+       @echo "armv7                   > ARMv7 32-bit"
        @echo "general-64              > unspecified 64-bit"
        @echo "general-32              > unspecified 32-bit"
        @echo ""
@@ -399,7 +361,7 @@ help:
        @echo "make build ARCH=x86-32    (This is for 32-bit systems)"
        @echo ""
 
-.PHONY: build profile-build embed-signature
+.PHONY: build profile-build
 build:
        $(MAKE) ARCH=$(ARCH) COMP=$(COMP) config-sanity
        $(MAKE) ARCH=$(ARCH) COMP=$(COMP) all
@@ -424,18 +386,6 @@ profile-build:
        @echo "Step 4/4. Deleting profile data ..."
        $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_clean)
 
-embed-signature:
-       @echo "Running benchmark for getting the signature ..."
-       @$(SIGNBENCH) 2>&1 | sed -n 's/Nodes searched  : \(.*\)/\/string Version\/s\/"\\(.*\\)"\/"sig-\1"\//p' > sign.txt
-       @sed -f sign.txt misc.cpp > misc2.cpp
-       @mv misc2.cpp misc.cpp
-       @rm sign.txt
-
-signature-build: build embed-signature
-       $(MAKE) ARCH=$(ARCH) COMP=$(COMP) all
-
-signature-profile-build: build embed-signature profile-build
-
 strip:
        strip $(EXE)
 
@@ -481,7 +431,7 @@ config-sanity:
        @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 "$(os)" = "any" || test "$(os)" = "osx"
+       @test "$(os)" = "any"
        @test "$(bits)" = "32" || test "$(bits)" = "64"
        @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no"
        @test "$(bsfq)" = "yes" || test "$(bsfq)" = "no"