Merge pull request openucx#10951 from gleon99/lgenkin/fix-sles16-compilation

gleon99 · web-flow · commit 257c581f1dc3 · 2025-10-19T15:31:29.000+03:00
UCS/ARCH: Fix ucs_arch_get_cpu_flag compilation
diff --git a/src/ucs/arch/x86_64/cpu.c b/src/ucs/arch/x86_64/cpu.c
@@ -499,9 +499,9 @@ ucs_cpu_model_t ucs_arch_get_cpu_model()
 }
 
 
-int ucs_arch_get_cpu_flag()
+ucs_cpu_flag_t ucs_arch_get_cpu_flag()
 {
-    static int cpu_flag = UCS_CPU_FLAG_UNKNOWN;
+    static ucs_cpu_flag_t cpu_flag = UCS_CPU_FLAG_UNKNOWN;
 
     if (UCS_CPU_FLAG_UNKNOWN == cpu_flag) {
         uint32_t result = 0;

Original file line number	Diff line number	Diff line change
`@@ -499,9 +499,9 @@ ucs_cpu_model_t ucs_arch_get_cpu_model()`
`499`	`499`	`}`
`500`	`500`
`501`	`501`
`502`		`-int ucs_arch_get_cpu_flag()`
	`502`	`+ucs_cpu_flag_t ucs_arch_get_cpu_flag()`
`503`	`503`	`{`
`504`		`- static int cpu_flag = UCS_CPU_FLAG_UNKNOWN;`
	`504`	`+ static ucs_cpu_flag_t cpu_flag = UCS_CPU_FLAG_UNKNOWN;`
`505`	`505`
`506`	`506`	`if (UCS_CPU_FLAG_UNKNOWN == cpu_flag) {`
`507`	`507`	`uint32_t result = 0;`