summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-01-28 22:00:25 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-01-28 22:00:53 +0000
commit46f7eccbcb65b1b4b6802480250c153d05854c35 (patch)
tree5cedf93d4962006bb58cad4343d46efe571a6612 /sys-devel
parentdev-ruby/org-ruby: add ruby26 (diff)
downloadgentoo-46f7eccbcb65b1b4b6802480250c153d05854c35.tar.gz
gentoo-46f7eccbcb65b1b4b6802480250c153d05854c35.tar.bz2
gentoo-46f7eccbcb65b1b4b6802480250c153d05854c35.zip
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 <slyfox@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gdb/files/gdb-8.2.1-aarch64-musl.patch49
-rw-r--r--sys-devel/gdb/gdb-8.2.1.ebuild3
2 files changed, 51 insertions, 1 deletions
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 <szabolcs.nagy@arm.com>
+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 <asm/sigcontext.h>
++#include <signal.h>
+ #include <sys/utsname.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+--
+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() {