From nobody Sun Sep 20 07:03:44 2026 X-Original-To: dev-commits-src-branches@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 4hnclj36T1z6t16L for ; Sun, 20 Sep 2026 07:03:45 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hnclh6P8yz4Gks for ; Sun, 20 Sep 2026 07:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789887824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+h5qjnEACBenO4C+WUEj0GAxdTe60iJghiW0OqD0xt0=; b=PeIy1KLBMoZkZ4JCQ7+H1GrKtDjupc1MejpWtdU8tib6a0Syky04uAoIzakFDXDnI80Oay yImx7wmXLPDKcmQ5riDFGxGto6WYCDv2IAWJ/DFwmOmdRxf/BKpP5DQQy02/4HBInbG0Gh f4mV5Tz9j1GAxllAxSeDOX8xGTrXbWu9ufmXgS66if/C8/a39ckjfvMfELXiAtafPcZV05 oStxSbg6Qc9IQV9KldijF6MjUS9n859Ynf2qKlVnZrjWBtqyZM81XvO+ehwLbJfKb5Tp7l dPOPg4M1rwemRx9GlaonmR/mTWU1jK78pCox5JglqrwjIYfFTkIhj2tRMeIEUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789887824; b=M5wUUUS82naXpPd5wThPwdwSJltZdqoZfymlMuflXYwWUBqHUzy0aSkd/YFey/11Nl87jo qoDllIDcDHD6VHRYNdwVVDd+YcWmziT7AxJ7kr59ATMZySOOaYZA2nMT/j/mlUjkUr9Mff 2QVMxmHIqEPmnvBEopYt9gV79K+kDgI+kEVfKxsI15y2Yx0LIQ+9lcfTwOehjLBATUpoCF f6CzTqszukBjMUabpAFT3YBVH2v5ancxiRbiqh7C64fb2riumF3umegmEsFJ38a8n4BIbW y6ctBWOCgSV76T9MgWC7q8rzRE9Q5GnXC6J5c203q9oNHR9h4p2RhAsGhr3Tfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789887824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+h5qjnEACBenO4C+WUEj0GAxdTe60iJghiW0OqD0xt0=; b=iqUSGv3DmINBid8n5CgzIa0681omJVP2ZQbxUAgi99qxhgES60ruMXTzUbputdW0cCoUbf FgZ0pZtcHsdUCURZBKzjJ4VgJQgS/wSCyYXXCFKoIJuA9CG3AU2wDSrBxOhnDHtogXBP4e DSPjttjcnChEa9ZwYcl9YBKYdQe5NRtofYssnpDgvdMiHlhPfGniKRQvawpgTBqIq6eCn1 l59EQnsUkEacj/7m1q5q6tiV4MD2JnbwLZCI1YA9ol360uy4coYJDYfzCsC5UNotJLAgQm jCw+x3+UvK37kdXbZTq/XEeb0pKyR19Jv0ivrV2pH7/IcX9JxbNJuPq9R9Mw/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hnclh5SxZzNFb for ; Sun, 20 Sep 2026 07:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 20 Sep 2026 07:03:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1aea303cc2e8 - stable/14 - Merge commit 1f332ae4f1b3 from llvm-project (by Alexander Kornienko): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1aea303cc2e8f65acba3928b7fcc2196ca82d4c0 Auto-Submitted: auto-generated Date: Sun, 20 Sep 2026 07:03:44 +0000 Message-Id: <6aaf8550.40d78.58db95a0@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1aea303cc2e8f65acba3928b7fcc2196ca82d4c0 commit 1aea303cc2e8f65acba3928b7fcc2196ca82d4c0 Author: Dimitry Andric AuthorDate: 2026-09-17 19:32:45 +0000 Commit: Dimitry Andric CommitDate: 2026-09-20 07:03:05 +0000 Merge commit 1f332ae4f1b3 from llvm-project (by Alexander Kornienko): Fix -Wformat diagnostic after #190965 (#193704) Fixes libunwind compiler diagnostic when building with clang after 034d4dcad6396d1241e8262e69871b8d61da7e4f: ``` In file included from libunwind/src/libunwind.cpp:31: In file included from libunwind/src/UnwindCursor.hpp:52: libunwind/src/CompactUnwinder.hpp:339:46: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] 338 | "function starting at 0x%llX", | ~~~~ | %lX 339 | compactEncoding, functionStart); | ^~~~~~~~~~~~~ libunwind/src/config.h:215:63: note: expanded from macro '_LIBUNWIND_DEBUG_LOG' 215 | #define _LIBUNWIND_DEBUG_LOG(msg, ...) _LIBUNWIND_LOG(msg, __VA_ARGS__) | ~~~ ^~~~~~~~~~~ libunwind/src/config.h:181:45: note: expanded from macro '_LIBUNWIND_LOG' 181 | fprintf(stderr, "libunwind: " msg "\n", __VA_ARGS__); \ | ~~~ ^~~~~~~~~~~ In file included from libunwind/src/libunwind.cpp:31: In file included from libunwind/src/UnwindCursor.hpp:52: libunwind/src/CompactUnwinder.hpp:458:39: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] 457 | "function starting at 0x%llX", | ~~~~ | %lX 458 | encoding, functionStart); | ^~~~~~~~~~~~~ libunwind/src/config.h:215:63: note: expanded from macro '_LIBUNWIND_DEBUG_LOG' 215 | #define _LIBUNWIND_DEBUG_LOG(msg, ...) _LIBUNWIND_LOG(msg, __VA_ARGS__) | ~~~ ^~~~~~~~~~~ libunwind/src/config.h:181:45: note: expanded from macro '_LIBUNWIND_LOG' 181 | fprintf(stderr, "libunwind: " msg "\n", __VA_ARGS__); \ | ~~~ ^~~~~~~~~~~ ``` This avoids a -Werror failure with clang >= 23. MFC after: 3 days (cherry picked from commit 8a8c14464dd372495c9bf4b87c9b88d73f78d587) --- contrib/llvm-project/libunwind/src/CompactUnwinder.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp b/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp index a7a8a153d86a..490f61496998 100644 --- a/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp +++ b/contrib/llvm-project/libunwind/src/CompactUnwinder.hpp @@ -12,6 +12,7 @@ #ifndef __COMPACT_UNWINDER_HPP__ #define __COMPACT_UNWINDER_HPP__ +#include #include #include @@ -335,8 +336,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingRBPFrame( default: (void)functionStart; _LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for " - "function starting at 0x%llX", - compactEncoding, functionStart); + "function starting at 0x%" PRIu64 "X", + compactEncoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8; @@ -454,8 +455,8 @@ int CompactUnwinder_x86_64::stepWithCompactEncodingFrameless( break; default: _LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for " - "function starting at 0x%llX", - encoding, functionStart); + "function starting at 0x%" PRIu64 "X", + encoding, functionStart); _LIBUNWIND_ABORT("invalid compact unwind encoding"); } savedRegisters += 8;