bugfixs for ARM regarding lapack tests

diff --git a/kernel/arm/KERNEL.ARMV6 b/kernel/arm/KERNEL.ARMV6
index 02627cbd039c712a30e583734615d1128403ea48..2810c650095c1c10ef10ec81fde3d60249507e18 100644 (file)
--- a/kernel/arm/KERNEL.ARMV6
+++ b/kernel/arm/KERNEL.ARMV6
@@ -1,3 +1,18 @@
+SGEMVNKERNEL = ../arm/gemv_n.c
+SGEMVTKERNEL = ../arm/gemv_t.c
+
+CTRMMKERNEL    = ../generic/ztrmmkernel_2x2.c
+CGEMMKERNEL    = ../generic/zgemmkernel_2x2.c
+CGEMMONCOPY    = ../generic/zgemm_ncopy_2.c
+CGEMMOTCOPY    = ../generic/zgemm_tcopy_2.c
+
+#STRMMKERNEL   = ../generic/trmmkernel_2x2.c
+#SGEMMKERNEL    =  ../generic/gemmkernel_2x2.c         
+#SGEMMONCOPY    =  ../generic/gemm_ncopy_2.c
+#SGEMMOTCOPY    =  ../generic/gemm_tcopy_2.c
+
+
+###############################################################################
 SAMAXKERNEL  = iamax_vfp.S
 DAMAXKERNEL  = iamax_vfp.S
 CAMAXKERNEL  = iamax_vfp.S
@@ -60,29 +75,29 @@ DROTKERNEL   = rot_vfp.S
 CROTKERNEL   = rot_vfp.S
 ZROTKERNEL   = rot_vfp.S
 
-SSCALKERNEL  =  scal_vfp.S
-DSCALKERNEL  =  scal_vfp.S
-CSCALKERNEL  =  scal_vfp.S
-ZSCALKERNEL  =  scal_vfp.S
+SSCALKERNEL  = scal.c
+DSCALKERNEL  = scal.c
+CSCALKERNEL  = zscal.c
+ZSCALKERNEL  = zscal.c
 
 SSWAPKERNEL  = swap_vfp.S
 DSWAPKERNEL  = swap_vfp.S
 CSWAPKERNEL  = swap_vfp.S
 ZSWAPKERNEL  = swap_vfp.S
 
-SGEMVNKERNEL = gemv_n_vfp.S
+# BAD SGEMVNKERNEL = gemv_n_vfp.S
 DGEMVNKERNEL = gemv_n_vfp.S
 CGEMVNKERNEL = cgemv_n_vfp.S
 ZGEMVNKERNEL = zgemv_n_vfp.S
 
-SGEMVTKERNEL = gemv_t_vfp.S
+# BAD SGEMVTKERNEL = gemv_t_vfp.S
 DGEMVTKERNEL = gemv_t_vfp.S
 CGEMVTKERNEL = cgemv_t_vfp.S
 ZGEMVTKERNEL = zgemv_t_vfp.S
 
 STRMMKERNEL    = strmm_kernel_4x2_vfp.S
 DTRMMKERNEL    = dtrmm_kernel_4x2_vfp.S
-CTRMMKERNEL    = ctrmm_kernel_2x2_vfp.S
+# CTRMMKERNEL  = ctrmm_kernel_2x2_vfp.S
 ZTRMMKERNEL    = ztrmm_kernel_2x2_vfp.S
 
 SGEMMKERNEL    = sgemm_kernel_4x2_vfp.S                
@@ -105,9 +120,9 @@ DGEMMOTCOPY    = ../generic/gemm_tcopy_2.c
 DGEMMONCOPYOBJ = dgemm_oncopy.o
 DGEMMOTCOPYOBJ = dgemm_otcopy.o
 
-CGEMMKERNEL    = cgemm_kernel_2x2_vfp.S
-CGEMMONCOPY    = cgemm_ncopy_2_vfp.S
-CGEMMOTCOPY    = cgemm_tcopy_2_vfp.S
+#CGEMMKERNEL    = cgemm_kernel_2x2_vfp.S
+#CGEMMONCOPY    = cgemm_ncopy_2_vfp.S
+#CGEMMOTCOPY    = cgemm_tcopy_2_vfp.S
 CGEMMONCOPYOBJ = cgemm_oncopy.o
 CGEMMOTCOPYOBJ = cgemm_otcopy.o
 

diff --git a/kernel/arm/KERNEL.ARMV7 b/kernel/arm/KERNEL.ARMV7
index df66388dbd5b77b9c0d3fa5a5624f720fd357c4e..790883e5e1ac338202f0f1b62152ee899a312f5e 100644 (file)
--- a/kernel/arm/KERNEL.ARMV7
+++ b/kernel/arm/KERNEL.ARMV7
@@ -1,3 +1,8 @@
+SGEMVNKERNEL = ../arm/gemv_n.c
+SGEMVTKERNEL = ../arm/gemv_t.c
+
+
+#################################################################################
 SAMAXKERNEL  = iamax_vfp.S
 DAMAXKERNEL  = iamax_vfp.S
 CAMAXKERNEL  = iamax_vfp.S
@@ -65,17 +70,17 @@ DROTKERNEL   = rot_vfp.S
 CROTKERNEL   = rot_vfp.S
 ZROTKERNEL   = rot_vfp.S
 
-SSCALKERNEL  = scal_vfp.S
+SSCALKERNEL  = scal.c
 DSCALKERNEL  = scal.c
-CSCALKERNEL  = scal_vfp.S
-ZSCALKERNEL  = scal_vfp.S
+CSCALKERNEL  = zscal.c
+ZSCALKERNEL  = zscal.c
 
-SGEMVNKERNEL = gemv_n_vfp.S
-DGEMVNKERNEL = gemv_n.c
+# BAD SGEMVNKERNEL = gemv_n_vfp.S
+DGEMVNKERNEL = gemv_n_vfp.S
 CGEMVNKERNEL = cgemv_n_vfp.S
 ZGEMVNKERNEL = zgemv_n_vfp.S
 
-SGEMVTKERNEL = gemv_t_vfp.S
+# BAD SGEMVTKERNEL = gemv_t_vfp.S
 DGEMVTKERNEL = gemv_t_vfp.S
 CGEMVTKERNEL = cgemv_t_vfp.S
 ZGEMVTKERNEL = zgemv_t_vfp.S