ggml-cpu : fix linking issue with clang

Author: xctan

ggml/src/ggml-cpu/arch/arm/repack.cpp

@@ -14,7 +14,6 @@
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
-#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)

ggml/src/ggml-cpu/arch/riscv/repack.cpp

@@ -14,7 +14,6 @@
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
-#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)

ggml/src/ggml-cpu/arch/x86/repack.cpp

@@ -14,7 +14,6 @@
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
-#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)

ggml/src/ggml-cpu/repack-impl.cpp

@@ -44,7 +44,9 @@ static inline int nearest_int(float fval) {
 //                         operations durin unpacking)
 //
 
+#if !(defined(__GNUC__) && defined(__clang__))
 extern "C" {
+#endif
 
 void ggml_quantize_mat_q8_0_4x4_generic(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k) {
     assert(QK8_0 == 32);
@@ -753,4 +755,6 @@ void ggml_gemm_iq4_nl_4x4_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs
 }
 GGML_CPU_NATIVE_IMPL(ggml_gemm_iq4_nl_4x4_q8_0)
 
+#if !(defined(__GNUC__) && defined(__clang__))
 } // extern "C"
+#endif

ggml/src/ggml-cpu/repack.h

@@ -60,7 +60,8 @@ struct block_iq4_nlx4 {
 
 static_assert(sizeof(block_iq4_nlx4) == 4 * sizeof(ggml_half) + QK4_NL * 2, "wrong iq4_nlx4 block size/padding");
 
-#if defined(__cplusplus)
+// Clang always mangles the alias name when compiling a C++ source file
+#if defined(__cplusplus) && !(defined(__GNUC__) && defined(__clang__))
 extern "C" {
 #endif
 
@@ -78,6 +79,12 @@ void ggml_gemm_q4_0_8x8_q8_0(int n, float * GGML_RESTRICT s, size_t bs, const vo
 void ggml_gemm_q4_K_8x8_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
 void ggml_gemm_iq4_nl_4x4_q8_0(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
 
+#if defined(__cplusplus) && !(defined(__GNUC__) && defined(__clang__))
+} // extern "C"
+#endif
+
+extern "C" {
+
 // Native implementations
 void ggml_quantize_mat_q8_0_4x4_generic(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
 void ggml_quantize_mat_q8_0_4x8_generic(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
@@ -93,6 +100,4 @@ void ggml_gemm_q4_0_8x8_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs,
 void ggml_gemm_q4_K_8x8_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
 void ggml_gemm_iq4_nl_4x4_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
 
-#if defined(__cplusplus)
-} // extern "C"
-#endif
+}