conflict resolve
This commit is contained in:
parent
d0c3543c3f
commit
148c4cc5fd
|
@ -42,7 +42,7 @@ ZGEMMKERNEL = zgemm_kernel_power9.S
|
|||
ZGEMMONCOPY = ../generic/zgemm_ncopy_2.c
|
||||
ZGEMMOTCOPY = ../generic/zgemm_tcopy_2.c
|
||||
ZGEMMINCOPY = ../generic/zgemm_ncopy_8.c
|
||||
ZGEMMITCOPY = ../generic/zgemm_tcopy_8.c
|
||||
ZGEMMITCOPY = zgemm_tcopy_8_power8.S
|
||||
ZGEMMONCOPYOBJ = zgemm_oncopy.o
|
||||
ZGEMMOTCOPYOBJ = zgemm_otcopy.o
|
||||
ZGEMMINCOPYOBJ = zgemm_incopy.o
|
||||
|
|
Loading…
Reference in New Issue