From: Jared Van Bortel <redacted>
Date: Wed, 6 Mar 2024 20:42:23 +0000 (-0500)
Subject: ggml : use SYS_get_cpu if SYS_getcpu is not defined (llama/5906)
X-Git-Tag: upstream/1.7.4~916
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=1daeffca54c68f33b2706fb1609a17ea28233861;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

ggml : use SYS_get_cpu if SYS_getcpu is not defined (llama/5906)

Fixes #5694
Fixes ggerganov/whisper.cpp#1894
---

diff --git a/ggml.c b/ggml.c
index 6a10bbcb..92b17ee6 100644
--- a/ggml.c
+++ b/ggml.c
@@ -2154,7 +2154,10 @@ void ggml_numa_init(enum ggml_numa_strategy numa_flag) {
     getcpu_ret = getcpu(&current_cpu, &g_state.numa.current_node);
 #else
     // old glibc doesn't have a wrapper for this call. Fall back on direct syscall
-    getcpu_ret = syscall(SYS_getcpu,&current_cpu,&g_state.numa.current_node);
+#   if !defined(SYS_getcpu) && defined(SYS_get_cpu)
+#       define SYS_getcpu SYS_get_cpu // some older glibc versions use this name
+#   endif
+    getcpu_ret = syscall(SYS_getcpu, &current_cpu, &g_state.numa.current_node);
 #endif
 
     if (g_state.numa.n_nodes < 1 || g_state.numa.total_cpus < 1 || getcpu_ret != 0) {