Merge pull request #4922 from martin-frbg/issue4904-2

Update names of Loongarch64 targets in cmake cross-building
OpenMathLib · Oct 7, 2024 · 73c1882 · 73c1882
2 parents bc0691a + b0346e7
commit 73c1882
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmake/arch.cmake b/cmake/arch.cmake
@@ -95,7 +95,7 @@ if (DYNAMIC_ARCH)
   endif ()
 
   if (LOONGARCH64)
-    set(DYNAMIC_CORE LOONGSONGENERIC LOONGSON2K1000 LOONGSON3R5)
+    set(DYNAMIC_CORE LA64_GENERIC LA264 LA464)
   endif ()
 
   if (EXISTS ${PROJECT_SOURCE_DIR}/config_kernel.h)

diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
@@ -1349,7 +1349,7 @@ endif ()
       "#define DTB_DEFAULT_ENTRIES 128\n"
       "#define DTB_SIZE 4096\n"
       "#define L2_ASSOCIATIVE 4\n")
-  elseif ("${TCORE}" STREQUAL "LOONGSONGENERIC")
+  elseif ("${TCORE}" STREQUAL "LA64_GENERIC")
     file(APPEND ${TARGET_CONF_TEMP}
       "#define DTB_DEFAULT_ENTRIES 64\n")
       set(SGEMM_UNROLL_M 2)
@@ -1364,7 +1364,7 @@ endif ()
       set(CGEMM3M_UNROLL_N 8)
       set(ZGEMM3M_UNROLL_M 2)
       set(ZGEMM3M_UNROLL_N 8)
-  elseif ("${TCORE}" STREQUAL "LOONGSON2K1000")
+  elseif ("${TCORE}" STREQUAL "LA264")
     file(APPEND ${TARGET_CONF_TEMP}
       "#define DTB_DEFAULT_ENTRIES 64\n")
       set(HAVE_LSX  1)
@@ -1380,7 +1380,7 @@ endif ()
       set(CGEMM3M_UNROLL_N 8)
       set(ZGEMM3M_UNROLL_M 8)
       set(ZGEMM3M_UNROLL_N 4)
-  elseif ("${TCORE}" STREQUAL "LOONGSON3R5")
+  elseif ("${TCORE}" STREQUAL "LA464")
     file(APPEND ${TARGET_CONF_TEMP}
       "#define DTB_DEFAULT_ENTRIES 64\n")
       set(HAVE_LASX 1)

diff --git a/kernel/loongarch64/KERNEL.LOONGSONGENERIC → kernel/loongarch64/KERNEL.LA64_GENERIC b/kernel/loongarch64/KERNEL.LOONGSONGENERIC → kernel/loongarch64/KERNEL.LA64_GENERIC