From nobody Wed Dec 22 10:05:37 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 55DE61904F62; Wed, 22 Dec 2021 10:05:42 +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 4JJpqR3fZyz4YHp; Wed, 22 Dec 2021 10:05:39 +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 C114E1B458; Wed, 22 Dec 2021 10:05:37 +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 1BMA5bHX091604; Wed, 22 Dec 2021 10:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5b6A091603; Wed, 22 Dec 2021 10:05:37 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:37 GMT Message-Id: <202112221005.1BMA5b6A091603@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: 878b1c5ff39a - stable/12 - Reapply r332965 (by emaste): 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: 878b1c5ff39ad2aed00b1003f8bc1d6ac612c50b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167540; 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=twNTLRZJ4B4lzhR9ntqAnNTcJ1vP4ukD6+08jVvy8CQ=; b=ryFeTajWznIgln3nIRBmjWZSBq2qN9WGzPRyIN1P8BOPCx8j7JinGma6HlUxl2sWBDnjvE cvS0jKPUzxoj7vEQe4Ga2R1znYFP8eRx7YKFf7N0XhO4U+2rGrDMN1PWzF6+gMnMDYpXuG plxod8KLu73BC108zPHtt4wWyqKwEU3A6hXPFT3xbxJFgMr6092CfQ57loQHY+e1tfNXMw wf2xkKBvjd26wxWcJyGaiWB6+kV6zG70dZ+yTcnPQKn2t9qHCwHwCAIafVBXjZAZlkvRs2 t9Ik9cnqTe/GQsZv8yd9ORTkZXT5ZsrrqgclOeZD05mUrOhFRWv6C2gItKc/Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167541; a=rsa-sha256; cv=none; b=sbkjutq1vb35EFdup6qEXVctYSDPO94gptAZr2DlknnQOeY2SFFgER5uiTcAaPy6SPdrnm kk+S3Ju/se4wN3umWntSjfJNbxrHT98+KJwoA5PISIHfYPoL+WfQxFdBO53mN91tVoPpmr XS0aImMs4aEsW+uyhgyWL1HVQhgpvLqeFEJSGZNZi7DGTRWUm7rUgQmNWB/S9EjFWYg5wf jViKp+1tyIb9+IjQ/Qi4CY84/1wTMit86p72G/VUS+hJOtoTfX9mmKiWpTskovLDTAJh+6 J6dQeQNJy+xcM0f6hIVAJNa3htdvt1cav08NPkbVWdrgVFV3cyDCFRLAlKqzNA== 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=878b1c5ff39ad2aed00b1003f8bc1d6ac612c50b commit 878b1c5ff39ad2aed00b1003f8bc1d6ac612c50b Author: Dimitry Andric AuthorDate: 2020-08-06 16:20:45 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:17 +0000 Reapply r332965 (by emaste): lldb: remove assertion that target_arch is FreeBSD The target is not necessarily a FreeBSD binary - for example, it may be a Linux binary running under the linuxulator. Basic ptrace (live) debugging already worked in this case, except for the assertion. Sponsored by: Turing Robotic Industries Inc. (cherry picked from commit 165786983df7513a6ab99dfe42e9526e46816ca5) --- .../llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp | 1 - 1 file changed, 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 79cb0e3bb8cd..896f68eadfe1 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp @@ -161,7 +161,6 @@ lldb::RegisterContextSP FreeBSDThread::GetRegisterContext() { RegisterInfoInterface *reg_interface = nullptr; const ArchSpec &target_arch = GetProcess()->GetTarget().GetArchitecture(); - assert(target_arch.GetTriple().getOS() == llvm::Triple::FreeBSD); switch (target_arch.GetMachine()) { case llvm::Triple::aarch64: break;