|
 |
170ebb |
diff --git a/Makefile.system b/Makefile.system
|
|
|
170ebb |
index c947a19..cbf419a 100644
|
|
|
170ebb |
--- a/Makefile.system
|
|
|
170ebb |
+++ b/Makefile.system
|
|
|
170ebb |
@@ -282,9 +282,11 @@ endif
|
|
|
170ebb |
ifeq ($(C_COMPILER), GCC)
|
|
|
170ebb |
GCCVERSIONGTEQ4 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 4)
|
|
|
170ebb |
GCCVERSIONGT4 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \> 4)
|
|
|
170ebb |
+GCCVERSIONEQ5 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` = 5)
|
|
|
170ebb |
GCCVERSIONGT5 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \> 5)
|
|
|
170ebb |
GCCVERSIONGTEQ7 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 7)
|
|
|
170ebb |
GCCVERSIONGTEQ9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9)
|
|
|
170ebb |
+GCCMINORVERSIONGTEQ2 := $(shell expr `$(CC) -dumpversion | cut -f2 -d.` \>= 2)
|
|
|
170ebb |
GCCMINORVERSIONGTEQ7 := $(shell expr `$(CC) -dumpversion | cut -f2 -d.` \>= 7)
|
|
|
170ebb |
endif
|
|
|
170ebb |
|
|
|
170ebb |
@@ -570,20 +572,27 @@ ifeq ($(ARCH), zarch)
|
|
|
170ebb |
DYNAMIC_CORE = ZARCH_GENERIC
|
|
|
170ebb |
|
|
|
170ebb |
# Z13 is supported since gcc-5.2, gcc-6, and in RHEL 7.3 and newer
|
|
|
170ebb |
-GCC_GE_52 := $(subst 0,,$(shell expr `$(CC) -dumpversion` \>= "5.2"))
|
|
|
170ebb |
+ifeq ($(GCCVERSIONGT5), 1)
|
|
|
170ebb |
+ ZARCH_SUPPORT_Z13 := 1
|
|
|
170ebb |
+else ifeq ($(GCCVERSIONEQ5), 1)
|
|
|
170ebb |
+ifeq ($(GCCMINORVERSIONGTEQ2), 1)
|
|
|
170ebb |
+ ZARCH_SUPPORT_Z13 := 1
|
|
|
170ebb |
+endif
|
|
|
170ebb |
+endif
|
|
|
170ebb |
|
|
|
170ebb |
ifeq ($(wildcard /etc/redhat-release), /etc/redhat-release)
|
|
|
170ebb |
-RHEL_WITH_Z13 := $(subst 0,,$(shell source /etc/os-release ; expr $$VERSION_ID \>= "7.3"))
|
|
|
170ebb |
+ifeq ($(shell source /etc/os-release ; expr $$VERSION_ID \>= "7.3"), 1)
|
|
|
170ebb |
+ ZARCH_SUPPORT_Z13 := 1
|
|
|
170ebb |
+endif
|
|
|
170ebb |
endif
|
|
|
170ebb |
|
|
|
170ebb |
-ifeq ($(or $(GCC_GE_52),$(RHEL_WITH_Z13)), 1)
|
|
|
170ebb |
+ifeq ($(ZARCH_SUPPORT_Z13), 1)
|
|
|
170ebb |
DYNAMIC_CORE += Z13
|
|
|
170ebb |
else
|
|
|
170ebb |
$(info OpenBLAS: Not building Z13 kernels because gcc is older than 5.2 or 6.x)
|
|
|
170ebb |
endif
|
|
|
170ebb |
|
|
|
170ebb |
-GCC_MAJOR_GE_7 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 7)
|
|
|
170ebb |
-ifeq ($(GCC_MAJOR_GE_7), 1)
|
|
|
170ebb |
+ifeq ($(GCCVERSIONGTEQ7), 1)
|
|
|
170ebb |
DYNAMIC_CORE += Z14
|
|
|
170ebb |
else
|
|
|
170ebb |
$(info OpenBLAS: Not building Z14 kernels because gcc is older than 7.x)
|
|
|
170ebb |
@@ -597,7 +606,6 @@ ifneq ($(C_COMPILER), GCC)
|
|
|
170ebb |
DYNAMIC_CORE += POWER9
|
|
|
170ebb |
endif
|
|
|
170ebb |
ifeq ($(C_COMPILER), GCC)
|
|
|
170ebb |
-GCCVERSIONGT5 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \> 5)
|
|
|
170ebb |
ifeq ($(GCCVERSIONGT5), 1)
|
|
|
170ebb |
DYNAMIC_CORE += POWER9
|
|
|
170ebb |
else
|