diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b174f0144..501ced519 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -235,6 +235,39 @@ jobs:
           cl.exe /DJS_NAN_BOXING=1 /Zs cxxtest.cc
 
   windows-clang:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        buildType: [Debug, Release]
+    steps:
+      - uses: actions/checkout@v4
+      - name: install ninja
+        run: |
+          choco install ninja
+          ninja.exe --version
+      - name: build
+        run: |
+          git submodule update --init --checkout --depth 1
+          cmake -B build -DQJS_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=${{matrix.buildType}} -DCMAKE_C_COMPILER=clang.exe -G "Ninja"
+          cmake --build build --config ${{matrix.buildType}}
+      - name: stats
+        run: |
+          build\qjs.exe -qd
+      - name: cxxtest
+        run: |
+          clang.exe -D JS_NAN_BOXING=0 -fsyntax-only cxxtest.cc
+          clang.exe -D JS_NAN_BOXING=1 -fsyntax-only cxxtest.cc
+      - name: test
+        run: |
+          cp build\fib.dll examples\
+          cp build\point.dll examples\
+          build\qjs.exe examples\test_fib.js
+          build\qjs.exe examples\test_point.js
+          build\run-test262.exe -c tests.conf
+          build\function_source.exe
+
+  windows-clang-cl:
     runs-on: windows-latest
     strategy:
       fail-fast: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 133de63f5..f7a29dcd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,13 @@ xcheck_add_c_compiler_flag(-Wno-stringop-truncation)
 xcheck_add_c_compiler_flag(-Wno-array-bounds)
 xcheck_add_c_compiler_flag(-funsigned-char)
 
+# Clang on Windows without MSVC command line fails because the codebase uses 
+# functions like strcpy over strcpy_s
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND WIN32 AND NOT MSVC)
+    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+    add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
 # ClangCL is command line compatible with MSVC, so 'MSVC' is set.
 if(MSVC)
     xcheck_add_c_compiler_flag(-Wno-unsafe-buffer-usage)
@@ -77,6 +84,10 @@ endif()
 if(WIN32)
     if(MSVC)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8388608")
+    elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+        # Clang on Windows uses Windows' default linker, but requires GCC-style 
+        # -Wl to specify a linker argument
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,/STACK:8388608")
     else()
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,8388608")
     endif()
diff --git a/cutils.h b/cutils.h
index 4639a6b93..70480df43 100644
--- a/cutils.h
+++ b/cutils.h
@@ -102,7 +102,8 @@ extern "C" {
 
 /* Borrowed from Folly */
 #ifndef JS_PRINTF_FORMAT
-#ifdef _MSC_VER
+/* Clang on Windows doesn't seem to support _Printf_format_string_ */
+#if defined(_MSC_VER) && !defined(__clang__)
 #include <sal.h>
 #define JS_PRINTF_FORMAT _Printf_format_string_
 #define JS_PRINTF_FORMAT_ATTR(format_param, dots_param)
diff --git a/getopt_compat.h b/getopt_compat.h
index f98ba2739..97d7f3c02 100644
--- a/getopt_compat.h
+++ b/getopt_compat.h
@@ -144,6 +144,11 @@ static const char noarg[] = "option doesn't take an argument -- %.*s";
 static const char illoptchar[] = "unknown option -- %c";
 static const char illoptstring[] = "unknown option -- %s";
 
+// Non-CL Clang on Windows does not define __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif // __GNUC__ || __clang__
 static void
 _vwarnx(const char *fmt,va_list ap)
 {
@@ -152,6 +157,9 @@ _vwarnx(const char *fmt,va_list ap)
     (void)vfprintf(stderr,fmt,ap);
   (void)fprintf(stderr,"\n");
 }
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop // ignored "-Wformat-nonliteral"
+#endif // __GNUC__ || __clang__
 
 static void
 warnx(const char *fmt,...)
diff --git a/quickjs-libc.c b/quickjs-libc.c
index f9af760e3..1e95a7710 100644
--- a/quickjs-libc.c
+++ b/quickjs-libc.c
@@ -198,10 +198,11 @@ static void js_set_thread_state(JSRuntime *rt, JSThreadState *ts)
     js_std_cmd(/*SetOpaque*/1, rt, ts);
 }
 
-#ifdef __GNUC__
+// Non-CL Clang on Windows does not define __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif // __GNUC__
+#endif // __GNUC__ || __clang__
 static JSValue js_printf_internal(JSContext *ctx,
                                   int argc, JSValueConst *argv, FILE *fp)
 {
@@ -417,9 +418,9 @@ static JSValue js_printf_internal(JSContext *ctx,
     dbuf_free(&dbuf);
     return JS_EXCEPTION;
 }
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop // ignored "-Wformat-nonliteral"
-#endif // __GNUC__
+#endif // __GNUC__ || __clang__
 
 uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
 {
diff --git a/quickjs.c b/quickjs.c
index af1c71460..b13e33742 100644
--- a/quickjs.c
+++ b/quickjs.c
@@ -6985,7 +6985,7 @@ static int JS_PRINTF_FORMAT_ATTR(3, 4) JS_ThrowTypeErrorOrFalse(JSContext *ctx,
     }
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #endif // __GNUC__
@@ -7002,7 +7002,7 @@ static JSValue JS_ThrowSyntaxErrorAtom(JSContext *ctx, const char *fmt, JSAtom a
     JS_AtomGetStr(ctx, buf, sizeof(buf), atom);
     return JS_ThrowSyntaxError(ctx, fmt, buf);
 }
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop // ignored "-Wformat-nonliteral"
 #endif // __GNUC__
 
diff --git a/quickjs.h b/quickjs.h
index cd529274c..4d7903a5f 100644
--- a/quickjs.h
+++ b/quickjs.h
@@ -49,7 +49,8 @@ extern "C" {
 
 /* Borrowed from Folly */
 #ifndef JS_PRINTF_FORMAT
-#ifdef _MSC_VER
+/* Clang on Windows doesn't seem to support _Printf_format_string_ */
+#if defined(_MSC_VER) && !defined(__clang__)
 #include <sal.h>
 #define JS_PRINTF_FORMAT _Printf_format_string_
 #define JS_PRINTF_FORMAT_ATTR(format_param, dots_param)