Merge branch 'master' into clusterMergeMaster6

This commit is contained in:
Joost VandeVondele
2019-07-11 15:26:46 +02:00
8 changed files with 51 additions and 40 deletions
+5 -1
View File
@@ -138,6 +138,8 @@ endif
ifeq ($(ARCH),ppc-64)
arch = ppc64
bits = 64
popcnt = yes
prefetch = yes
endif
@@ -315,7 +317,9 @@ endif
### 3.6 popcnt
ifeq ($(popcnt),yes)
ifeq ($(comp),icc)
ifeq ($(arch),ppc64)
CXXFLAGS += -DUSE_POPCNT
else ifeq ($(comp),icc)
CXXFLAGS += -msse3 -DUSE_POPCNT
else
CXXFLAGS += -msse3 -mpopcnt -DUSE_POPCNT