From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE78F138334 for ; Mon, 28 Jan 2019 22:01:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF1ADE09EC; Mon, 28 Jan 2019 22:01:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8EBBEE09EC for ; Mon, 28 Jan 2019 22:01:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DDA5335DA5 for ; Mon, 28 Jan 2019 22:01:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36FE74D3 for ; Mon, 28 Jan 2019 22:01:06 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1548712853.46f7eccbcb65b1b4b6802480250c153d05854c35.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/files/, sys-devel/gdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch sys-devel/gdb/gdb-8.2.1.ebuild X-VCS-Directories: sys-devel/gdb/ sys-devel/gdb/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 46f7eccbcb65b1b4b6802480250c153d05854c35 X-VCS-Branch: master Date: Mon, 28 Jan 2019 22:01:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30d51d3d-cf33-42ff-b025-71ee2e32e868 X-Archives-Hash: 49293601a248bf1a2e28d2bc0ba4f116 commit: 46f7eccbcb65b1b4b6802480250c153d05854c35 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jan 28 22:00:25 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jan 28 22:00:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f7eccb sys-devel/gdb: pull aarch64-musl fix, bug #676620 Reported-by: eroen Closes: https://bugs.gentoo.org/676620 Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch | 49 ++++++++++++++++++++++++ sys-devel/gdb/gdb-8.2.1.ebuild | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch new file mode 100644 index 00000000000..70f42df90a9 --- /dev/null +++ b/sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/676620 + +From 51b4f73a37c2e7eec31e932fc3c8dae879735f63 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy +Date: Thu, 13 Dec 2018 17:47:17 +0000 +Subject: [PATCH] AArch64: Fix the gdb build with musl libc + +Including asm/sigcontext.h together with libc headers is not valid. In +general linux headers may not work with libc headers, so mixing them +should be avoided, especially when the linux header defines types that +are also exposed in libc headers. + +In case of asm/sigcontext.h glibc happens to work because glibc signal.h +directly includes it, but e.g. in musl libc signal.h replicates the +sigcontext.h definitions in an abi compatible way which are in conflict +with the linux definitions when both headers are included. + +Since old linux headers or old libc headers may not have the necessary +definitions, gdb has to replicate the definitions it relies on anyway. +Which is fine since all definitions must be ABI stable. For linux apis +that are not available via libc headers, replicating the definitions in +gdb is the most reliable way to use them. + +Note: asm/ptrace.h includes asm/sigcontext.h in some versions of linux +headers, which is just as problematic and should be fixed in linux. + +gdb/ChangeLog: + + * nat/aarch64-sve-linux-ptrace.h: Include signal.h instead of + asm/sigcontext.h. +--- + gdb/ChangeLog | 5 +++++ + gdb/nat/aarch64-sve-linux-ptrace.h | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +--- a/gdb/nat/aarch64-sve-linux-ptrace.h ++++ b/gdb/nat/aarch64-sve-linux-ptrace.h +@@ -20,7 +20,7 @@ + #ifndef AARCH64_SVE_LINUX_PTRACE_H + #define AARCH64_SVE_LINUX_PTRACE_H + +-#include ++#include + #include + #include + #include +-- +2.20.1 + diff --git a/sys-devel/gdb/gdb-8.2.1.ebuild b/sys-devel/gdb/gdb-8.2.1.ebuild index c7a030aa640..57cee06eec9 100644 --- a/sys-devel/gdb/gdb-8.2.1.ebuild +++ b/sys-devel/gdb/gdb-8.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -93,6 +93,7 @@ S=${WORKDIR}/${PN}-${MY_PV} PATCHES=( "${FILESDIR}"/${PN}-8.2-tinfow.patch "${FILESDIR}"/${PN}-8.2-sparc-fix-syntax.patch + "${FILESDIR}"/${PN}-8.2.1-aarch64-musl.patch ) pkg_setup() {