Skip to content

Commit c7e30f0

Browse files
committed
Revert "Fix for llvm-mingw Win64 build."
This reverts commit df26a95.
1 parent ff318ce commit c7e30f0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

modules/skcms/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static_library("skcms") {
9191
} else if (is_clang) {
9292
cflags_c += [ "-std=c11" ]
9393
}
94-
if (target_cpu != "x64" || target_os == "android") {
94+
if (target_cpu != "x64" || target_os == "android" || (is_win && is_mingw)) {
9595
defines = [
9696
"SKCMS_DISABLE_HSW",
9797
"SKCMS_DISABLE_SKX",

modules/skcms/src/skcms_internals.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,9 @@ extern "C" {
8686
#define SAFE_FIXED_SIZE(type) ((uint64_t)offsetof(type, variable))
8787

8888
// If this isn't Clang, GCC, or Emscripten with SIMD support, we are in SKCMS_PORTABLE mode.
89-
#if !defined(SKCMS_PORTABLE) && (defined(__MINGW32__) || \
90-
!(defined(__clang__) || \
91-
defined(__GNUC__) || \
92-
(defined(__EMSCRIPTEN__) && defined(__wasm_simd128__))))
89+
#if !defined(SKCMS_PORTABLE) && !(defined(__clang__) || \
90+
defined(__GNUC__) || \
91+
(defined(__EMSCRIPTEN__) && defined(__wasm_simd128__)))
9392
#define SKCMS_PORTABLE 1
9493
#endif
9594

0 commit comments

Comments
 (0)