summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2017-10-06 13:12:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:39:47 +0000
commit7deed8ff4edb4225c8c69a137d6f59a473682daa (patch)
treebd0126adb36f5d6d61066dc35cd5a6da6045099f
parentb085162a8e1c89db16eee5cea54814b0c6f43c3d (diff)
downloadpoky-7deed8ff4edb4225c8c69a137d6f59a473682daa.tar.gz
gdb: fix gdbserver not working in musl/mips context
Similar to https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek (From OE-Core rev: c33426e2011054043c276c72b8af651a9aa179ad) Signed-off-by: André Draszik <adraszik@tycoint.com> Acked-by: Sylvain Lemieux <slemieux@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 0b9d94a5e54191f93659f7b4e7a3cb4376487823) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gdb/gdb-7.12.1.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch45
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-7.12.1.inc b/meta/recipes-devtools/gdb/gdb-7.12.1.inc
index b15a2b5832..634756ce45 100644
--- a/meta/recipes-devtools/gdb/gdb-7.12.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.12.1.inc
@@ -15,6 +15,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
15 file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ 15 file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \
16 file://0009-Change-order-of-CFLAGS.patch \ 16 file://0009-Change-order-of-CFLAGS.patch \
17 file://0010-resolve-restrict-keyword-conflict.patch \ 17 file://0010-resolve-restrict-keyword-conflict.patch \
18 file://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \
18" 19"
19SRC_URI[md5sum] = "193453347ddced7acb6b1cd2ee8f2e4b" 20SRC_URI[md5sum] = "193453347ddced7acb6b1cd2ee8f2e4b"
20SRC_URI[sha256sum] = "4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186" 21SRC_URI[sha256sum] = "4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186"
diff --git a/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch b/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
new file mode 100644
index 0000000000..c5484f789d
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
@@ -0,0 +1,45 @@
1From 56893a61aa4f0270fa8d1197b9848247f90fce0d Mon Sep 17 00:00:00 2001
2From: Yousong Zhou <yszhou4tech@gmail.com>
3Date: Fri, 24 Mar 2017 10:36:03 +0800
4Subject: [PATCH] Fix invalid sigprocmask call
5
6The POSIX document says
7
8 The pthread_sigmask() and sigprocmask() functions shall fail if:
9
10 [EINVAL]
11 The value of the how argument is not equal to one of the defined values.
12
13and this is how musl-libc is currently doing. Fix the call to be safe
14and correct
15
16 [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_sigmask.html
17
18gdb/ChangeLog:
192017-03-24 Yousong Zhou <yszhou4tech@gmail.com>
20
21 * common/signals-state-save-restore.c (save_original_signals_state):
22 Fix invalid sigprocmask call.
23---
24Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek]
25Signed-off-by: André Draszik <adraszik@tycoint.com>
26 gdb/ChangeLog | 5 +++++
27 gdb/common/signals-state-save-restore.c | 2 +-
28 2 files changed, 6 insertions(+), 1 deletion(-)
29
30diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c
31index d11a9ae..734335c 100644
32--- a/gdb/common/signals-state-save-restore.c
33+++ b/gdb/common/signals-state-save-restore.c
34@@ -41,7 +41,7 @@ save_original_signals_state (void)
35 int i;
36 int res;
37
38- res = sigprocmask (0, NULL, &original_signal_mask);
39+ res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask);
40 if (res == -1)
41 perror_with_name (("sigprocmask"));
42
43--
442.6.4
45