From nobody Fri Feb 20 15:04:33 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fHYSL15rlz6STDJ for ; Fri, 20 Feb 2026 15:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fHYSK6fnmz3YQF for ; Fri, 20 Feb 2026 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771599874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWzh9yJVoDVD/7E4MSzKYkhYT4ovet5/gE1lBiiwjpg=; b=jrG5x3UuGCQAEWdIwzmfnzu043pSGrG21A2jwnLAcFrcxDhBTswDnsFfYQrXK8ylNLqhH+ REDmRs96MiNT4KJZcbufVGaTXp1UgzBGDr85xTgMewL14vX9PKKiaUp8QKafB4YgxnmJw6 yvChIVyBww61Vu3USO5ekrGRkF0Okd/1YaAvTdk5aIGrLsCtKJvogYscMZVViUjbWXxSs+ GAqQi/EPHlswn0uh8xYWks2XuFDkDSlZyDpoFcH+GeejhO1w3WgCYWDKtgDBzbVnsigtVF LK+tpxZyHr2t1Jhcb1q3uiuGYxRrkIiHVG646n6I2t0FPpJD8bvSjZRmnFikmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771599874; a=rsa-sha256; cv=none; b=IgbFHhxOS27BhQaa+w2t9ZDydYfBVwm2O0tbMGyvj5SRn65zW/6sW3t4KCXwD/N5eT7J53 6E+8MqsCY1W6YCkGTnOjsT22EgrYBNC7MGtuMo1zH3kCCj4Megm26td9VMs4yZ6eUiolNX BUeHsYAL85kOjCAiykxyHLokJ2Luamp61ji3QjCiEwkTTgeZftxVZXPO691Fq/Za5TJZYR HZuEHHzQf3vT5TH0M60gNeD7ZRI56z9C5bRcK1VgK4TzZxv4ONBeXQZ2aHkLICudOToX/E smv3SHN2RUHFBQ4TlSwd7E4tFzq1N2hBp0CLGJaCgM169d911kveE6yFoeEmuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771599874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WWzh9yJVoDVD/7E4MSzKYkhYT4ovet5/gE1lBiiwjpg=; b=WBALr//+RCXaQZjv9p9GlAOUJmjSjs+xBJMd/RaZD/+cbU4uPoj6k6/XvfFUMau33rhVqa DqGMmQLtQnBBgLXT7jZY6j6dWQ4EBQGDPpEjYdBu6l2rbQt8s0QcYzNIjzrot7bG9e/xCk O9u95p3miGaKodh0PuRIBxrMP0IvHs4m6G5QoAbz4tnxMqb73qZGxSeOn7qorGMEgILpAT rXVwK1JyF+d784tOFXh9XlIOYBVkNoJpv9ur90R2ksBpRGOWFc67YC+bonjJvUSOK7PS4o Hebj+exqLJr35Y51ZaofH98EKwWE2XQ//tLe8oW1aTtYoxNtJZOQpYm6VUKNzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fHYSK5yvhzZGX for ; Fri, 20 Feb 2026 15:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e14 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Feb 2026 15:04:33 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Dimitry Andric From: Jan Beich Subject: git: b01beecef8b6 - 2026Q1 - devel/spirv-llvm-translator: unbreak llvm12 flavor with clang 21 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q1 X-Git-Reftype: branch X-Git-Commit: b01beecef8b6fb192a6fb9830f9fd8a6435fb83d Auto-Submitted: auto-generated Date: Fri, 20 Feb 2026 15:04:33 +0000 Message-Id: <69987801.22e14.14913fe7@gitrepo.freebsd.org> The branch 2026Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b01beecef8b6fb192a6fb9830f9fd8a6435fb83d commit b01beecef8b6fb192a6fb9830f9fd8a6435fb83d Author: Dimitry Andric AuthorDate: 2026-02-19 12:31:30 +0000 Commit: Jan Beich CommitDate: 2026-02-20 15:04:22 +0000 devel/spirv-llvm-translator: unbreak llvm12 flavor with clang 21 With clang 21 the llvm12 flavor of devel/spirv-llvm-translator fails to build, with errors similar to: In file included from /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/OCLTypeToSPIRV.cpp:44: In file included from /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/OCLUtil.h:42: In file included from /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/SPIRVInternal.h:43: In file included from /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/libSPIRV/SPIRVEnum.h:44: In file included from /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/libSPIRV/SPIRVOpCode.h:45: /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/libSPIRV/spirv_internal.hpp:120:31: error: constexpr variable 'FunctionControlOptNoneINTELMask' must be initialized by a constant expression 120 | constexpr FunctionControlMask FunctionControlOptNoneINTELMask = | ^ 121 | static_cast(IFunctionControlOptNoneINTELMask); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/devel/spirv-llvm-translator/work-llvm12/SPIRV-LLVM-Translator-12.0.1/lib/SPIRV/libSPIRV/spirv_internal.hpp:121:5: note: integer value 65536 is outside the valid range of values [0, 15] for the enumeration type 'FunctionControlMask' 121 | static_cast(IFunctionControlOptNoneINTELMask); | ^ This is because clang 21 no longer allows enum values outside of the valid range. Upstream spirv refactored a lot in this area, so the llvm13 flavor and later compile fine with clang 21. Fix it by explicitly making the underlying type for the two affected enums uint32_t. PR: 293293 MFH: 2026Q1 (cherry picked from commit d50aa610760e499062d3f050b4402e97531fe376) --- .../files.llvm12/patch-clang21 | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/devel/spirv-llvm-translator/files.llvm12/patch-clang21 b/devel/spirv-llvm-translator/files.llvm12/patch-clang21 new file mode 100644 index 000000000000..8b28d7caeb26 --- /dev/null +++ b/devel/spirv-llvm-translator/files.llvm12/patch-clang21 @@ -0,0 +1,34 @@ +In file included from lib/SPIRV/OCLTypeToSPIRV.cpp:44: +In file included from lib/SPIRV/OCLUtil.h:42: +In file included from lib/SPIRV/SPIRVInternal.h:43: +In file included from lib/SPIRV/libSPIRV/SPIRVEnum.h:44: +In file included from lib/SPIRV/libSPIRV/SPIRVOpCode.h:45: +lib/SPIRV/libSPIRV/spirv_internal.hpp:120:31: error: constexpr variable 'FunctionControlOptNoneINTELMask' must be initialized by a constant expression + 120 | constexpr FunctionControlMask FunctionControlOptNoneINTELMask = + | ^ + 121 | static_cast(IFunctionControlOptNoneINTELMask); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +lib/SPIRV/libSPIRV/spirv_internal.hpp:121:5: note: integer value 65536 is outside the valid range of values [0, 15] for the enumeration type 'FunctionControlMask' + 121 | static_cast(IFunctionControlOptNoneINTELMask); + | ^ + +--- lib/SPIRV/libSPIRV/spirv.hpp.orig 2024-03-21 14:16:00 UTC ++++ lib/SPIRV/libSPIRV/spirv.hpp +@@ -742,7 +742,7 @@ enum FunctionControlShift { + FunctionControlMax = 0x7fffffff, + }; + +-enum FunctionControlMask { ++enum FunctionControlMask : uint32_t { + FunctionControlMaskNone = 0, + FunctionControlInlineMask = 0x00000001, + FunctionControlDontInlineMask = 0x00000002, +@@ -805,7 +805,7 @@ enum MemoryAccessShift { + MemoryAccessMax = 0x7fffffff, + }; + +-enum MemoryAccessMask { ++enum MemoryAccessMask : uint32_t { + MemoryAccessMaskNone = 0, + MemoryAccessVolatileMask = 0x00000001, + MemoryAccessAlignedMask = 0x00000002,