From dc345d84df90a54e6f416ab7f3604b645297df23 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 19:56:52 +0100
Subject: [PATCH 01/10] Fix syntax of endianness conditional and add gcc
 version check for workaround

---
 kernel/power/KERNEL.POWER8 | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/kernel/power/KERNEL.POWER8 b/kernel/power/KERNEL.POWER8
index fb9452a35..ba9a99cd1 100644
--- a/kernel/power/KERNEL.POWER8
+++ b/kernel/power/KERNEL.POWER8
@@ -89,30 +89,52 @@ ZTRSMKERNEL_RT	= ../generic/trsm_kernel_RT.c
 #SMINKERNEL   = ../arm/min.c
 #DMINKERNEL   = ../arm/min.c
 #
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
+ifneq ($(GCCVERSIONGTEQ9),1)
 ISAMAXKERNEL = isamax_power8.S
 else
 ISAMAXKERNEL = isamax.c
 endif
+else
+ISAMAXKERNEL = isamax.c
+endif
+#
 IDAMAXKERNEL = idamax.c
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+#
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
+ifneq ($(GCCVERSIONGTEQ9),1)
 ICAMAXKERNEL = icamax_power8.S
 else
 ICAMAXKERNEL = icamax.c
 endif
+else
+ICAMAXKERNEL = icamax.c
+endif
+#
 IZAMAXKERNEL = izamax.c
 #
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
+ifneq ($(GCCVERSIONGTEQ9),1)
 ISAMINKERNEL = isamin_power8.S
 else
 ISAMINKERNEL = isamin.c
 endif
+else
+ISAMINKERNEL = isamin.c
+endif
+#
 IDAMINKERNEL = idamin.c
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+#
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
+ifneq ($(GCCVERSIONGTEQ9),1)
 ICAMINKERNEL = icamin_power8.S
 else
 ICAMINKERNEL = icamin.c
 endif
+else
+ICAMINKERNEL = icamin.c
+endif
+#
 IZAMINKERNEL = izamin.c
 #
 #ISMAXKERNEL  = ../arm/imax.c
@@ -128,11 +150,16 @@ ZASUMKERNEL  = zasum.c
 #
 SAXPYKERNEL  = saxpy.c
 DAXPYKERNEL  = daxpy.c
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
+ifneq ($(GCCVERSIONGTEQ9),1)
 CAXPYKERNEL  = caxpy_power8.S
 else
 CAXPYKERNEL  = caxpy.c
 endif
+else
+CAXPYKERNEL  = caxpy.c
+endif
+#
 ZAXPYKERNEL  = zaxpy.c
 #
 SCOPYKERNEL  = scopy.c

From 120d20731face6457aa9f234eeaecf45f51a0b51 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 19:58:42 +0100
Subject: [PATCH 02/10] Fix syntax of endianness conditional

---
 kernel/power/KERNEL.PPC440 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/power/KERNEL.PPC440 b/kernel/power/KERNEL.PPC440
index a0696b548..8d64d3fc1 100644
--- a/kernel/power/KERNEL.PPC440
+++ b/kernel/power/KERNEL.PPC440
@@ -15,7 +15,7 @@ ZASUMKERNEL	= zasum_ppc440.S
 
 SAXPYKERNEL	=  axpy_ppc440.S
 DAXPYKERNEL	=  axpy_ppc440.S
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 CAXPYKERNEL	= ../arm/zaxpy.c
 ZAXPYKERNEL	= ../arm/zaxpy.c
 else
@@ -25,7 +25,7 @@ endif
 
 SDOTKERNEL	=  dot_ppc440.S
 DDOTKERNEL	=  dot_ppc440.S
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 CDOTKERNEL	= zdot_ppc440.S
 ZDOTKERNEL	= zdot_ppc440.S
 else
@@ -62,7 +62,7 @@ ZNRM2KERNEL	= znrm2_ppc440.S
 
 SROTKERNEL	=  rot_ppc440.S
 DROTKERNEL	=  rot_ppc440.S
-ifneq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 CROTKERNEL	= zrot_ppc440.S
 ZROTKERNEL	= zrot_ppc440.S
 else
@@ -132,7 +132,7 @@ ZTRSMKERNEL_LT	=  ztrsm_kernel_ppc440_LT.S
 ZTRSMKERNEL_RN	=  ztrsm_kernel_ppc440_LT.S
 ZTRSMKERNEL_RT	=  ztrsm_kernel_ppc440_RT.S
 
-ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 SGEMVNKERNEL = ../arm/gemv_n.c
 DGEMVNKERNEL = ../arm/gemv_n.c
 SGEMVTKERNEL = ../arm/gemv_t.c

From 0544cbc806466a42a01b8235c87938ed93c221d6 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 20:00:29 +0100
Subject: [PATCH 03/10] Fix syntax of endianness conditional

---
 kernel/power/KERNEL.PPC970 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/power/KERNEL.PPC970 b/kernel/power/KERNEL.PPC970
index de30977de..cc1f215de 100644
--- a/kernel/power/KERNEL.PPC970
+++ b/kernel/power/KERNEL.PPC970
@@ -1,4 +1,4 @@
-ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 SGEMMKERNEL    =  gemm_kernel.S
 SGEMMINCOPY    =  
 SGEMMITCOPY    =  
