diff --git a/build/build-clang/clang-14.json b/build/build-clang/clang-14.json index c0190e920cd52..cabe98b492319 100644 --- a/build/build-clang/clang-14.json +++ b/build/build-clang/clang-14.json @@ -11,7 +11,6 @@ "win64-no-symlink.patch", "D116995.diff", "revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch", - "revert-llvmorg-14-init-11890-gf86deb18cab6.patch", - "llvmorg-15-init-283-g4db89e23190d.patch" + "revert-llvmorg-14-init-11890-gf86deb18cab6.patch" ] } diff --git a/build/build-clang/llvmorg-15-init-283-g4db89e23190d.patch b/build/build-clang/llvmorg-15-init-283-g4db89e23190d.patch deleted file mode 100644 index 0c3a3c8b2df63..0000000000000 --- a/build/build-clang/llvmorg-15-init-283-g4db89e23190d.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4db89e23190d1d1590d88df08056d327e651c94c Mon Sep 17 00:00:00 2001 -From: Shoaib Meenai -Date: Thu, 3 Feb 2022 13:39:54 -0800 -Subject: [PATCH] [cmake] Increase -fms-compatibility-version in Windows - toolchain file - -Make it match LLVM's new minimum requirement (after https://reviews.llvm.org/D114639). ---- - llvm/cmake/platforms/WinMsvc.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/cmake/platforms/WinMsvc.cmake b/llvm/cmake/platforms/WinMsvc.cmake -index d30701a31858..ebb4da419e46 100644 ---- a/llvm/cmake/platforms/WinMsvc.cmake -+++ b/llvm/cmake/platforms/WinMsvc.cmake -@@ -259,7 +259,7 @@ set(CROSS_TOOLCHAIN_FLAGS_NATIVE "${_CTF_NATIVE_DEFAULT}" CACHE STRING "") - set(COMPILE_FLAGS - -D_CRT_SECURE_NO_WARNINGS - --target=${TRIPLE_ARCH}-windows-msvc -- -fms-compatibility-version=19.14 -+ -fms-compatibility-version=19.20 - -imsvc "${ATLMFC_INCLUDE}" - -imsvc "${MSVC_INCLUDE}" - -imsvc "${WINSDK_INCLUDE}/ucrt" --- -2.35.0.1.g829a698654 - diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 05e8652d22d61..5a9dfbcbb46a1 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -350,11 +350,11 @@ clang-5.0: revision: 6a075b6de4cafebec9ca1ff9eec7229a617c93f6 clang-14: - description: clang 14.0.3 source code + description: clang 14.0.4 source code fetch: type: git repo: https://github.com/llvm/llvm-project - revision: 1f9140064dfbfb0bbda8e51306ea51080b2f7aac + revision: 29f1039a7285a5c3a9c353d054140bf2556d4c4d clang-trunk: description: clang main branch source code