From 992b71fea2e3916c294dd6a90062b4c31740cd85 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 23 Apr 2024 21:52:26 +0200 Subject: [PATCH 1/3] remove stray comma --- kernel/loongarch64/dot_lasx.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/loongarch64/dot_lasx.S b/kernel/loongarch64/dot_lasx.S index 0715b6311..11c896cb9 100644 --- a/kernel/loongarch64/dot_lasx.S +++ b/kernel/loongarch64/dot_lasx.S @@ -165,7 +165,7 @@ PROLOGUE /* store dot in s1 $f8 */ #ifdef DSDOT xvfadd.d $xr8, $xr8, $xr9 - fsub.s s2, s2, s2, /* set s2 to 0.0 */ + fsub.s s2, s2, s2 /* set s2 to 0.0 */ xvpermi.q $xr0, $xr8, 0x1 vfadd.d $vr8, $vr8, $vr0 vpackod.d $vr0, $vr8, $vr8 From 015042f7b5552d93a502e32faac3812378cba332 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 23 Apr 2024 21:55:57 +0200 Subject: [PATCH 2/3] Fix Loongson compiler flag test --- cmake/cc.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/cc.cmake b/cmake/cc.cmake index 2da941afb..0a498510a 100644 --- a/cmake/cc.cmake +++ b/cmake/cc.cmake @@ -2,6 +2,7 @@ ## Author: Hank Anderson ## Description: Ported from portion of OpenBLAS/Makefile.system ## Sets C related variables. +include(CheckCCompilerFlag) if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "LSB" OR ${CMAKE_C_COMPILER_ID} MATCHES "Clang") @@ -36,14 +37,14 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "LS if (LOONGARCH64) if (BINARY64) - CHECK_CXX_COMPILER_FLAG("-mabi=lp64d" COMPILER_SUPPORT_LP64D_ABI) + CHECK_C_COMPILER_FLAG("-mabi=lp64d" COMPILER_SUPPORT_LP64D_ABI) if(COMPILER_SUPPORT_LP64D_ABI) set(CCOMMON_OPT "${CCOMMON_OPT} -mabi=lp64d") else() set(CCOMMON_OPT "${CCOMMON_OPT} -mabi=lp64") endif () else () - CHECK_CXX_COMPILER_FLAG("-mabi=ilp32d" COMPILER_SUPPORT_ILP32D_ABI) + CHECK_C_COMPILER_FLAG("-mabi=ilp32d" COMPILER_SUPPORT_ILP32D_ABI) if(COMPILER_SUPPORT_ILP32D_ABI) set(CCOMMON_OPT "${CCOMMON_OPT} -mabi=ilp32d") else() From 69aa93e34f053611ed09da28862da9c22fab9b55 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 23 Apr 2024 21:57:42 +0200 Subject: [PATCH 3/3] Fix Loongson compiler flag check --- cmake/fc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/fc.cmake b/cmake/fc.cmake index 4d3da1a29..176d3d438 100644 --- a/cmake/fc.cmake +++ b/cmake/fc.cmake @@ -61,14 +61,14 @@ if (${F_COMPILER} STREQUAL "GFORTRAN" OR ${F_COMPILER} STREQUAL "F95" OR CMAKE_F endif () if (LOONGARCH64) if (BINARY64) - CHECK_CXX_COMPILER_FLAG("-mabi=lp64d" COMPILER_SUPPORT_LP64D_ABI) + CHECK_C_COMPILER_FLAG("-mabi=lp64d" COMPILER_SUPPORT_LP64D_ABI) if(COMPILER_SUPPORT_LP64D_ABI) set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=lp64d") else() set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=lp64") endif () else () - CHECK_CXX_COMPILER_FLAG("-mabi=ilp32d" COMPILER_SUPPORT_ILP32D_ABI) + CHECK_C_COMPILER_FLAG("-mabi=ilp32d" COMPILER_SUPPORT_ILP32D_ABI) if(COMPILER_SUPPORT_ILP32D_ABI) set(FCOMMON_OPT "${FCOMMON_OPT} -mabi=ilp32d") else()