# bsfq = yes/no --- -DUSE_BSFQ --- Use bsfq x86_64 asm-instruction (only
# with GCC and ICC 64-bit)
# popcnt = yes/no --- -DUSE_POPCNT --- Use popcnt x86_64 asm-instruction
+# sse = yes/no --- -msse --- Use Intel Streaming SIMD Extensions
#
# Note that Makefile is space sensitive, so when adding new architectures
# or modifying existing flags, you have to make sure there are no extra spaces
prefetch = no
bsfq = no
popcnt = no
+ sse = no
endif
ifeq ($(ARCH),general-32)
prefetch = no
bsfq = no
popcnt = no
+ sse = no
endif
# x86-section
prefetch = yes
bsfq = yes
popcnt = no
+ sse = yes
endif
ifeq ($(ARCH),x86-64-modern)
prefetch = yes
bsfq = yes
popcnt = yes
+ sse = yes
endif
ifeq ($(ARCH),x86-32)
prefetch = yes
bsfq = no
popcnt = no
+ sse = yes
endif
ifeq ($(ARCH),x86-32-old)
prefetch = no
bsfq = no
popcnt = no
+ sse = no
endif
#arm section
-ifeq ($(ARCH),arm-32)
- arch = arm-32
+ifeq ($(ARCH),armv7)
+ arch = armv7
os = any
bits = 32
prefetch = yes
- bsfq = no
+ bsfq = yes
popcnt = no
+ sse = no
endif
# osx-section
prefetch = no
bsfq = no
popcnt = no
+ sse = no
endif
ifeq ($(ARCH),osx-ppc-32)
prefetch = no
bsfq = no
popcnt = no
+ sse = no
endif
ifeq ($(ARCH),osx-x86-64)
prefetch = yes
bsfq = yes
popcnt = no
+ sse = yes
endif
ifeq ($(ARCH),osx-x86-32)
prefetch = yes
bsfq = no
popcnt = no
+ sse = yes
endif
endif
ifeq ($(comp),icc)
- CXXFLAGS += -wd383,981,1418,1419,10187,10188,11505,11503 -Wcheck -Wabi -Wdeprecated -strict-ansi
+ CXXFLAGS += -wd383,981,1418,1419,1476,10187,10188,11505,11503 -Wcheck -Wabi -Wdeprecated -strict-ansi
endif
ifeq ($(comp),clang)
endif
ifeq ($(os),osx)
- CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.6
+ CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.0
endif
### 3.3 General linker settings
endif
ifeq ($(os),osx)
- LDFLAGS += -arch $(arch) -mmacosx-version-min=10.6
+ LDFLAGS += -arch $(arch) -mmacosx-version-min=10.0
endif
### 3.4 Debugging
endif
endif
- ifeq ($(arch),arm-32)
+ ifeq ($(arch),armv7)
CXXFLAGS += -fno-gcse
endif
endif
### 3.7 prefetch
ifeq ($(prefetch),yes)
- ifneq ($(arch),arm-32)
+ ifeq ($(sse),yes)
CXXFLAGS += -msse
DEPENDFLAGS += -msse
endif
@echo "osx-ppc-32 > PPC-Mac OS X 32 bit"
@echo "osx-x86-64 > x86-Mac OS X 64 bit"
@echo "osx-x86-32 > x86-Mac OS X 32 bit"
- @echo "arm-32 > ARM 32 bit"
+ @echo "armv7 > ARMv7 32 bit"
@echo "general-64 > unspecified 64-bit"
@echo "general-32 > unspecified 32-bit"
@echo ""
@echo "prefetch: '$(prefetch)'"
@echo "bsfq: '$(bsfq)'"
@echo "popcnt: '$(popcnt)'"
+ @echo "sse: '$(sse)'"
@echo ""
@echo "Flags:"
@echo "CXX: $(CXX)"
@test "$(debug)" = "yes" || test "$(debug)" = "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)" = "arm-32"
+ test "$(arch)" = "ppc64" || test "$(arch)" = "ppc" || test "$(arch)" = "armv7"
@test "$(os)" = "any" || test "$(os)" = "osx"
@test "$(bits)" = "32" || test "$(bits)" = "64"
@test "$(prefetch)" = "yes" || test "$(prefetch)" = "no"
@test "$(bsfq)" = "yes" || test "$(bsfq)" = "no"
@test "$(popcnt)" = "yes" || test "$(popcnt)" = "no"
+ @test "$(sse)" = "yes" || test "$(sse)" = "no"
@test "$(comp)" = "gcc" || test "$(comp)" = "icc" || test "$(comp)" = "mingw" || test "$(comp)" = "clang"
$(EXE): $(OBJS)