@@ -30,7 +30,7 @@ DGEMMITCOPYOBJ =
 DGEMMONCOPYOBJ =  dgemm_oncopy$(TSUFFIX).$(SUFFIX)
 DGEMMOTCOPYOBJ =  dgemm_otcopy$(TSUFFIX).$(SUFFIX)
 
-ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 CGEMMKERNEL    =  zgemm_kernel.S
 CGEMMINCOPY    =
 CGEMMITCOPY    =
@@ -72,7 +72,7 @@ ZTRSMKERNEL_LT	=  ztrsm_kernel_LT.S
 ZTRSMKERNEL_RN	=  ztrsm_kernel_LT.S
 ZTRSMKERNEL_RT	=  ztrsm_kernel_RT.S
 
-ifeq ($(__BYTE_ORDER__),$(__ORDER_BIG_ENDIAN__))
+ifeq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
 STRSMKERNEL_LN	=  trsm_kernel_LN.S
 STRSMKERNEL_LT	=  trsm_kernel_LT.S
 STRSMKERNEL_RN	=  trsm_kernel_LT.S

From 7c162b8a2104d316e05883f77c98bc795ccc7f81 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 23:56:57 +0100
Subject: [PATCH 04/10] Update isamax_power8.S

---
 kernel/power/isamax_power8.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/power/isamax_power8.S b/kernel/power/isamax_power8.S
index fa5433333..7938779c9 100644
--- a/kernel/power/isamax_power8.S
+++ b/kernel/power/isamax_power8.S
@@ -11,7 +11,8 @@
 #include "common.h"
 
 	PROLOGUE
-
+	
+isamax_k:
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From de40d47edf316a26f5607a242f8bda69c9f06caf Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 23:57:48 +0100
Subject: [PATCH 05/10] Update isamin_power8.S

---
 kernel/power/isamin_power8.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/power/isamin_power8.S b/kernel/power/isamin_power8.S
index c9b6acb85..432c0e776 100644
--- a/kernel/power/isamin_power8.S
+++ b/kernel/power/isamin_power8.S
@@ -11,6 +11,7 @@
 
 	PROLOGUE
 
+isamin_k:
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From 8eefa530cd141be1b38fe12ebc3831ba9c285c15 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Wed, 12 Feb 2020 23:59:50 +0100
Subject: [PATCH 06/10] Update isamax_power8.S

---
 kernel/power/isamax_power8.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/power/isamax_power8.S b/kernel/power/isamax_power8.S
index 7938779c9..ec1c283f3 100644
--- a/kernel/power/isamax_power8.S
+++ b/kernel/power/isamax_power8.S
@@ -12,7 +12,9 @@
 
 	PROLOGUE
 	
+#if _CALL_ELF == 2	
 isamax_k:
+#endif
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From 5ba3699f419185898d368a4b7618d396dff419ba Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 13 Feb 2020 00:00:32 +0100
Subject: [PATCH 07/10] Update isamin_power8.S

---
 kernel/power/isamin_power8.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/power/isamin_power8.S b/kernel/power/isamin_power8.S
index 432c0e776..1978af880 100644
--- a/kernel/power/isamin_power8.S
+++ b/kernel/power/isamin_power8.S
@@ -11,7 +11,9 @@
 
 	PROLOGUE
 
+#if _CALL_ELF ==2
 isamin_k:
+#endif
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From 486c35c5dc1f3fa3bae87e0256342068070c9ed6 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 13 Feb 2020 18:38:43 +0100
Subject: [PATCH 08/10] Update icamin_power8.S

---
 kernel/power/icamin_power8.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/power/icamin_power8.S b/kernel/power/icamin_power8.S
index f2993e83e..e4469eb64 100644
--- a/kernel/power/icamin_power8.S
+++ b/kernel/power/icamin_power8.S
@@ -10,7 +10,9 @@
 #include "common.h"
 
 	PROLOGUE
-
+#if _CALL_ELF ==2
+icamin_k:
+#endif
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From 92ca92a46c98f09121844199fa853ed0428ab521 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 13 Feb 2020 21:24:54 +0100
Subject: [PATCH 09/10] Update caxpy_power8.S

---
 kernel/power/caxpy_power8.S | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel/power/caxpy_power8.S b/kernel/power/caxpy_power8.S
index 294a1d24d..dbbd55196 100644
--- a/kernel/power/caxpy_power8.S
+++ b/kernel/power/caxpy_power8.S
@@ -12,6 +12,13 @@
 
 	PROLOGUE
 
+#if _CALL_ELF ==2
+#ifdef CONJ
+caxpyc_k:
+#else
+caxpyc:
+#endif
+#endif
 .LCF0:
 0:	addis 2,12,.TOC.-.LCF0@ha
 	addi 2,2,.TOC.-.LCF0@l

From cafdd999b81a08b1a003d53e52e53ee04b1d1842 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 13 Feb 2020 22:44:09 +0100
Subject: [PATCH 10/10] Update caxpy_power8.S

---
 kernel/power/caxpy_power8.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/power/caxpy_power8.S b/kernel/power/caxpy_power8.S
index dbbd55196..10a372832 100644
--- a/kernel/power/caxpy_power8.S
+++ b/kernel/power/caxpy_power8.S
@@ -16,7 +16,7 @@
 #ifdef CONJ
 caxpyc_k:
 #else
-caxpyc:
+caxpy_k:
 #endif
 #endif
 .LCF0: