diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-02-14 07:42:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-15 10:26:42 +0000 |
commit | cb1c0307a8283e7ef3f9d0faa5553b5747f0ac23 (patch) | |
tree | 3f0fd00a3c35650e2cc120cfc2554d1a6c5d7565 | |
parent | b05234524a6db7b764a1bb987f3bca44789a58ca (diff) | |
download | poky-cb1c0307a8283e7ef3f9d0faa5553b5747f0ac23.tar.gz |
gdb: Upgrade to 9.1 release
Drop security patches which are now in 9.1 already
Forward port rest of patches to 9.1
Detailed changes [1]
[1] https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00008.html
(From OE-Core rev: 4c1c01e023b123c86a418fdeddb69be097deef86)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-8.3.1.inc | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-9.1.inc | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross_9.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch (renamed from meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch (renamed from meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (renamed from meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch) | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch (renamed from meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch) | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch (renamed from meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch) | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch (renamed from meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch) | 9 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch (renamed from meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch) | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch (renamed from meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch) | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch (renamed from meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch) | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch (renamed from meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch) | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch | 132 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb_9.1.bb (renamed from meta/recipes-devtools/gdb/gdb_8.3.1.bb) | 0 |
19 files changed, 124 insertions, 270 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 23f2ce97c3..82530f5e7b 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" | |||
19 | GCCVERSION ?= "9.%" | 19 | GCCVERSION ?= "9.%" |
20 | SDKGCCVERSION ?= "${GCCVERSION}" | 20 | SDKGCCVERSION ?= "${GCCVERSION}" |
21 | BINUVERSION ?= "2.33%" | 21 | BINUVERSION ?= "2.33%" |
22 | GDBVERSION ?= "8.3%" | 22 | GDBVERSION ?= "9.%" |
23 | GLIBCVERSION ?= "2.31" | 23 | GLIBCVERSION ?= "2.31" |
24 | LINUXLIBCVERSION ?= "5.4%" | 24 | LINUXLIBCVERSION ?= "5.4%" |
25 | QEMUVERSION ?= "4.2%" | 25 | QEMUVERSION ?= "4.2%" |
diff --git a/meta/recipes-devtools/gdb/gdb-8.3.1.inc b/meta/recipes-devtools/gdb/gdb-8.3.1.inc deleted file mode 100644 index aec913f3ce..0000000000 --- a/meta/recipes-devtools/gdb/gdb-8.3.1.inc +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
3 | file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | ||
5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ | ||
8 | file://0001-gdbserver-ctrl-c-handling.patch \ | ||
9 | file://0002-make-man-install-relative-to-DESTDIR.patch \ | ||
10 | file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ | ||
11 | file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ | ||
12 | file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ | ||
13 | file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ | ||
14 | file://0007-use-asm-sgidefs.h.patch \ | ||
15 | file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ | ||
16 | file://0009-Change-order-of-CFLAGS.patch \ | ||
17 | file://0010-resolve-restrict-keyword-conflict.patch \ | ||
18 | file://0011-Fix-invalid-sigprocmask-call.patch \ | ||
19 | file://CVE-2019-1010180.patch \ | ||
20 | " | ||
21 | SRC_URI[md5sum] = "73b6a5d8141672c62bf851cd34c4aa83" | ||
22 | SRC_URI[sha256sum] = "1e55b4d7cdca7b34be12f4ceae651623aa73b2fd640152313f9f66a7149757c4" | ||
diff --git a/meta/recipes-devtools/gdb/gdb-9.1.inc b/meta/recipes-devtools/gdb/gdb-9.1.inc new file mode 100644 index 0000000000..d019e6b384 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-9.1.inc | |||
@@ -0,0 +1,21 @@ | |||
1 | LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
3 | file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | ||
5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" | ||
6 | |||
7 | SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ | ||
8 | file://0001-make-man-install-relative-to-DESTDIR.patch \ | ||
9 | file://0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ | ||
10 | file://0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ | ||
11 | file://0004-Add-support-for-Renesas-SH-sh4-architecture.patch \ | ||
12 | file://0005-Dont-disable-libreadline.a-when-using-disable-static.patch \ | ||
13 | file://0006-use-asm-sgidefs.h.patch \ | ||
14 | file://0007-Use-exorted-definitions-of-SIGRTMIN.patch \ | ||
15 | file://0008-Change-order-of-CFLAGS.patch \ | ||
16 | file://0009-resolve-restrict-keyword-conflict.patch \ | ||
17 | file://0010-Fix-invalid-sigprocmask-call.patch \ | ||
18 | file://0011-gdbserver-ctrl-c-handling.patch \ | ||
19 | " | ||
20 | SRC_URI[md5sum] = "f7e9f6236c425097d9e5f18a6ac40655" | ||
21 | SRC_URI[sha256sum] = "699e0ec832fdd2f21c8266171ea5bf44024bd05164fdf064e4d10cc4cf0d1737" | ||
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb index 301035940c..301035940c 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_9.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb index 50cf159fdb..50cf159fdb 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_9.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch deleted file mode 100644 index 71fe7f83b6..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0001-gdbserver-ctrl-c-handling.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | This problem was created by the upstream commit 78708b7c8c | ||
2 | After applying the commit, it will send SIGINT to the process group(-signal_pid). | ||
3 | But if we use gdbserver send SIGINT, and the attached process is not a process | ||
4 | group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails to | ||
5 | interrupt the attached process. | ||
6 | |||
7 | Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] | ||
8 | |||
9 | Author: Josh Gao | ||
10 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
11 | |||
12 | Index: gdb-8.2/gdb/gdbserver/linux-low.c | ||
13 | =================================================================== | ||
14 | --- gdb-8.2.orig/gdb/gdbserver/linux-low.c | ||
15 | +++ gdb-8.2/gdb/gdbserver/linux-low.c | ||
16 | @@ -5940,9 +5940,7 @@ linux_look_up_symbols (void) | ||
17 | static void | ||
18 | linux_request_interrupt (void) | ||
19 | { | ||
20 | - /* Send a SIGINT to the process group. This acts just like the user | ||
21 | - typed a ^C on the controlling terminal. */ | ||
22 | - kill (-signal_pid, SIGINT); | ||
23 | + kill (signal_pid, SIGINT); | ||
24 | } | ||
25 | |||
26 | /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET | ||
diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch index 60479e5410..82287ea13a 100644 --- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch +++ b/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001 | 1 | From 036f8e1d387f65e52cb021dbb1bd28e8b75cf017 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 02:27:55 +0000 | 3 | Date: Mon, 2 Mar 2015 02:27:55 +0000 |
4 | Subject: [PATCH 02/11] make man install relative to DESTDIR | 4 | Subject: [PATCH] make man install relative to DESTDIR |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in | 13 | diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in |
14 | index 227e4cfbc2..8c3457e0bd 100644 | 14 | index c6de14122c..c4b1214946 100644 |
15 | --- a/sim/common/Makefile.in | 15 | --- a/sim/common/Makefile.in |
16 | +++ b/sim/common/Makefile.in | 16 | +++ b/sim/common/Makefile.in |
17 | @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) | 17 | @@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias) |
@@ -23,6 +23,3 @@ index 227e4cfbc2..8c3457e0bd 100644 | |||
23 | infodir = @infodir@ | 23 | infodir = @infodir@ |
24 | includedir = @includedir@ | 24 | includedir = @includedir@ |
25 | 25 | ||
26 | -- | ||
27 | 2.18.0 | ||
28 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch index cf54c74c09..6067caf63d 100644 --- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch +++ b/meta/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001 | 1 | From 6bff2862f9597f324a9385eb2f828e838e51a8a1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 23 Mar 2016 06:30:09 +0000 | 3 | Date: Wed, 23 Mar 2016 06:30:09 +0000 |
4 | Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined | 4 | Subject: [PATCH] mips-linux-nat: Define _ABIO32 if not defined |
5 | 5 | ||
6 | This helps building gdb on mips64 on musl, since | 6 | This helps building gdb on mips64 on musl, since |
7 | musl does not provide sgidefs.h this define is | 7 | musl does not provide sgidefs.h this define is |
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | 1 file changed, 4 insertions(+) | 16 | 1 file changed, 4 insertions(+) |
17 | 17 | ||
18 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c | 18 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c |
19 | index 32835c16b2..68a7587af2 100644 | 19 | index 104c972f24..7f575b3363 100644 |
20 | --- a/gdb/mips-linux-nat.c | 20 | --- a/gdb/mips-linux-nat.c |
21 | +++ b/gdb/mips-linux-nat.c | 21 | +++ b/gdb/mips-linux-nat.c |
22 | @@ -41,6 +41,10 @@ | 22 | @@ -41,6 +41,10 @@ |
@@ -30,6 +30,3 @@ index 32835c16b2..68a7587af2 100644 | |||
30 | 30 | ||
31 | class mips_linux_nat_target final : public linux_nat_trad_target | 31 | class mips_linux_nat_target final : public linux_nat_trad_target |
32 | { | 32 | { |
33 | -- | ||
34 | 2.18.0 | ||
35 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch index 170d512ef7..c4bab7bb1a 100644 --- a/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ b/meta/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From da30370c1e3ff7728a857e119e0529a9f097086e Mon Sep 17 00:00:00 2001 | 1 | From d5817bcf2f7313699bfa85b41220d862db327664 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 18:32:14 -0700 | 3 | Date: Sat, 30 Apr 2016 18:32:14 -0700 |
4 | Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems | 4 | Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems |
@@ -6,14 +6,13 @@ Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | |||
10 | --- | 9 | --- |
11 | gdb/gdbserver/linux-ppc-low.c | 6 ++++++ | 10 | gdb/gdbserver/linux-ppc-low.c | 6 ++++++ |
12 | gdb/nat/ppc-linux.h | 6 ++++++ | 11 | gdb/nat/ppc-linux.h | 6 ++++++ |
13 | 2 files changed, 12 insertions(+) | 12 | 2 files changed, 12 insertions(+) |
14 | 13 | ||
15 | diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c | 14 | diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c |
16 | index 1b695e53..1978347c 100644 | 15 | index 5d8d67bec2..ffcf65ab58 100644 |
17 | --- a/gdb/gdbserver/linux-ppc-low.c | 16 | --- a/gdb/gdbserver/linux-ppc-low.c |
18 | +++ b/gdb/gdbserver/linux-ppc-low.c | 17 | +++ b/gdb/gdbserver/linux-ppc-low.c |
19 | @@ -23,7 +23,13 @@ | 18 | @@ -23,7 +23,13 @@ |
@@ -31,7 +30,7 @@ index 1b695e53..1978347c 100644 | |||
31 | #include "arch/ppc-linux-common.h" | 30 | #include "arch/ppc-linux-common.h" |
32 | #include "arch/ppc-linux-tdesc.h" | 31 | #include "arch/ppc-linux-tdesc.h" |
33 | diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h | 32 | diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h |
34 | index f1561b3b..40399361 100644 | 33 | index d937a65b69..1fd54b4a0e 100644 |
35 | --- a/gdb/nat/ppc-linux.h | 34 | --- a/gdb/nat/ppc-linux.h |
36 | +++ b/gdb/nat/ppc-linux.h | 35 | +++ b/gdb/nat/ppc-linux.h |
37 | @@ -18,7 +18,13 @@ | 36 | @@ -18,7 +18,13 @@ |
diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch index f840cafe2e..fd165d4b81 100644 --- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch +++ b/meta/recipes-devtools/gdb/gdb/0004-Add-support-for-Renesas-SH-sh4-architecture.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001 | 1 | From 505f10a0ea1a8bba0584859d9a348bb779593ec2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 2 Mar 2015 02:31:12 +0000 | 3 | Date: Mon, 2 Mar 2015 02:31:12 +0000 |
4 | Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. | 4 | Subject: [PATCH] Add support for Renesas SH (sh4) architecture. |
5 | 5 | ||
6 | gdb (7.4-1~cvs20111117.2) experimental; urgency=low | 6 | gdb (7.4-1~cvs20111117.2) experimental; urgency=low |
7 | . | 7 | . |
@@ -27,10 +27,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
27 | 11 files changed, 617 insertions(+), 29 deletions(-) | 27 | 11 files changed, 617 insertions(+), 29 deletions(-) |
28 | 28 | ||
29 | diff --git a/gdb/Makefile.in b/gdb/Makefile.in | 29 | diff --git a/gdb/Makefile.in b/gdb/Makefile.in |
30 | index c76a4e4394..921fdadb49 100644 | 30 | index c3e074b21f..42dd7af59c 100644 |
31 | --- a/gdb/Makefile.in | 31 | --- a/gdb/Makefile.in |
32 | +++ b/gdb/Makefile.in | 32 | +++ b/gdb/Makefile.in |
33 | @@ -2326,6 +2326,8 @@ ALLDEPFILES = \ | 33 | @@ -2317,6 +2317,8 @@ ALLDEPFILES = \ |
34 | sh-nbsd-nat.c \ | 34 | sh-nbsd-nat.c \ |
35 | sh-nbsd-tdep.c \ | 35 | sh-nbsd-tdep.c \ |
36 | sh-tdep.c \ | 36 | sh-tdep.c \ |
@@ -38,12 +38,12 @@ index c76a4e4394..921fdadb49 100644 | |||
38 | + sh-linux-nat.c \ | 38 | + sh-linux-nat.c \ |
39 | sol2-tdep.c \ | 39 | sol2-tdep.c \ |
40 | solib-aix.c \ | 40 | solib-aix.c \ |
41 | solib-spu.c \ | 41 | solib-svr4.c \ |
42 | diff --git a/gdb/configure.host b/gdb/configure.host | 42 | diff --git a/gdb/configure.host b/gdb/configure.host |
43 | index 23a2f16399..39a886ec53 100644 | 43 | index ce52823729..5b5173a71a 100644 |
44 | --- a/gdb/configure.host | 44 | --- a/gdb/configure.host |
45 | +++ b/gdb/configure.host | 45 | +++ b/gdb/configure.host |
46 | @@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;; | 46 | @@ -148,6 +148,7 @@ riscv*-*-linux*) gdb_host=linux ;; |
47 | 47 | ||
48 | s390*-*-linux*) gdb_host=linux ;; | 48 | s390*-*-linux*) gdb_host=linux ;; |
49 | 49 | ||
@@ -52,7 +52,7 @@ index 23a2f16399..39a886ec53 100644 | |||
52 | gdb_host=nbsd ;; | 52 | gdb_host=nbsd ;; |
53 | sh*-*-openbsd*) gdb_host=nbsd ;; | 53 | sh*-*-openbsd*) gdb_host=nbsd ;; |
54 | diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c | 54 | diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c |
55 | index db93967910..4109c549e8 100644 | 55 | index 13c10eeeda..1d0d583a64 100644 |
56 | --- a/gdb/sh-linux-tdep.c | 56 | --- a/gdb/sh-linux-tdep.c |
57 | +++ b/gdb/sh-linux-tdep.c | 57 | +++ b/gdb/sh-linux-tdep.c |
58 | @@ -18,14 +18,37 @@ | 58 | @@ -18,14 +18,37 @@ |
@@ -93,7 +93,7 @@ index db93967910..4109c549e8 100644 | |||
93 | #include "glibc-tdep.h" | 93 | #include "glibc-tdep.h" |
94 | #include "sh-tdep.h" | 94 | #include "sh-tdep.h" |
95 | #include "linux-tdep.h" | 95 | #include "linux-tdep.h" |
96 | @@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { | 96 | @@ -181,9 +204,505 @@ static struct tramp_frame sh_linux_rt_sigreturn_tramp_frame = { |
97 | sh_linux_rt_sigreturn_init | 97 | sh_linux_rt_sigreturn_init |
98 | }; | 98 | }; |
99 | 99 | ||
@@ -600,7 +600,7 @@ index db93967910..4109c549e8 100644 | |||
600 | 600 | ||
601 | /* GNU/Linux uses SVR4-style shared libraries. */ | 601 | /* GNU/Linux uses SVR4-style shared libraries. */ |
602 | diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c | 602 | diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c |
603 | index fe64cf979a..4417114cd0 100644 | 603 | index e3aee0ac28..5958cf3688 100644 |
604 | --- a/gdb/sh-tdep.c | 604 | --- a/gdb/sh-tdep.c |
605 | +++ b/gdb/sh-tdep.c | 605 | +++ b/gdb/sh-tdep.c |
606 | @@ -21,6 +21,9 @@ | 606 | @@ -21,6 +21,9 @@ |
@@ -655,7 +655,7 @@ index fe64cf979a..4417114cd0 100644 | |||
655 | len = TYPE_LENGTH (type); | 655 | len = TYPE_LENGTH (type); |
656 | val = sh_justify_value_in_reg (gdbarch, args[argnum], len); | 656 | val = sh_justify_value_in_reg (gdbarch, args[argnum], len); |
657 | 657 | ||
658 | @@ -1834,7 +1820,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, | 658 | @@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, |
659 | reg->how = DWARF2_FRAME_REG_UNDEFINED; | 659 | reg->how = DWARF2_FRAME_REG_UNDEFINED; |
660 | } | 660 | } |
661 | 661 | ||
@@ -664,7 +664,7 @@ index fe64cf979a..4417114cd0 100644 | |||
664 | sh_alloc_frame_cache (void) | 664 | sh_alloc_frame_cache (void) |
665 | { | 665 | { |
666 | struct sh_frame_cache *cache; | 666 | struct sh_frame_cache *cache; |
667 | @@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void) | 667 | @@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) |
668 | return cache; | 668 | return cache; |
669 | } | 669 | } |
670 | 670 | ||
@@ -673,7 +673,7 @@ index fe64cf979a..4417114cd0 100644 | |||
673 | sh_frame_cache (struct frame_info *this_frame, void **this_cache) | 673 | sh_frame_cache (struct frame_info *this_frame, void **this_cache) |
674 | { | 674 | { |
675 | struct gdbarch *gdbarch = get_frame_arch (this_frame); | 675 | struct gdbarch *gdbarch = get_frame_arch (this_frame); |
676 | @@ -1928,9 +1914,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) | 676 | @@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) |
677 | return cache; | 677 | return cache; |
678 | } | 678 | } |
679 | 679 | ||
@@ -686,7 +686,7 @@ index fe64cf979a..4417114cd0 100644 | |||
686 | { | 686 | { |
687 | struct gdbarch *gdbarch = get_frame_arch (this_frame); | 687 | struct gdbarch *gdbarch = get_frame_arch (this_frame); |
688 | struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); | 688 | struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); |
689 | @@ -1944,7 +1930,7 @@ sh_frame_prev_register (struct frame_info *this_frame, | 689 | @@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_info *this_frame, |
690 | the current frame. Frob regnum so that we pull the value from | 690 | the current frame. Frob regnum so that we pull the value from |
691 | the correct place. */ | 691 | the correct place. */ |
692 | if (regnum == gdbarch_pc_regnum (gdbarch)) | 692 | if (regnum == gdbarch_pc_regnum (gdbarch)) |
@@ -695,7 +695,7 @@ index fe64cf979a..4417114cd0 100644 | |||
695 | 695 | ||
696 | if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) | 696 | if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) |
697 | return frame_unwind_got_memory (this_frame, regnum, | 697 | return frame_unwind_got_memory (this_frame, regnum, |
698 | @@ -2255,8 +2241,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, | 698 | @@ -2234,8 +2220,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, |
699 | static struct gdbarch * | 699 | static struct gdbarch * |
700 | sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) | 700 | sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) |
701 | { | 701 | { |
@@ -705,7 +705,7 @@ index fe64cf979a..4417114cd0 100644 | |||
705 | 705 | ||
706 | /* If there is already a candidate, use it. */ | 706 | /* If there is already a candidate, use it. */ |
707 | arches = gdbarch_list_lookup_by_info (arches, &info); | 707 | arches = gdbarch_list_lookup_by_info (arches, &info); |
708 | @@ -2268,6 +2254,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) | 708 | @@ -2247,6 +2233,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) |
709 | tdep = XCNEW (struct gdbarch_tdep); | 709 | tdep = XCNEW (struct gdbarch_tdep); |
710 | gdbarch = gdbarch_alloc (&info, tdep); | 710 | gdbarch = gdbarch_alloc (&info, tdep); |
711 | 711 | ||
@@ -724,7 +724,7 @@ index fe64cf979a..4417114cd0 100644 | |||
724 | set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); | 724 | set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); |
725 | set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); | 725 | set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); |
726 | set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); | 726 | set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); |
727 | @@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) | 727 | @@ -2398,10 +2396,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) |
728 | break; | 728 | break; |
729 | } | 729 | } |
730 | 730 | ||
@@ -738,7 +738,7 @@ index fe64cf979a..4417114cd0 100644 | |||
738 | frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); | 738 | frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); |
739 | 739 | ||
740 | diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h | 740 | diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h |
741 | index 59acd35b88..be3f998d84 100644 | 741 | index 76e2e76e39..2710f63010 100644 |
742 | --- a/gdb/sh-tdep.h | 742 | --- a/gdb/sh-tdep.h |
743 | +++ b/gdb/sh-tdep.h | 743 | +++ b/gdb/sh-tdep.h |
744 | @@ -21,6 +21,12 @@ | 744 | @@ -21,6 +21,12 @@ |
@@ -821,7 +821,7 @@ index 59acd35b88..be3f998d84 100644 | |||
821 | where each general-purpose register is stored inside the associated | 821 | where each general-purpose register is stored inside the associated |
822 | core file section. */ | 822 | core file section. */ |
823 | diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp | 823 | diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp |
824 | index 9879f0ca47..cbc0e4d5f7 100644 | 824 | index 4914498f98..6e25cbed18 100644 |
825 | --- a/gdb/testsuite/gdb.asm/asm-source.exp | 825 | --- a/gdb/testsuite/gdb.asm/asm-source.exp |
826 | +++ b/gdb/testsuite/gdb.asm/asm-source.exp | 826 | +++ b/gdb/testsuite/gdb.asm/asm-source.exp |
827 | @@ -116,6 +116,11 @@ switch -glob -- [istarget] { | 827 | @@ -116,6 +116,11 @@ switch -glob -- [istarget] { |
@@ -909,6 +909,3 @@ index 756606880f..1205a9bc9c 100644 | |||
909 | 909 | ||
910 | static int count = 0; | 910 | static int count = 0; |
911 | 911 | ||
912 | -- | ||
913 | 2.18.0 | ||
914 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch index 9ae3ee62be..d0360da439 100644 --- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch +++ b/meta/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001 | 1 | From d132f21d89157e980574da7d0c949f6dd17df8c3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:25:03 -0700 | 3 | Date: Sat, 30 Apr 2016 15:25:03 -0700 |
4 | Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static | 4 | Subject: [PATCH] Dont disable libreadline.a when using --disable-static |
5 | 5 | ||
6 | If gdb is configured with --disable-static then this is dutifully passed to | 6 | If gdb is configured with --disable-static then this is dutifully passed to |
7 | readline which then disables libreadline.a, which causes a problem when gdb | 7 | readline which then disables libreadline.a, which causes a problem when gdb |
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 2 files changed, 3 insertions(+), 2 deletions(-) | 19 | 2 files changed, 3 insertions(+), 2 deletions(-) |
20 | 20 | ||
21 | diff --git a/Makefile.def b/Makefile.def | 21 | diff --git a/Makefile.def b/Makefile.def |
22 | index 75063b6d12..c27bbe4d28 100644 | 22 | index 311feb9de3..24c0685d48 100644 |
23 | --- a/Makefile.def | 23 | --- a/Makefile.def |
24 | +++ b/Makefile.def | 24 | +++ b/Makefile.def |
25 | @@ -105,7 +105,8 @@ host_modules= { module= libiconv; | 25 | @@ -105,7 +105,8 @@ host_modules= { module= libiconv; |
@@ -33,10 +33,10 @@ index 75063b6d12..c27bbe4d28 100644 | |||
33 | host_modules= { module= sim; }; | 33 | host_modules= { module= sim; }; |
34 | host_modules= { module= texinfo; no_install= true; }; | 34 | host_modules= { module= texinfo; no_install= true; }; |
35 | diff --git a/Makefile.in b/Makefile.in | 35 | diff --git a/Makefile.in b/Makefile.in |
36 | index 7814fe745f..3b0dc7cbb0 100644 | 36 | index 1aabf6ede4..d957efde81 100644 |
37 | --- a/Makefile.in | 37 | --- a/Makefile.in |
38 | +++ b/Makefile.in | 38 | +++ b/Makefile.in |
39 | @@ -25470,7 +25470,7 @@ configure-readline: | 39 | @@ -25510,7 +25510,7 @@ configure-readline: |
40 | $$s/$$module_srcdir/configure \ | 40 | $$s/$$module_srcdir/configure \ |
41 | --srcdir=$${topdir}/$$module_srcdir \ | 41 | --srcdir=$${topdir}/$$module_srcdir \ |
42 | $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ | 42 | $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ |
@@ -45,6 +45,3 @@ index 7814fe745f..3b0dc7cbb0 100644 | |||
45 | || exit 1 | 45 | || exit 1 |
46 | @endif readline | 46 | @endif readline |
47 | 47 | ||
48 | -- | ||
49 | 2.18.0 | ||
50 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch index 808f4bfa14..d222d01083 100644 --- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch +++ b/meta/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001 | 1 | From 329e5bf29e934ba99622372a9660865864bb0298 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <amccurdy@gmail.com> | 2 | From: Andre McCurdy <amccurdy@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:29:06 -0700 | 3 | Date: Sat, 30 Apr 2016 15:29:06 -0700 |
4 | Subject: [PATCH 07/11] use <asm/sgidefs.h> | 4 | Subject: [PATCH] use <asm/sgidefs.h> |
5 | 5 | ||
6 | Build fix for MIPS with musl libc | 6 | Build fix for MIPS with musl libc |
7 | 7 | ||
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c | 21 | diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c |
22 | index 68a7587af2..2b77221372 100644 | 22 | index 7f575b3363..dc93a64a93 100644 |
23 | --- a/gdb/mips-linux-nat.c | 23 | --- a/gdb/mips-linux-nat.c |
24 | +++ b/gdb/mips-linux-nat.c | 24 | +++ b/gdb/mips-linux-nat.c |
25 | @@ -31,7 +31,7 @@ | 25 | @@ -31,7 +31,7 @@ |
@@ -31,6 +31,3 @@ index 68a7587af2..2b77221372 100644 | |||
31 | #include "nat/gdb_ptrace.h" | 31 | #include "nat/gdb_ptrace.h" |
32 | #include <asm/ptrace.h> | 32 | #include <asm/ptrace.h> |
33 | #include "inf-ptrace.h" | 33 | #include "inf-ptrace.h" |
34 | -- | ||
35 | 2.18.0 | ||
36 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch index 95bec5fd60..09896611f0 100644 --- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch +++ b/meta/recipes-devtools/gdb/gdb/0007-Use-exorted-definitions-of-SIGRTMIN.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bab0b34672727c50313eb98b8522355cbe1bde36 Mon Sep 17 00:00:00 2001 | 1 | From 782bb2ab9b104dad4bbaed1d9ac769ce7e5b9f4d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:31:40 -0700 | 3 | Date: Sat, 30 Apr 2016 15:31:40 -0700 |
4 | Subject: [PATCH] Use exorted definitions of SIGRTMIN | 4 | Subject: [PATCH] Use exorted definitions of SIGRTMIN |
@@ -14,17 +14,16 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=13012 | |||
14 | Upstream-Status: Submitted | 14 | Upstream-Status: Submitted |
15 | 15 | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | |||
18 | --- | 17 | --- |
19 | gdb/linux-nat.c | 4 ++-- | 18 | gdb/linux-nat.c | 4 ++-- |
20 | gdb/nat/linux-nat.h | 4 ++++ | 19 | gdb/nat/linux-nat.h | 4 ++++ |
21 | 2 files changed, 6 insertions(+), 2 deletions(-) | 20 | 2 files changed, 6 insertions(+), 2 deletions(-) |
22 | 21 | ||
23 | diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c | 22 | diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c |
24 | index 063afe26..fb1d2d5d 100644 | 23 | index 4484fa5c87..3bb0ee7a49 100644 |
25 | --- a/gdb/linux-nat.c | 24 | --- a/gdb/linux-nat.c |
26 | +++ b/gdb/linux-nat.c | 25 | +++ b/gdb/linux-nat.c |
27 | @@ -4713,6 +4713,6 @@ lin_thread_get_thread_signals (sigset_t *set) | 26 | @@ -4588,6 +4588,6 @@ lin_thread_get_thread_signals (sigset_t *set) |
28 | /* NPTL reserves the first two RT signals, but does not provide any | 27 | /* NPTL reserves the first two RT signals, but does not provide any |
29 | way for the debugger to query the signal numbers - fortunately | 28 | way for the debugger to query the signal numbers - fortunately |
30 | they don't change. */ | 29 | they don't change. */ |
@@ -34,10 +33,10 @@ index 063afe26..fb1d2d5d 100644 | |||
34 | + sigaddset (set, SIGRTMIN + 1); | 33 | + sigaddset (set, SIGRTMIN + 1); |
35 | } | 34 | } |
36 | diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h | 35 | diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h |
37 | index 1e32dd9e..b886305d 100644 | 36 | index 44dcbb7758..975d7276f6 100644 |
38 | --- a/gdb/nat/linux-nat.h | 37 | --- a/gdb/nat/linux-nat.h |
39 | +++ b/gdb/nat/linux-nat.h | 38 | +++ b/gdb/nat/linux-nat.h |
40 | @@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); | 39 | @@ -91,4 +91,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); |
41 | 40 | ||
42 | extern int lwp_is_stepping (struct lwp_info *lwp); | 41 | extern int lwp_is_stepping (struct lwp_info *lwp); |
43 | 42 | ||
diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch index bc4bc26835..18168c6bae 100644 --- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch +++ b/meta/recipes-devtools/gdb/gdb/0008-Change-order-of-CFLAGS.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001 | 1 | From 40c9c174590ce6fdc873b453285249fe957f376d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 30 Apr 2016 15:35:39 -0700 | 3 | Date: Sat, 30 Apr 2016 15:35:39 -0700 |
4 | Subject: [PATCH 09/11] Change order of CFLAGS | 4 | Subject: [PATCH] Change order of CFLAGS |
5 | 5 | ||
6 | Lets us override Werror if need be | 6 | Lets us override Werror if need be |
7 | 7 | ||
@@ -13,18 +13,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in | 15 | diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in |
16 | index f2f8a084bd..9528db1364 100644 | 16 | index 16a9f2fd38..b9c8cd9c41 100644 |
17 | --- a/gdb/gdbserver/Makefile.in | 17 | --- a/gdb/gdbserver/Makefile.in |
18 | +++ b/gdb/gdbserver/Makefile.in | 18 | +++ b/gdb/gdbserver/Makefile.in |
19 | @@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@ | 19 | @@ -146,7 +146,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ |
20 | INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ | 20 | INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ |
21 | ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} | 21 | ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) |
22 | INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) | 22 | INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) |
23 | -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER | 23 | -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER |
24 | +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER | 24 | +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER |
25 | 25 | ||
26 | # LDFLAGS is specifically reserved for setting from the command line | 26 | # LDFLAGS is specifically reserved for setting from the command line |
27 | # when running make. | 27 | # when running make. |
28 | -- | ||
29 | 2.18.0 | ||
30 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch index 809d52f250..8f15c49d0e 100644 --- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch +++ b/meta/recipes-devtools/gdb/gdb/0009-resolve-restrict-keyword-conflict.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001 | 1 | From 5b69a98f6bb7363a1f79f29bac2b25b7df6d2fdd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 10 May 2016 08:47:05 -0700 | 3 | Date: Tue, 10 May 2016 08:47:05 -0700 |
4 | Subject: [PATCH 10/11] resolve restrict keyword conflict | 4 | Subject: [PATCH] resolve restrict keyword conflict |
5 | 5 | ||
6 | GCC detects that we call 'restrict' as param name in function | 6 | GCC detects that we call 'restrict' as param name in function |
7 | signatures and complains since both params are called 'restrict' | 7 | signatures and complains since both params are called 'restrict' |
@@ -11,13 +11,13 @@ Upstream-Status: Pending | |||
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | gdb/gnulib/import/sys_time.in.h | 8 ++++---- | 14 | gnulib/import/sys_time.in.h | 8 ++++---- |
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
16 | 16 | ||
17 | diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h | 17 | diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h |
18 | index b4a0e49c50..d22cea9aaf 100644 | 18 | index d535a6a48b..7c34d5a1aa 100644 |
19 | --- a/gdb/gnulib/import/sys_time.in.h | 19 | --- a/gnulib/import/sys_time.in.h |
20 | +++ b/gdb/gnulib/import/sys_time.in.h | 20 | +++ b/gnulib/import/sys_time.in.h |
21 | @@ -93,20 +93,20 @@ struct timeval | 21 | @@ -93,20 +93,20 @@ struct timeval |
22 | # define gettimeofday rpl_gettimeofday | 22 | # define gettimeofday rpl_gettimeofday |
23 | # endif | 23 | # endif |
@@ -43,6 +43,3 @@ index b4a0e49c50..d22cea9aaf 100644 | |||
43 | # endif | 43 | # endif |
44 | _GL_CXXALIASWARN (gettimeofday); | 44 | _GL_CXXALIASWARN (gettimeofday); |
45 | # if defined __cplusplus && defined GNULIB_NAMESPACE | 45 | # if defined __cplusplus && defined GNULIB_NAMESPACE |
46 | -- | ||
47 | 2.18.0 | ||
48 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch index bce025c391..5209c00275 100644 --- a/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch +++ b/meta/recipes-devtools/gdb/gdb/0010-Fix-invalid-sigprocmask-call.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001 | 1 | From bc1f01ff5e524f7777083024bce348a9b0017a7a Mon Sep 17 00:00:00 2001 |
2 | From: Yousong Zhou <yszhou4tech@gmail.com> | 2 | From: Yousong Zhou <yszhou4tech@gmail.com> |
3 | Date: Fri, 24 Mar 2017 10:36:03 +0800 | 3 | Date: Fri, 24 Mar 2017 10:36:03 +0800 |
4 | Subject: [PATCH 11/11] Fix invalid sigprocmask call | 4 | Subject: [PATCH] Fix invalid sigprocmask call |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -28,22 +28,19 @@ Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede- | |||
28 | Signed-off-by: André Draszik <adraszik@tycoint.com> | 28 | Signed-off-by: André Draszik <adraszik@tycoint.com> |
29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
30 | --- | 30 | --- |
31 | gdb/common/signals-state-save-restore.c | 2 +- | 31 | gdb/gdbsupport/signals-state-save-restore.c | 2 +- |
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | 32 | 1 file changed, 1 insertion(+), 1 deletion(-) |
33 | 33 | ||
34 | diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c | 34 | diff --git a/gdb/gdbsupport/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c |
35 | index 5bb66321bb..6597decbc6 100644 | 35 | index c292d498da..af9dcaeb08 100644 |
36 | --- a/gdb/common/signals-state-save-restore.c | 36 | --- a/gdb/gdbsupport/signals-state-save-restore.c |
37 | +++ b/gdb/common/signals-state-save-restore.c | 37 | +++ b/gdb/gdbsupport/signals-state-save-restore.c |
38 | @@ -41,7 +41,7 @@ save_original_signals_state (bool quiet) | 38 | @@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) |
39 | int i; | 39 | int i; |
40 | int res; | 40 | int res; |
41 | 41 | ||
42 | - res = sigprocmask (0, NULL, &original_signal_mask); | 42 | - res = gdb_sigmask (0, NULL, &original_signal_mask); |
43 | + res = sigprocmask (SIG_BLOCK, NULL, &original_signal_mask); | 43 | + res = gdb_sigmask (SIG_BLOCK, NULL, &original_signal_mask); |
44 | if (res == -1) | 44 | if (res == -1) |
45 | perror_with_name (("sigprocmask")); | 45 | perror_with_name (("sigprocmask")); |
46 | 46 | ||
47 | -- | ||
48 | 2.18.0 | ||
49 | |||
diff --git a/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch new file mode 100644 index 0000000000..eedd94c4d4 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/0011-gdbserver-ctrl-c-handling.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 3d6700d38153a0ec8e0800de703a5089a8cd3d2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Nov 2018 18:00:23 -0800 | ||
4 | Subject: [PATCH] gdbserver ctrl-c handling | ||
5 | |||
6 | This problem was created by the upstream commit 78708b7c8c | ||
7 | After applying the commit, it will send SIGINT to the process | ||
8 | group(-signal_pid). | ||
9 | But if we use gdbserver send SIGINT, and the attached process is not a | ||
10 | process | ||
11 | group leader, then the "kill (-signal_pid, SIGINT)" returns error and | ||
12 | fails to | ||
13 | interrupt the attached process. | ||
14 | |||
15 | Upstream-Status: Submitted | ||
16 | [https://sourceware.org/bugzilla/show_bug.cgi?id=18945] | ||
17 | |||
18 | Author: Josh Gao | ||
19 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | --- | ||
22 | gdb/gdbserver/linux-low.c | 4 +--- | ||
23 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
24 | |||
25 | diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c | ||
26 | index 4255795ea6..762f8bafb6 100644 | ||
27 | --- a/gdb/gdbserver/linux-low.c | ||
28 | +++ b/gdb/gdbserver/linux-low.c | ||
29 | @@ -5904,9 +5904,7 @@ linux_look_up_symbols (void) | ||
30 | static void | ||
31 | linux_request_interrupt (void) | ||
32 | { | ||
33 | - /* Send a SIGINT to the process group. This acts just like the user | ||
34 | - typed a ^C on the controlling terminal. */ | ||
35 | - kill (-signal_pid, SIGINT); | ||
36 | + kill (signal_pid, SIGINT); | ||
37 | } | ||
38 | |||
39 | /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET | ||
diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch b/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch deleted file mode 100644 index 46b2b3a713..0000000000 --- a/meta/recipes-devtools/gdb/gdb/CVE-2019-1010180.patch +++ /dev/null | |||
@@ -1,132 +0,0 @@ | |||
1 | From 950b74950f6020eda38647f22e9077ac7f68ca49 Mon Sep 17 00:00:00 2001 | ||
2 | From: Keith Seitz <keiths@redhat.com> | ||
3 | Date: Wed, 16 Oct 2019 11:33:59 -0700 | ||
4 | Subject: [PATCH] DWARF reader: Reject sections with invalid sizes | ||
5 | |||
6 | This is another fuzzer bug, gdb/23567. This time, the fuzzer has | ||
7 | specifically altered the size of .debug_str: | ||
8 | |||
9 | $ eu-readelf -S objdump | ||
10 | Section Headers: | ||
11 | [Nr] Name Type Addr Off Size ES Flags Lk Inf Al | ||
12 | [31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1 | ||
13 | |||
14 | When this file is loaded into GDB, the DWARF reader crashes attempting | ||
15 | to access the string table (or it may just store a bunch of nonsense): | ||
16 | |||
17 | [gdb-8.3-6-fc30] | ||
18 | $ gdb -nx -q objdump | ||
19 | BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size | ||
20 | Reading symbols from /path/to/objdump... | ||
21 | Segmentation fault (core dumped) | ||
22 | |||
23 | Nick has already committed a BFD patch to issue the warning seen above. | ||
24 | |||
25 | [gdb master 6acc1a0b] | ||
26 | $ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size | ||
27 | Reading symbols from /path/to/objdump... | ||
28 | (gdb) inf func | ||
29 | All defined functions: | ||
30 | |||
31 | File ./../include/dwarf2.def: | ||
32 | 186: const | ||
33 | |||
34 | 8 *>(.: | ||
35 | ;'@�B); | ||
36 | 747: const | ||
37 | |||
38 | 8 *�(.: | ||
39 | ;'@�B); | ||
40 | 701: const | ||
41 | |||
42 | 8 *�D � | ||
43 | (.: | ||
44 | ;'@�B); | ||
45 | 71: const | ||
46 | |||
47 | 8 *(.: | ||
48 | ;'@�B); | ||
49 | /* and more gibberish */ | ||
50 | |||
51 | Consider read_indirect_string_at_offset_from: | ||
52 | |||
53 | static const char * | ||
54 | read_indirect_string_at_offset_from (struct objfile *objfile, | ||
55 | bfd *abfd, LONGEST str_offset, | ||
56 | struct dwarf2_section_info *sect, | ||
57 | const char *form_name, | ||
58 | const char *sect_name) | ||
59 | { | ||
60 | dwarf2_read_section (objfile, sect); | ||
61 | if (sect->buffer == NULL) | ||
62 | error (_("%s used without %s section [in module %s]"), | ||
63 | form_name, sect_name, bfd_get_filename (abfd)); | ||
64 | if (str_offset >= sect->size) | ||
65 | error (_("%s pointing outside of %s section [in module %s]"), | ||
66 | form_name, sect_name, bfd_get_filename (abfd)); | ||
67 | gdb_assert (HOST_CHAR_BIT == 8); | ||
68 | if (sect->buffer[str_offset] == '\0') | ||
69 | return NULL; | ||
70 | return (const char *) (sect->buffer + str_offset); | ||
71 | } | ||
72 | |||
73 | With sect_size being ginormous, the code attempts to access | ||
74 | sect->buffer[GINORMOUS], and depending on the layout of memory, | ||
75 | GDB either stores a bunch of gibberish strings or crashes. | ||
76 | |||
77 | This is an attempt to mitigate this by implementing a similar approach | ||
78 | used by BFD. In our case, we simply reject the section with the invalid | ||
79 | length: | ||
80 | |||
81 | $ ./gdb -nx -q objdump | ||
82 | BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size | ||
83 | Reading symbols from /path/to/objdump... | ||
84 | |||
85 | warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump] | ||
86 | DW_FORM_strp used without .debug_str section [in module /path/to/objdump] | ||
87 | (No debugging symbols found in /path/to/objdump) | ||
88 | (gdb) | ||
89 | |||
90 | Unfortunately, I have not found a way to regression test this, since it | ||
91 | requires poking ELF section headers. | ||
92 | |||
93 | gdb/ChangeLog: | ||
94 | 2019-10-16 Keith Seitz <keiths@redhat.com> | ||
95 | |||
96 | PR gdb/23567 | ||
97 | * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard | ||
98 | sections whose size is greater than the file size. | ||
99 | |||
100 | Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f | ||
101 | |||
102 | CVE: CVE-2019-1010180 | ||
103 | Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=950b74950f6020eda38647f22e9077ac7f68ca49] | ||
104 | [Removed Changelog entry] | ||
105 | Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com> | ||
106 | --- | ||
107 | gdb/dwarf2read.c | 9 +++++++++ | ||
108 | 2 files changed, 15 insertions(+) | ||
109 | |||
110 | diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c | ||
111 | index 0443b55..a78f818 100644 | ||
112 | --- a/gdb/dwarf2read.c | ||
113 | +++ b/gdb/dwarf2read.c | ||
114 | @@ -2338,6 +2338,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp, | ||
115 | if ((aflag & SEC_HAS_CONTENTS) == 0) | ||
116 | { | ||
117 | } | ||
118 | + else if (elf_section_data (sectp)->this_hdr.sh_size | ||
119 | + > bfd_get_file_size (abfd)) | ||
120 | + { | ||
121 | + bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size; | ||
122 | + warning (_("Discarding section %s which has a section size (%s" | ||
123 | + ") larger than the file size [in module %s]"), | ||
124 | + bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)), | ||
125 | + bfd_get_filename (abfd)); | ||
126 | + } | ||
127 | else if (section_is_p (sectp->name, &names.info)) | ||
128 | { | ||
129 | this->info.s.section = sectp; | ||
130 | -- | ||
131 | 2.7.4 | ||
132 | |||
diff --git a/meta/recipes-devtools/gdb/gdb_8.3.1.bb b/meta/recipes-devtools/gdb/gdb_9.1.bb index d70757a151..d70757a151 100644 --- a/meta/recipes-devtools/gdb/gdb_8.3.1.bb +++ b/meta/recipes-devtools/gdb/gdb_9.1.bb | |||