From nobody Wed Dec 22 10:05:28 2021 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 9B81919049E4; Wed, 22 Dec 2021 10:05:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJpqF3MzRz4YGg; Wed, 22 Dec 2021 10:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 823881B070; Wed, 22 Dec 2021 10:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5Sil091398; Wed, 22 Dec 2021 10:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5SqH091397; Wed, 22 Dec 2021 10:05:28 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:28 GMT Message-Id: <202112221005.1BMA5SqH091397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 732b9d1535db - stable/12 - Reapply r311164: 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/12 X-Git-Reftype: branch X-Git-Commit: 732b9d1535db272ad9d1f6f963da0eecf53ff0ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167530; 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=bXdjLRm8g7cRjWRnOCNx3fkY7PCUHAUU38qjRaW+qIw=; b=TSrF5hWAj5O88W42qhqTdBSmvad5hJ9bjy0XSGfT50pg8hjEAUOan2vBJ5Xp7Z63v6YkaO hWdwJVy5rMkdAlnSvRsx1MMKK3netpFsmmvdNE5dV7leTaHR0boDNymOM40VzHx73KQoB1 rTTNbE5X74W9RrOBUsrd+gSCwMCheP5CWp5oJCYW2IXA/368kfAbq5grCKGk983yWJxV6N tvJx6sXrFjTJxoPRlN2nzdFz5E8cx/iiLKyET56eW8X7l4L0WhL87I1Pxz/Iv238XZB232 DUqPz1OSq3t/7kfU+piv5k6bSnP6zcF2oXN5wqAXaFz8Oa8gOkYhWYrCxMminA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167530; a=rsa-sha256; cv=none; b=VFCeGe9rxAcP348kEehsy5u0mkmACwx2tnAx1fvR1ilBCQUc4FHUawQIpcqCnwIMCNAsXc FKGRp6U2gcVZIiIibRJGTMZIhooeYrvwhItwx/tnXRAaWWwZgUedHeqkeVZWzHpxgML30P PTvdgsoLTHQ9j6KJMEuoc89cZ3ABAE96LOC+pXL9wA+1pFHdKPmzRQQgA9rhicrnvFV0Ya Aa5etqt1s8BiTreC/3Va4SaoFdj4D1r22s6/VTxH5d2+lykrGdSrZ5sHXx+YRJ07WYNGds KTvhET/xniIiByYu+Zwl/uyvtvO0YWQfJw31bxBGiZy8dsDGKirvNCtgjTHIcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=732b9d1535db272ad9d1f6f963da0eecf53ff0ce commit 732b9d1535db272ad9d1f6f963da0eecf53ff0ce Author: Dimitry Andric AuthorDate: 2020-08-02 18:16:04 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:12 +0000 Reapply r311164: Fix printf format warning on i386. (cherry picked from commit f82466688624c6ff2f24b6157944ab18d0b9d456) --- .../llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp index 48dbddb86cca..79cb0e3bb8cd 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp @@ -278,7 +278,7 @@ void FreeBSDThread::DidStop() { void FreeBSDThread::WillResume(lldb::StateType resume_state) { Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_THREAD)); - LLDB_LOGF(log, "tid %lu resume_state = %s", GetID(), + LLDB_LOGF(log, "tid %" PRIu64 " resume_state = %s", GetID(), lldb_private::StateAsCString(resume_state)); ProcessSP process_sp(GetProcess()); ProcessFreeBSD *process = static_cast(process_sp.get());