try to fix clang compilation errors, 6th attempt

Author: xctan

ggml/cmake/common.cmake

@@ -28,6 +28,9 @@ endfunction()
 function(ggml_get_system_arch)
     if (CMAKE_OSX_ARCHITECTURES      STREQUAL "arm64" OR
         CMAKE_GENERATOR_PLATFORM_LWR STREQUAL "arm64" OR
+        CMAKE_SYSTEM_NAME            STREQUAL "iOS"   OR
+        CMAKE_SYSTEM_NAME            STREQUAL "tvOS"  OR
+        CMAKE_SYSTEM_NAME            STREQUAL "visionOS" OR
         (NOT CMAKE_OSX_ARCHITECTURES AND NOT CMAKE_GENERATOR_PLATFORM_LWR AND
             CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm.*|ARM64)$"))
         set(GGML_SYSTEM_ARCH "ARM" PARENT_SCOPE)

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

@@ -511,11 +511,7 @@ void ggml_barrier(struct ggml_threadpool * tp);
 #define GGML_DO_PRAGMA(x) GGML_DO_PRAGMA_(x)
 #if defined(__GNUC__)
 // GCC/Clang on *nix
-# if defined(__APPLE__) && !defined(TARGET_OS_OSX)
-#  define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(weak _ ## name = _ ## alias) // NOLINT
-# else
-#  define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(weak name = alias) // NOLINT
-# endif
+# define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(weak name = alias) // NOLINT
 #elif defined(_MSC_VER) && defined (_WIN64)
 // MSVC
 // Note: C name mangling varies across different calling conventions

ggml/src/ggml-cpu/repack.h

@@ -36,7 +36,6 @@ using block_q4_0x8 = block<4, 8>;
 using block_q8_0x4 = block<8, 4>;
 using block_q8_0x8 = block<8, 8>;
 
-
 struct block_q4_Kx8 {
     ggml_half d[8];      // super-block scale for quantized scales
     ggml_half dmin[8];   // super-block scale for quantized mins
@@ -68,8 +67,7 @@ extern "C" {
 // Workaround for clang:
 // clang++ complains: ``error: call to 'ggml_gemm_q4_0_4x4_q8_0' is ambiguous''
 // repro: https://godbolt.org/z/oKdeWKonM (ICE), https://godbolt.org/z/1szq6P36v (ambiguous call)
-// but gcc needs forward declarations
-#if !defined(__clang__) || (defined(__clang__) && defined(GGML_CPU_CLANG_WORKAROUND))
+#if !defined(__clang__) || (defined(__clang__) && (defined(GGML_CPU_CLANG_WORKAROUND) || defined(_WIN64)))
 void ggml_quantize_mat_q8_0_4x4(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
 void ggml_quantize_mat_q8_0_4x8(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
 void ggml_quantize_mat_q8_K_4x8(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);