From nobody Sun Sep 20 07:03:31 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 4hnclR5l1yz6t0bV for ; Sun, 20 Sep 2026 07:03:31 +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 4hnclR54Kwz4G5x for ; Sun, 20 Sep 2026 07:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789887811; 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=zjXaoemHvz188YQGpKR36ILimaSrNwoS0qObzungnT8=; b=aHUBk0wJQzfJgh7apngSRbQTFKD4+xCE2jzkFr7xhEmSdQ3ltXdaTdiQNPgLHd5J48MWW9 L6FrD2Jvd5AhhHv8ZF9zQ2QXYXPosjaDSGp/0VqDKw7o8RhPnOZ7dYGNBqAc5sMoIK+0xQ yYg5agiRE9cqvhutuoqM3nZC8+O03IBFp1vwwMs/dDVDrJUmNha+S6LCL++flxm8YBuTmb 1KE3uQGVJGz81tytY9IT7eRehahTl4uqVDSRLvjKNOazhXTyPwZGtgs2woKGhmugFN5q6D rOan49uZsajd+kIaOy8nzGT8OURIg2or3PeFMxlf63pzdj5815jItKpoMB7ODw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789887811; b=pI0CMZl3nNtTHI0/qwISPXzqVKUfE6AAyNVNTMsCJsAvk7Jw+CC4kk84NlB33S37T06swr SUaM5j4quB5p1qA9zJTJHV52/EfGFl3SzRoo5j294dVazOeuY1AtpNffXg4PjBTMF6pq26 zb+ndU2zCkez69mCv8xDkmmces0GUaV/4TK5zXbLvjtxKLDf4DUXYpRrgSt79tIyqW7x+H QzXXR7w3BxiRBelcKzYWByDuNIw5bhFg7dOKtP+auNoxcHEgQPDAhdoGJyGeqV2PQEFxva ZZFXXz7fHCQ0ClxKKiDY8BPn/Ui4ylqDuwzdslfyN21Io5iXqLwx/du+7IIlCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789887811; 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=zjXaoemHvz188YQGpKR36ILimaSrNwoS0qObzungnT8=; b=yozjMS6AN6yzljTF4ekOx+fwBl1MupwjYAeLq/C9KCICWPyAWbz9a5QlNPL+AUGK8wzj7Y kjoqStcclcLiiUbePDzLov3dKIG/8/i2xkgRXWqlh8Rre77+6l3VkKxW4mvqtEEsbSgl6/ UfZiwNAXVuK52fYboGYreTgsfODveXaq4ZlpXpGAl+BSFnO/CgB/nHOKqS+CjdoBTvGCsd 9/YtghYPNkDlR8JOUk3m5EijTBghcqBNERtgZNEiKRT6fsmtaryb6FkXxMT4inawcQDvre 62KsZH7sMIQO2cdk91td40apZZ84Y+v61merEqI8WMaDoRtner/WJLg5eBySOA== 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 4hnclR46SBzNFY for ; Sun, 20 Sep 2026 07:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4090f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 20 Sep 2026 07:03:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 672f2c50d516 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 672f2c50d516ad9051e88240c7132874e7855812 Auto-Submitted: auto-generated Date: Sun, 20 Sep 2026 07:03:31 +0000 Message-Id: <6aaf8543.4090f.42cea8cc@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=672f2c50d516ad9051e88240c7132874e7855812 commit 672f2c50d516ad9051e88240c7132874e7855812 Author: Dimitry Andric AuthorDate: 2026-09-17 19:32:45 +0000 Commit: Dimitry Andric CommitDate: 2026-09-20 07:02:38 +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;