try to fix clang compilation errors, 9th attempt

Author: xctan

ggml/src/ggml-cpu/CMakeLists.txt

@@ -402,7 +402,8 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
         message(STATUS "Wasm detected")
         list (APPEND GGML_CPU_SOURCES ggml-cpu/arch/wasm/quants.c)
     else()
-        message(STATUS "Unknown architecture")
+        message(WARNING "Unknown CPU architecture. Falling back to generic implementations.")
+        list(APPEND ARCH_FLAGS -DGGML_CPU_GENERIC)
     endif()
 
     if (GGML_CPU_REPACK)

ggml/src/ggml-cpu/ggml-cpu-impl.h

@@ -11,10 +11,6 @@
 #include <string.h> // memcpy
 #include <math.h>   // fabsf
 
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -513,7 +509,7 @@ void ggml_barrier(struct ggml_threadpool * tp);
 
 #define GGML_DO_PRAGMA_(x) _Pragma (#x)
 #define GGML_DO_PRAGMA(x) GGML_DO_PRAGMA_(x)
-#if (defined(__APPLE__) && !TARGET_OS_OSX) || defined(__HIPCC__)
+#if defined(GGML_CPU_GENERIC) || defined(__HIPCC__)
 // weak alias not working
 # define GGML_WEAK_ALIAS(name, alias)
 #elif defined(__GNUC__)

ggml/src/ggml-cpu/quants.h

@@ -5,10 +5,6 @@
 
 #include "ggml.h"
 
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#endif
-
 // GGML CPU internal header
 
 #ifdef __cplusplus
@@ -88,7 +84,7 @@ void ggml_vec_dot_iq1_m_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs,
 void ggml_vec_dot_iq4_nl_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc);
 void ggml_vec_dot_iq4_xs_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc);
 
-#if defined(__APPLE__) && !TARGET_OS_OSX
+#if defined(GGML_CPU_GENERIC)
 #define quantize_row_q8_0_generic quantize_row_q8_0
 #define quantize_row_q8_1_generic quantize_row_q8_1
 #define quantize_row_q8_K_generic quantize_row_q8_K

ggml/src/ggml-cpu/repack.h

@@ -6,10 +6,6 @@
 #include "traits.h"
 #include "ggml.h"
 
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#endif
-
 // GGML internal header
 
 ggml_backend_buffer_type_t ggml_backend_cpu_repack_buffer_type(void);
@@ -102,7 +98,7 @@ 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(__APPLE__) && !TARGET_OS_OSX
+#if defined(GGML_CPU_GENERIC)
 #define ggml_quantize_mat_q8_0_4x4_generic ggml_quantize_mat_q8_0_4x4
 #define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
 #define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8