X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=eba72150b614a69de499436d1618bce74cad786b;hp=56d058f92bd6d252a68522b6f5828588dbd5c010;hb=797c960d2004eacbbd19c656f483f070130bb358;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e diff --git a/src/Makefile b/src/Makefile index 56d058f9..eba72150 100644 --- a/src/Makefile +++ b/src/Makefile @@ -47,7 +47,6 @@ OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ # arch = (name) --- (-arch) --- Target architecture # os = (name) --- --- Target operating system # bits = 64/32 --- -DIS_64BIT --- 64-/32-bit operating system -# bigendian = yes/no --- -DBIGENDIAN --- big/little-endian byte order # prefetch = yes/no --- -DUSE_PREFETCH --- Use prefetch x86 asm-instruction # bsfq = yes/no --- -DUSE_BSFQ --- Use bsfq x86_64 asm-instruction (only # with GCC and ICC 64-bit) @@ -68,7 +67,6 @@ ifeq ($(ARCH),general-64) arch = any os = any bits = 64 - bigendian = no prefetch = no bsfq = no popcnt = no @@ -78,27 +76,6 @@ ifeq ($(ARCH),general-32) arch = any os = any bits = 32 - bigendian = no - prefetch = no - bsfq = no - popcnt = no -endif - -ifeq ($(ARCH),bigendian-64) - arch = any - os = any - bits = 64 - bigendian = yes - prefetch = no - bsfq = no - popcnt = no -endif - -ifeq ($(ARCH),bigendian-32) - arch = any - os = any - bits = 32 - bigendian = yes prefetch = no bsfq = no popcnt = no @@ -109,7 +86,6 @@ ifeq ($(ARCH),x86-64) arch = x86_64 os = any bits = 64 - bigendian = no prefetch = yes bsfq = yes popcnt = no @@ -119,7 +95,6 @@ ifeq ($(ARCH),x86-64-modern) arch = x86_64 os = any bits = 64 - bigendian = no prefetch = yes bsfq = yes popcnt = yes @@ -129,7 +104,6 @@ ifeq ($(ARCH),x86-32) arch = i386 os = any bits = 32 - bigendian = no prefetch = yes bsfq = no popcnt = no @@ -139,7 +113,6 @@ ifeq ($(ARCH),x86-32-old) arch = i386 os = any bits = 32 - bigendian = no prefetch = no bsfq = no popcnt = no @@ -150,7 +123,6 @@ ifeq ($(ARCH),osx-ppc-64) arch = ppc64 os = osx bits = 64 - bigendian = yes prefetch = no bsfq = no popcnt = no @@ -160,7 +132,6 @@ ifeq ($(ARCH),osx-ppc-32) arch = ppc os = osx bits = 32 - bigendian = yes prefetch = no bsfq = no popcnt = no @@ -170,7 +141,6 @@ ifeq ($(ARCH),osx-x86-64) arch = x86_64 os = osx bits = 64 - bigendian = no prefetch = yes bsfq = yes popcnt = no @@ -180,7 +150,6 @@ ifeq ($(ARCH),osx-x86-32) arch = i386 os = osx bits = 32 - bigendian = no prefetch = yes bsfq = no popcnt = no @@ -243,7 +212,12 @@ ifeq ($(os),osx) endif ### 3.3 General linker settings -LDFLAGS = -lpthread $(EXTRALDFLAGS) +LDFLAGS = $(EXTRALDFLAGS) + +### On mingw use Windows threads, otherwise POSIX +ifneq ($(comp),mingw) + LDFLAGS += -lpthread +endif ifeq ($(os),osx) LDFLAGS += -arch $(arch) @@ -288,12 +262,7 @@ ifeq ($(bits),64) CXXFLAGS += -DIS_64BIT endif -### 3.7 Endianess -ifeq ($(bigendian),yes) - CXXFLAGS += -DBIGENDIAN -endif - -### 3.8 prefetch +### 3.7 prefetch ifeq ($(prefetch),yes) CXXFLAGS += -msse DEPENDFLAGS += -msse @@ -301,22 +270,22 @@ else CXXFLAGS += -DNO_PREFETCH endif -### 3.9 bsfq +### 3.8 bsfq ifeq ($(bsfq),yes) CXXFLAGS += -DUSE_BSFQ endif -### 3.10 popcnt +### 3.9 popcnt ifeq ($(popcnt),yes) CXXFLAGS += -msse3 -DUSE_POPCNT endif -### 3.11 Link Time Optimization, it works since gcc 4.5 but not on mingw. +### 3.10 Link Time Optimization, it works since gcc 4.5 but not on mingw. ### This is a mix of compile and link time options because the lto link phase ### needs access to the optimization flags. ifeq ($(comp),gcc) - GCC_MAJOR := `gcc -dumpversion | cut -f1 -d.` - GCC_MINOR := `gcc -dumpversion | cut -f2 -d.` + GCC_MAJOR := `$(CXX) -dumpversion | cut -f1 -d.` + GCC_MINOR := `$(CXX) -dumpversion | cut -f2 -d.` ifeq (1,$(shell expr \( $(GCC_MAJOR) \> 4 \) \| \( $(GCC_MAJOR) \= 4 \& $(GCC_MINOR) \>= 5 \))) CXXFLAGS += -flto LDFLAGS += $(CXXFLAGS) @@ -337,7 +306,6 @@ help: @echo "" @echo "build > Build unoptimized version" @echo "profile-build > Build PGO-optimized version" - @echo "double-profile-build > Build PGO-optimized version with and without popcnt support" @echo "strip > Strip executable" @echo "install > Install executable" @echo "clean > Clean up" @@ -347,7 +315,7 @@ help: @echo "" @echo "x86-64 > x86 64-bit" @echo "x86-64-modern > x86 64-bit with runtime support for popcnt instruction" - @echo "x86-32 > x86 32-bit excluding very old hardware without SSE-support" + @echo "x86-32 > x86 32-bit excluding old hardware without SSE-support" @echo "x86-32-old > x86 32-bit including also very old hardware" @echo "osx-ppc-64 > PPC-Mac OS X 64 bit" @echo "osx-ppc-32 > PPC-Mac OS X 32 bit" @@ -355,8 +323,6 @@ help: @echo "osx-x86-32 > x86-Mac OS X 32 bit" @echo "general-64 > unspecified 64-bit" @echo "general-32 > unspecified 32-bit" - @echo "bigendian-64 > unspecified 64-bit with bigendian byte order" - @echo "bigendian-32 > unspecified 32-bit with bigendian byte order" @echo "" @echo "Supported comps:" @echo "" @@ -398,34 +364,6 @@ profile-build: @echo "Step 4/4. Deleting profile data ..." $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_clean) -double-profile-build: - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) config-sanity - @echo "" - @echo "Step 0/6. Preparing for profile build." - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_prepare) - @echo "" - @echo "Step 1/6. Building executable for benchmark (popcnt disabled)..." - @touch *.cpp *.h - $(MAKE) ARCH=x86-64 COMP=$(COMP) $(profile_make) - @echo "" - @echo "Step 2/6. Running benchmark for pgo-build (popcnt disabled)..." - @$(PGOBENCH) > /dev/null - @echo "" - @echo "Step 3/6. Building executable for benchmark (popcnt enabled)..." - @touch *.cpp *.h - $(MAKE) ARCH=x86-64-modern COMP=$(COMP) $(profile_make) - @echo "" - @echo "Step 4/6. Running benchmark for pgo-build (popcnt enabled)..." - @$(PGOBENCH) > /dev/null - @echo "" - @echo "Step 5/6. Building final executable ..." - @touch *.cpp *.h - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_use) - @echo "" - @echo "Step 6/6. Deleting profile data ..." - $(MAKE) ARCH=$(ARCH) COMP=$(COMP) $(profile_clean) - @echo "" - strip: strip $(EXE) @@ -457,7 +395,6 @@ config-sanity: @echo "arch: '$(arch)'" @echo "os: '$(os)'" @echo "bits: '$(bits)'" - @echo "bigendian: '$(bigendian)'" @echo "prefetch: '$(prefetch)'" @echo "bsfq: '$(bsfq)'" @echo "popcnt: '$(popcnt)'" @@ -475,7 +412,6 @@ config-sanity: test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" @test "$(os)" = "any" || test "$(os)" = "osx" @test "$(bits)" = "32" || test "$(bits)" = "64" - @test "$(bigendian)" = "yes" || test "$(bigendian)" = "no" @test "$(prefetch)" = "yes" || test "$(prefetch)" = "no" @test "$(bsfq)" = "yes" || test "$(bsfq)" = "no" @test "$(popcnt)" = "yes" || test "$(popcnt)" = "no" @@ -531,7 +467,7 @@ icc-profile-clean: hpux: $(MAKE) \ - CXX='/opt/aCC/bin/aCC -AA +hpxstd98 -DBIGENDIAN -mt +O3 -DNDEBUG -DNO_PREFETCH' \ + CXX='/opt/aCC/bin/aCC -AA +hpxstd98 -mt +O3 -DNDEBUG -DNO_PREFETCH' \ CXXFLAGS="" \ LDFLAGS="" \ all