e70425
--- atlas/ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c	2013-12-05 19:19:57.000000000 +0100
e70425
+++ atlas/ATLAS/tune/blas/gemm/CASES/ATL_dmm4x4x80_ppc.c.new	2013-12-06 16:29:57.000000000 +0100
e70425
@@ -170,13 +170,21 @@ void ATL_USERMM(const int M, const int N
e70425
                 const TYPE beta, TYPE *C, const int ldc)
e70425
                                   (r10)    8(r1)
e70425
 *******************************************************************************
e70425
-64 bit ABIs:
e70425
+64 bit ABIv1s:
e70425
                          r3           r4           r5             r6/f1
e70425
 void ATL_USERMM(const int M, const int N, const int K, const TYPE alpha,
e70425
                            r7             r8             r9            r10
e70425
                 const TYPE *A, const int lda, const TYPE *B, const int ldb,
e70425
                              f2   120(r1)        128(r1)
e70425
                 const TYPE beta, TYPE *C, const int ldc)
e70425
+
e70425
+64 bit ABIv2s:
e70425
+                         r3           r4           r5             r6/f1
e70425
+void ATL_USERMM(const int M, const int N, const int K, const TYPE alpha,
e70425
+                           r7             r8             r9            r10
e70425
+                const TYPE *A, const int lda, const TYPE *B, const int ldb,
e70425
+                             f2   104(r1)        112(r1)
e70425
+                const TYPE beta, TYPE *C, const int ldc)
e70425
 #endif
e70425
 #ifdef ATL_AS_AIX_PPC
e70425
         .csect .text[PR]
e70425
@@ -202,7 +210,7 @@ Mjoin(.,ATL_USERMM):
e70425
 	.globl  Mjoin(_,ATL_USERMM)
e70425
 Mjoin(_,ATL_USERMM):
e70425
    #else
e70425
-      #if defined(ATL_USE64BITS)
e70425
+      #if defined(ATL_USE64BITS) && _CALL_ELF != 2
e70425
 /*
e70425
  *      Official Program Descripter section, seg fault w/o it on Linux/PPC64
e70425
  */
e70425
@@ -217,6 +225,7 @@ ATL_USERMM:
e70425
 	.globl  Mjoin(.,ATL_USERMM)
e70425
 Mjoin(.,ATL_USERMM):
e70425
       #else
e70425
+/* ppc64 have no longer function descriptors in ABIv2 */      
e70425
 	.globl  ATL_USERMM
e70425
 ATL_USERMM:
e70425
       #endif
e70425
@@ -257,9 +266,17 @@ ATL_USERMM:
e70425
    #endif
e70425
 #endif
e70425
 
e70425
+
e70425
 #if defined (ATL_USE64BITS)
e70425
+#if _CALL_ELF == 2
e70425
+/* ABIv2 */
e70425
+        ld      pC0, 104(r1)
e70425
+        ld      incCn, 112(r1)
e70425
+#else
e70425
+/* ABIv1 */
e70425
         ld      pC0, 120(r1)
e70425
         ld      incCn, 128(r1)
e70425
+#endif
e70425
 #elif defined(ATL_AS_OSX_PPC) || defined(ATL_AS_AIX_PPC)
e70425
         lwz     pC0, 68(r1)
e70425
         lwz     incCn,  72(r1)