diff --git a/ggml/src/ggml-cpu/ggml-cpu-impl.h b/ggml/src/ggml-cpu/ggml-cpu-impl.h index 337d8094e8092..69415daa82025 100644 --- a/ggml/src/ggml-cpu/ggml-cpu-impl.h +++ b/ggml/src/ggml-cpu/ggml-cpu-impl.h @@ -518,11 +518,14 @@ void ggml_barrier(struct ggml_threadpool * tp); #elif defined(__GNUC__) // GCC/Clang on *nix # define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(weak name = alias) // NOLINT -#elif defined(_MSC_VER) && defined (_WIN64) +#elif defined(_MSC_VER) && defined(_WIN64) // MSVC // Note: C name mangling varies across different calling conventions // see https://learn.microsoft.com/en-us/cpp/build/reference/decorated-names?view=msvc-170 # define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(comment(linker, "/alternatename:" #name "=" #alias)) +#elif defined(_MSC_VER) && defined(WIN32) +// ref: https://github.com/ggml-org/whisper.cpp/pull/3239#issuecomment-2958224591 +# define GGML_WEAK_ALIAS(name, alias) GGML_DO_PRAGMA(comment(linker, "/alternatename:_" #name "=_" #alias)) #else # error "Unsupported compiler for GGML_WEAK_ALIAS" #endif diff --git a/scripts/sync-ggml.last b/scripts/sync-ggml.last index 490115500d224..914fe47ff6a34 100644 --- a/scripts/sync-ggml.last +++ b/scripts/sync-ggml.last @@ -1 +1 @@ -a1761cd64ce4a75a9770a954a013422c7910db8b +6a7d170c04789f6ebcf320ed03c1b16973f93bd7