sse = no
endif
+ifeq ($(ARCH),linux-ppc-64)
+ arch = ppc64
+ os = any
+ bits = 64
+ prefetch = no
+ bsfq = no
+ popcnt = no
+ sse = no
+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-64)
arch = x86_64
os = osx
endif
ifeq ($(comp),icc)
- CXXFLAGS += -wd383,981,1418,1419,1476,10187,10188,11505,11503 -Wcheck -Wabi -Wdeprecated -strict-ansi
+ CXXFLAGS += -diag-disable 1476,10120 -Wcheck -Wabi -Wdeprecated -strict-ansi
endif
ifeq ($(comp),clang)
endif
ifeq ($(os),osx)
- CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.0
+ CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
endif
### 3.3 General linker settings
### On mingw use Windows threads, otherwise POSIX
ifneq ($(comp),mingw)
- # Haiku has pthreads in its libroot, so only link it in on other platforms
- ifneq ($(UNAME),Haiku)
- LDFLAGS += -lpthread
+ # On Android Bionic's C library comes with its own pthread implementation bundled in
+ ifneq ($(arch),armv7)
+ # Haiku has pthreads in its libroot, so only link it in on other platforms
+ ifneq ($(UNAME),Haiku)
+ LDFLAGS += -lpthread
+ endif
endif
endif
ifeq ($(os),osx)
- LDFLAGS += -arch $(arch) -mmacosx-version-min=10.0
+ LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6
endif
### 3.4 Debugging
endif
ifeq ($(arch),armv7)
- CXXFLAGS += -fno-gcse
+ CXXFLAGS += -fno-gcse -mthumb -march=armv7-a -mfloat-abi=softfp
endif
endif
ifeq ($(os),osx)
CXXFLAGS += -fast -mdynamic-no-pic
else
- CXXFLAGS += -O3
+ CXXFLAGS += -fast
endif
endif
ifeq ($(comp),clang)
- ### -O4 requires a linker that supports LLVM's LTO
- CXXFLAGS += -O3
+ ifeq ($(os),osx)
+ # Clang on OS X supports LTO
+ CXXFLAGS += -O4
+ else
+ CXXFLAGS += -O3
+ endif
ifeq ($(os),osx)
ifeq ($(arch),i386)
@echo "x86-64-modern > x86 64-bit with popcnt 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"