diff options
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-8.2.1.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0012-AArch64-Fix-the-gdb-build-with-musl-libc.patch | 52 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-8.2.1.inc b/meta/recipes-devtools/gdb/gdb-8.2.1.inc index cb8d189f2a..f28b57439c 100644 --- a/meta/recipes-devtools/gdb/gdb-8.2.1.inc +++ b/meta/recipes-devtools/gdb/gdb-8.2.1.inc | |||
@@ -18,6 +18,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ | |||
18 | file://gdbserver-ctrl-c-handling.patch \ | 18 | file://gdbserver-ctrl-c-handling.patch \ |
19 | file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \ | 19 | file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \ |
20 | file://CVE-2017-9778.patch \ | 20 | file://CVE-2017-9778.patch \ |
21 | file://0012-AArch64-Fix-the-gdb-build-with-musl-libc.patch \ | ||
21 | " | 22 | " |
22 | SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70" | 23 | SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70" |
23 | SRC_URI[sha256sum] = "0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202" | 24 | SRC_URI[sha256sum] = "0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202" |
diff --git a/meta/recipes-devtools/gdb/gdb/0012-AArch64-Fix-the-gdb-build-with-musl-libc.patch b/meta/recipes-devtools/gdb/gdb/0012-AArch64-Fix-the-gdb-build-with-musl-libc.patch new file mode 100644 index 0000000000..f35033c122 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0012-AArch64-Fix-the-gdb-build-with-musl-libc.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From cbbf1a8ba7f037ba3b83f090829edcbab542c285 Mon Sep 17 00:00:00 2001 | ||
2 | From: Szabolcs Nagy <szabolcs.nagy@arm.com> | ||
3 | Date: Thu, 13 Dec 2018 17:47:17 +0000 | ||
4 | Subject: [PATCH] AArch64: Fix the gdb build with musl libc | ||
5 | |||
6 | Including asm/sigcontext.h together with libc headers is not valid. In | ||
7 | general linux headers may not work with libc headers, so mixing them | ||
8 | should be avoided, especially when the linux header defines types that | ||
9 | are also exposed in libc headers. | ||
10 | |||
11 | In case of asm/sigcontext.h glibc happens to work because glibc signal.h | ||
12 | directly includes it, but e.g. in musl libc signal.h replicates the | ||
13 | sigcontext.h definitions in an abi compatible way which are in conflict | ||
14 | with the linux definitions when both headers are included. | ||
15 | |||
16 | Since old linux headers or old libc headers may not have the necessary | ||
17 | definitions, gdb has to replicate the definitions it relies on anyway. | ||
18 | Which is fine since all definitions must be ABI stable. For linux apis | ||
19 | that are not available via libc headers, replicating the definitions in | ||
20 | gdb is the most reliable way to use them. | ||
21 | |||
22 | Note: asm/ptrace.h includes asm/sigcontext.h in some versions of linux | ||
23 | headers, which is just as problematic and should be fixed in linux. | ||
24 | |||
25 | gdb/ChangeLog: | ||
26 | |||
27 | * nat/aarch64-sve-linux-ptrace.h: Include signal.h instead of | ||
28 | asm/sigcontext.h. | ||
29 | |||
30 | [ChangeLog entry stripped so that patch applies cleanly] | ||
31 | Upstream-Status: Backport | ||
32 | Signed-off-by: Paul Barker <paul@betafive.co.uk> | ||
33 | --- | ||
34 | gdb/nat/aarch64-sve-linux-ptrace.h | 2 +- | ||
35 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
36 | |||
37 | diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h | ||
38 | index 029e753ffe..172ae39432 100644 | ||
39 | --- a/gdb/nat/aarch64-sve-linux-ptrace.h | ||
40 | +++ b/gdb/nat/aarch64-sve-linux-ptrace.h | ||
41 | @@ -20,7 +20,7 @@ | ||
42 | #ifndef AARCH64_SVE_LINUX_PTRACE_H | ||
43 | #define AARCH64_SVE_LINUX_PTRACE_H | ||
44 | |||
45 | -#include <asm/sigcontext.h> | ||
46 | +#include <signal.h> | ||
47 | #include <sys/utsname.h> | ||
48 | #include <sys/ptrace.h> | ||
49 | #include <asm/ptrace.h> | ||
50 | -- | ||
51 | 2.17.1 | ||
52 | |||