From nobody Tue May 31 16:21:50 2022 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 D489A1B6B155; Tue, 31 May 2022 16:21:50 +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 4LCHbf4w0Tz4jWr; Tue, 31 May 2022 16:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654014110; 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=V87H1+aC2xwGretNq03WBDa4Z+/rU8VTAJFfq31oKEc=; b=O4XVMQ/lvbC+M3nOomiIi+eDe8aQ2OgsBZgDEwKBSn3Bk8fMLaCozLpdeEg6Laos5oyksM aoTQ9PiJaqfvFHLVs5ft99coUfI2eHb6HxK/JMdniagjjO2Bm1gNii0GGfiujnO5zy08nc TbY8908YjE41rJROXOB2q7zNDYJeyRnKfq7bgBmyx+Lch9BAfufEH0+zkeALRFsV77kIPv DIq2qsRegvrOxGlhPw28Hlcw/fQRPmHY2XSsIT/AujNvDXyfEXiukjIO26a90r87qCR/Z4 YRUump/kHJoyYqvio7UKsYxW94+hlV+dPKfrUTO/62BwpVyyQvITfm4/L66rrA== 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 896D66EAA; Tue, 31 May 2022 16:21:50 +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 24VGLobN053681; Tue, 31 May 2022 16:21:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24VGLoOM053680; Tue, 31 May 2022 16:21:50 GMT (envelope-from git) Date: Tue, 31 May 2022 16:21:50 GMT Message-Id: <202205311621.24VGLoOM053680@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: c5722abb6a5c - main - devel/gdb: Fix build of GDB 12.1 on older aarch64 systems. 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5722abb6a5cfdb83d8e2fcce271cba48dbd7281 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654014110; 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=V87H1+aC2xwGretNq03WBDa4Z+/rU8VTAJFfq31oKEc=; b=X9r/Qbt2Y09xrHTPAyJATVrfSq5/Ukh6u5WoK8huHbfx1GOSqHWtF6AUGC+dEYlvs3Qujj NSUANXXXCeEmnFTNlbVZyxHdCMnCrvFgKc3qoCgBcrHw47spotkidbLUmPJNE1ueJHcj/F BK73kyzUmR/m3R50BaJ/b1djAXHK5ZuA9zNis15wQ0SqO6ZYGZcya3w2ukDQMiCUu6hA1h ub88NQegu60a5xK9I8qlKG5aNpBKrOSM2juxJLFGjwptOABY4BSP1hMA5sYSY6pqVLE4SS Zy9hj5WgpDBYVJ2uIOAsPhiaDHnsCSStUjgGMPhyDePWmhCuIFfdeOKegqVQkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654014110; a=rsa-sha256; cv=none; b=vqkhL9uC7pTGpBJvAOON/q4+wR2hkKbTZmLifJOQ//aPU1ewxQP+HVPRbXlkOD4JVvHrIl /2pIsNTADHalu35BZGW2ObMZLiP5eYzVayVwJFV9hBP4vX3v3YHR0QXx1GUceVF4+GCLnp NCFfYlqotYWHkleFcseyyep7SrdzXZsHYD5iQYXCgUcYAGSRw4QA4xgaI5hcqOfUuZEUcK 5l5hWJq2GvrjDktLQZ0zSd7HD2nxuSTcELZxESfFWJuZ41FUYr+29ygNxJAk+ofKeBEZns Np2vDxkMy7Mccwb8Ie5jx60tOxn7BoRiaQUaMmooWXWp6CR8LtR1CWOnj5zzSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c5722abb6a5cfdb83d8e2fcce271cba48dbd7281 commit c5722abb6a5cfdb83d8e2fcce271cba48dbd7281 Author: John Baldwin AuthorDate: 2022-05-30 23:24:21 +0000 Commit: John Baldwin CommitDate: 2022-05-30 23:24:21 +0000 devel/gdb: Fix build of GDB 12.1 on older aarch64 systems. Backport a patch from GDB to fix the build on aarch64 systems that do not support hardware breakpoints/watchpoints. PR: 264095 Reviewed by: pizzamig (maintainer), mikael Differential Revision: https://reviews.freebsd.org/D35332 --- devel/gdb/Makefile | 3 ++- devel/gdb/files/commit-b2fdd31b03e | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index ec71f616457f..34d6cb9dc681 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -65,7 +65,8 @@ EXTRA_PATCHES= ${FILESDIR}/commit-711b0b6698f \ ${FILESDIR}/commit-414d5848bb2 \ ${FILESDIR}/commit-0a765c1a8e9 \ ${FILESDIR}/commit-f9fbb7636a5 \ - ${FILESDIR}/commit-b7fe5463cf0 + ${FILESDIR}/commit-b7fe5463cf0 \ + ${FILESDIR}/commit-b2fdd31b03e LIB_DEPENDS+= libexpat.so:textproc/expat2 VER= ${DISTVERSION:S/.//g} diff --git a/devel/gdb/files/commit-b2fdd31b03e b/devel/gdb/files/commit-b2fdd31b03e new file mode 100644 index 000000000000..2445c0f11a70 --- /dev/null +++ b/devel/gdb/files/commit-b2fdd31b03e @@ -0,0 +1,32 @@ +commit 7b45afa632e0484835a56cc60393d5e118c0f605 +Author: John Baldwin +Date: Thu May 26 14:14:46 2022 -0700 + + aarch64-fbsd-nat: Move definition of debug_regs_probed under HAVE_DBREG. + + This fixes the build on older FreeBSD systems without support for + hardware breakpoints/watchpoints. + + (cherry picked from commit b2fdd31b03ef01a9a790ecb5d0dc0fea209b49ec) + +diff --git gdb/aarch64-fbsd-nat.c gdb/aarch64-fbsd-nat.c +index 910bf5bb190..ab6ab36a39a 100644 +--- gdb/aarch64-fbsd-nat.c ++++ gdb/aarch64-fbsd-nat.c +@@ -76,7 +76,6 @@ struct aarch64_fbsd_nat_target final : public fbsd_nat_target + }; + + static aarch64_fbsd_nat_target the_aarch64_fbsd_nat_target; +-bool aarch64_fbsd_nat_target::debug_regs_probed; + + /* Fetch register REGNUM from the inferior. If REGNUM is -1, do this + for all registers. */ +@@ -154,6 +153,8 @@ aarch64_fbsd_nat_target::read_description () + } + + #ifdef HAVE_DBREG ++bool aarch64_fbsd_nat_target::debug_regs_probed; ++ + /* Set of threads which need to update debug registers on next resume. */ + + static std::unordered_set aarch64_debug_pending_threads;