summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gdb
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-05 22:38:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:06 +0100
commit2b7043ca09e1c4262757b6c25c84291640708765 (patch)
treeb8fb4f769ac1514c48b57f2eb38b3be4b74b8844 /meta/recipes-devtools/gdb
parent3578a05aed3899f7a1fa4c843233a86fe6952898 (diff)
downloadpoky-2b7043ca09e1c4262757b6c25c84291640708765.tar.gz
gdb: Update to 8.2
* https://sourceware.org/ml/gdb-announce/2018/msg00003.html * Support RISC-V (From OE-Core rev: 1d9d117e8eee2d3b9802384cb93155aea487f002) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gdb')
-rw-r--r--meta/recipes-devtools/gdb/gdb-8.2.inc (renamed from meta/recipes-devtools/gdb/gdb-8.1.1.inc)7
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_8.2.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_8.1.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch9
-rw-r--r--meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch8
-rw-r--r--meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch26
-rw-r--r--meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch14
-rw-r--r--meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch139
-rw-r--r--meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch10
-rw-r--r--meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch8
-rw-r--r--meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch12
-rw-r--r--meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch10
-rw-r--r--meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch8
-rw-r--r--meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch (renamed from meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch)20
-rw-r--r--meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch56
-rw-r--r--meta/recipes-devtools/gdb/gdb_8.2.bb (renamed from meta/recipes-devtools/gdb/gdb_8.1.1.bb)0
16 files changed, 137 insertions, 190 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-8.1.1.inc b/meta/recipes-devtools/gdb/gdb-8.2.inc
index ad80dd3e4d..999fdde031 100644
--- a/meta/recipes-devtools/gdb/gdb-8.1.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.2.inc
@@ -15,9 +15,8 @@ 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 file://0011-Fix-invalid-sigprocmask-call.patch \
19 file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \
20" 19"
21SRC_URI[md5sum] = "372fa63a53adeee1bfbfd581d8da9e34" 20SRC_URI[md5sum] = "b5a49dbff00d9a87fbe114d14b3101c0"
22SRC_URI[sha256sum] = "97dcc3169bd430270fc29adb65145846a58c1b55cdbb73382a4a89307bdad03c" 21SRC_URI[sha256sum] = "c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39"
23 22
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
index 301035940c..301035940c 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.1.1.bb b/meta/recipes-devtools/gdb/gdb-cross_8.2.bb
index 50cf159fdb..50cf159fdb 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_8.1.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_8.2.bb
diff --git a/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch b/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
index 5d19380e30..2c8783e192 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
+++ b/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
@@ -1,4 +1,4 @@
1From ff37f9360ab6f841f28ced9f23f66542febcc0f6 Mon Sep 17 00:00:00 2001 1From 6ae0fb9b49047cef338262e30273f63139fd1261 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 19 Jan 2016 18:18:52 -0800 3Date: Tue, 19 Jan 2016 18:18:52 -0800
4Subject: [PATCH 01/11] include sys/types.h for mode_t 4Subject: [PATCH 01/11] include sys/types.h for mode_t
@@ -6,15 +6,14 @@ Subject: [PATCH 01/11] include sys/types.h for mode_t
6mode_t is used in target.h, so we need to include sys/types.h to get the 6mode_t is used in target.h, so we need to include sys/types.h to get the
7defintion 7defintion
8 8
9Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 11---
11Upstream-Status: Pending
12
13 gdb/gdbserver/target.h | 1 + 12 gdb/gdbserver/target.h | 1 +
14 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
15 14
16diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h 15diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
17index 25accd2207..7f6bca8aa4 100644 16index fce54e05ad..278cee78a8 100644
18--- a/gdb/gdbserver/target.h 17--- a/gdb/gdbserver/target.h
19+++ b/gdb/gdbserver/target.h 18+++ b/gdb/gdbserver/target.h
20@@ -29,6 +29,7 @@ 19@@ -29,6 +29,7 @@
@@ -26,5 +25,5 @@ index 25accd2207..7f6bca8aa4 100644
26 struct emit_ops; 25 struct emit_ops;
27 struct buffer; 26 struct buffer;
28-- 27--
292.17.0 282.18.0
30 29
diff --git a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
index 83c4dded3b..60479e5410 100644
--- a/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
+++ b/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
@@ -1,7 +1,7 @@
1From 9ce61f97b7758794f06894e934fbb256ff62163e Mon Sep 17 00:00:00 2001 1From b0209f282716bed2c230c7b496fbcc7af503d0cc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 02:27:55 +0000 3Date: Mon, 2 Mar 2015 02:27:55 +0000
4Subject: [PATCH 02/10] make man install relative to DESTDIR 4Subject: [PATCH 02/11] make man install relative to DESTDIR
5 5
6Upstream-Status: Pending 6Upstream-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
13diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in 13diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in
14index 3944956b5d..aa355e8347 100644 14index 227e4cfbc2..8c3457e0bd 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)
@@ -24,5 +24,5 @@ index 3944956b5d..aa355e8347 100644
24 includedir = @includedir@ 24 includedir = @includedir@
25 25
26-- 26--
272.13.1 272.18.0
28 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/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
index 6f7955be13..cf54c74c09 100644
--- a/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
+++ b/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
@@ -1,7 +1,7 @@
1From ca0ef06b7320912df350e730e63f9bafdaa6ea70 Mon Sep 17 00:00:00 2001 1From b14a57d90e1cdd8144cda4c8882bd1db44d26dab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 23 Mar 2016 06:30:09 +0000 3Date: Wed, 23 Mar 2016 06:30:09 +0000
4Subject: [PATCH 03/10] mips-linux-nat: Define _ABIO32 if not defined 4Subject: [PATCH 03/11] mips-linux-nat: Define _ABIO32 if not defined
5 5
6This helps building gdb on mips64 on musl, since 6This helps building gdb on mips64 on musl, since
7musl does not provide sgidefs.h this define is 7musl does not provide sgidefs.h this define is
@@ -9,29 +9,27 @@ only defined when GCC is using o32 ABI, in that
9case gcc emits it as built-in define and hence 9case gcc emits it as built-in define and hence
10it works ok for mips32 10it works ok for mips32
11 11
12Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 14---
14Upstream-Status: Pending 15 gdb/mips-linux-nat.c | 4 ++++
15 16 1 file changed, 4 insertions(+)
16 gdb/mips-linux-nat.c | 5 +++++
17 1 file changed, 5 insertions(+)
18 17
19diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c 18diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
20index 8041d84be7..f2df1b9907 100644 19index 32835c16b2..68a7587af2 100644
21--- a/gdb/mips-linux-nat.c 20--- a/gdb/mips-linux-nat.c
22+++ b/gdb/mips-linux-nat.c 21+++ b/gdb/mips-linux-nat.c
23@@ -47,6 +47,11 @@ 22@@ -41,6 +41,10 @@
23 #ifndef PTRACE_GET_THREAD_AREA
24 #define PTRACE_GET_THREAD_AREA 25 24 #define PTRACE_GET_THREAD_AREA 25
25 #endif 25 #endif
26
27+/* musl does not define and relies on compiler built-in macros for it */ 26+/* musl does not define and relies on compiler built-in macros for it */
28+#ifndef _ABIO32 27+#ifndef _ABIO32
29+#define _ABIO32 1 28+#define _ABIO32 1
30+#endif 29+#endif
31+ 30
32 /* Assume that we have PTRACE_GETREGS et al. support. If we do not, 31 class mips_linux_nat_target final : public linux_nat_trad_target
33 we'll clear this and use PTRACE_PEEKUSER instead. */ 32 {
34 static int have_ptrace_regsets = 1;
35-- 33--
362.13.1 342.18.0
37 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/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
index 357db25ec1..bbe0020bf3 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/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -1,7 +1,7 @@
1From 0f6d71118ca914002fcad78d2c8a518223d06bfb Mon Sep 17 00:00:00 2001 1From 1dd5c44474b01d84de60faded960fef4a0a87e41 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 18:32:14 -0700 3Date: Sat, 30 Apr 2016 18:32:14 -0700
4Subject: [PATCH 04/10] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC 4Subject: [PATCH 04/11] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC
5 systems 5 systems
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 2 files changed, 12 insertions(+) 13 2 files changed, 12 insertions(+)
14 14
15diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c 15diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
16index 33a9feb12c..1a9141faef 100644 16index 47428c1529..841a5e02b9 100644
17--- a/gdb/gdbserver/linux-ppc-low.c 17--- a/gdb/gdbserver/linux-ppc-low.c
18+++ b/gdb/gdbserver/linux-ppc-low.c 18+++ b/gdb/gdbserver/linux-ppc-low.c
19@@ -21,7 +21,13 @@ 19@@ -21,7 +21,13 @@
@@ -28,10 +28,10 @@ index 33a9feb12c..1a9141faef 100644
28+# undef pt_regs 28+# undef pt_regs
29+#endif 29+#endif
30 30
31 #include "nat/ppc-linux.h" 31 #include "arch/ppc-linux-common.h"
32 #include "linux-ppc-tdesc.h" 32 #include "arch/ppc-linux-tdesc.h"
33diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h 33diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
34index 5837ea1767..7233929192 100644 34index 3d4d4fdc56..5b93af8d3a 100644
35--- a/gdb/nat/ppc-linux.h 35--- a/gdb/nat/ppc-linux.h
36+++ b/gdb/nat/ppc-linux.h 36+++ b/gdb/nat/ppc-linux.h
37@@ -18,7 +18,13 @@ 37@@ -18,7 +18,13 @@
@@ -49,5 +49,5 @@ index 5837ea1767..7233929192 100644
49 49
50 /* This sometimes isn't defined. */ 50 /* This sometimes isn't defined. */
51-- 51--
522.13.1 522.18.0
53 53
diff --git a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
index f678598284..f840cafe2e 100644
--- a/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
+++ b/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
@@ -1,4 +1,4 @@
1From 8757b36be6109f6d7ea0bd8dafbaed647e0d2192 Mon Sep 17 00:00:00 2001 1From 215486b53a7a6dfca064cd2e9196a9de6ed6f0c2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 02:31:12 +0000 3Date: Mon, 2 Mar 2015 02:31:12 +0000
4Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture. 4Subject: [PATCH 05/11] Add support for Renesas SH (sh4) architecture.
@@ -26,24 +26,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 gdb/testsuite/gdb.base/signals.c | 4 + 26 gdb/testsuite/gdb.base/signals.c | 4 +
27 11 files changed, 617 insertions(+), 29 deletions(-) 27 11 files changed, 617 insertions(+), 29 deletions(-)
28 28
29Index: gdb-8.1/gdb/Makefile.in 29diff --git a/gdb/Makefile.in b/gdb/Makefile.in
30=================================================================== 30index c76a4e4394..921fdadb49 100644
31--- gdb-8.1.orig/gdb/Makefile.in 31--- a/gdb/Makefile.in
32+++ gdb-8.1/gdb/Makefile.in 32+++ b/gdb/Makefile.in
33@@ -758,6 +758,8 @@ ALL_TARGET_OBS = \ 33@@ -2326,6 +2326,8 @@ ALLDEPFILES = \
34 sh-linux-tdep.o \ 34 sh-nbsd-nat.c \
35 sh-nbsd-tdep.o \ 35 sh-nbsd-tdep.c \
36 sh-tdep.o \ 36 sh-tdep.c \
37+ sh-linux-tdep.o \ 37+ sh-linux-tdep.c \
38+ sh-linux-nat.o \ 38+ sh-linux-nat.c \
39 sh64-tdep.o \ 39 sol2-tdep.c \
40 sol2-tdep.o \ 40 solib-aix.c \
41 solib-aix.o \ 41 solib-spu.c \
42Index: gdb-8.1/gdb/configure.host 42diff --git a/gdb/configure.host b/gdb/configure.host
43=================================================================== 43index 23a2f16399..39a886ec53 100644
44--- gdb-8.1.orig/gdb/configure.host 44--- a/gdb/configure.host
45+++ gdb-8.1/gdb/configure.host 45+++ b/gdb/configure.host
46@@ -152,6 +152,7 @@ powerpc*-*-linux*) gdb_host=linux ;; 46@@ -153,6 +153,7 @@ riscv*-*-linux*) gdb_host=linux ;;
47 47
48 s390*-*-linux*) gdb_host=linux ;; 48 s390*-*-linux*) gdb_host=linux ;;
49 49
@@ -51,10 +51,10 @@ Index: gdb-8.1/gdb/configure.host
51 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu) 51 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
52 gdb_host=nbsd ;; 52 gdb_host=nbsd ;;
53 sh*-*-openbsd*) gdb_host=nbsd ;; 53 sh*-*-openbsd*) gdb_host=nbsd ;;
54Index: gdb-8.1/gdb/sh-linux-tdep.c 54diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c
55=================================================================== 55index db93967910..4109c549e8 100644
56--- gdb-8.1.orig/gdb/sh-linux-tdep.c 56--- a/gdb/sh-linux-tdep.c
57+++ gdb-8.1/gdb/sh-linux-tdep.c 57+++ b/gdb/sh-linux-tdep.c
58@@ -18,14 +18,37 @@ 58@@ -18,14 +18,37 @@
59 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 59 along with this program. If not, see <http://www.gnu.org/licenses/>. */
60 60
@@ -93,7 +93,7 @@ Index: gdb-8.1/gdb/sh-linux-tdep.c
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_si 96@@ -180,9 +203,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
@@ -599,10 +599,10 @@ Index: gdb-8.1/gdb/sh-linux-tdep.c
599 linux_init_abi (info, gdbarch); 599 linux_init_abi (info, gdbarch);
600 600
601 /* GNU/Linux uses SVR4-style shared libraries. */ 601 /* GNU/Linux uses SVR4-style shared libraries. */
602Index: gdb-8.1/gdb/sh-tdep.c 602diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
603=================================================================== 603index fe64cf979a..4417114cd0 100644
604--- gdb-8.1.orig/gdb/sh-tdep.c 604--- a/gdb/sh-tdep.c
605+++ gdb-8.1/gdb/sh-tdep.c 605+++ b/gdb/sh-tdep.c
606@@ -21,6 +21,9 @@ 606@@ -21,6 +21,9 @@
607 sac@cygnus.com. */ 607 sac@cygnus.com. */
608 608
@@ -613,7 +613,7 @@ Index: gdb-8.1/gdb/sh-tdep.c
613 #include "frame.h" 613 #include "frame.h"
614 #include "frame-base.h" 614 #include "frame-base.h"
615 #include "frame-unwind.h" 615 #include "frame-unwind.h"
616@@ -67,23 +70,6 @@ static const char *const sh_cc_enum[] = 616@@ -66,23 +69,6 @@ static const char *const sh_cc_enum[] = {
617 617
618 static const char *sh_active_calling_convention = sh_cc_gcc; 618 static const char *sh_active_calling_convention = sh_cc_gcc;
619 619
@@ -637,7 +637,7 @@ Index: gdb-8.1/gdb/sh-tdep.c
637 static int 637 static int
638 sh_is_renesas_calling_convention (struct type *func_type) 638 sh_is_renesas_calling_convention (struct type *func_type)
639 { 639 {
640@@ -1051,7 +1037,7 @@ sh_treat_as_flt_p (struct type *type) 640@@ -1050,7 +1036,7 @@ sh_treat_as_flt_p (struct type *type)
641 return 0; 641 return 0;
642 /* Otherwise if the type of that member is float, the whole type is 642 /* Otherwise if the type of that member is float, the whole type is
643 treated as float. */ 643 treated as float. */
@@ -646,7 +646,7 @@ Index: gdb-8.1/gdb/sh-tdep.c
646 return 1; 646 return 1;
647 /* Otherwise it's not treated as float. */ 647 /* Otherwise it's not treated as float. */
648 return 0; 648 return 0;
649@@ -1101,7 +1087,7 @@ sh_push_dummy_call_fpu (struct gdbarch * 649@@ -1100,7 +1086,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch,
650 in four registers available. Loop thru args from first to last. */ 650 in four registers available. Loop thru args from first to last. */
651 for (argnum = 0; argnum < nargs; argnum++) 651 for (argnum = 0; argnum < nargs; argnum++)
652 { 652 {
@@ -655,7 +655,7 @@ Index: gdb-8.1/gdb/sh-tdep.c
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@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch 658@@ -1834,7 +1820,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: gdb-8.1/gdb/sh-tdep.c
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@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void) 667@@ -1861,7 +1847,7 @@ sh_alloc_frame_cache (void)
668 return cache; 668 return cache;
669 } 669 }
670 670
@@ -673,7 +673,7 @@ Index: gdb-8.1/gdb/sh-tdep.c
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@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_ 676@@ -1928,9 +1914,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: gdb-8.1/gdb/sh-tdep.c
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@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_inf 689@@ -1944,7 +1930,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: gdb-8.1/gdb/sh-tdep.c
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@@ -2254,8 +2240,8 @@ sh_return_in_first_hidden_param_p (struc 698@@ -2255,8 +2241,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 {
@@ -703,9 +703,9 @@ Index: gdb-8.1/gdb/sh-tdep.c
703 struct gdbarch_tdep *tdep; 703 struct gdbarch_tdep *tdep;
704+ struct gdbarch *gdbarch; 704+ struct gdbarch *gdbarch;
705 705
706 /* SH5 is handled entirely in sh64-tdep.c. */ 706 /* If there is already a candidate, use it. */
707 if (info.bfd_arch_info->mach == bfd_mach_sh5) 707 arches = gdbarch_list_lookup_by_info (arches, &info);
708@@ -2271,6 +2257,18 @@ sh_gdbarch_init (struct gdbarch_info inf 708@@ -2268,6 +2254,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: gdb-8.1/gdb/sh-tdep.c
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@@ -2425,10 +2423,11 @@ sh_gdbarch_init (struct gdbarch_info inf 727@@ -2422,10 +2420,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
728 break; 728 break;
729 } 729 }
730 730
@@ -737,10 +737,10 @@ Index: gdb-8.1/gdb/sh-tdep.c
737 frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind); 737 frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind);
738 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); 738 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind);
739 739
740Index: gdb-8.1/gdb/sh-tdep.h 740diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h
741=================================================================== 741index 59acd35b88..be3f998d84 100644
742--- gdb-8.1.orig/gdb/sh-tdep.h 742--- a/gdb/sh-tdep.h
743+++ gdb-8.1/gdb/sh-tdep.h 743+++ b/gdb/sh-tdep.h
744@@ -21,6 +21,12 @@ 744@@ -21,6 +21,12 @@
745 745
746 /* Contributed by Steve Chamberlain sac@cygnus.com. */ 746 /* Contributed by Steve Chamberlain sac@cygnus.com. */
@@ -820,10 +820,10 @@ Index: gdb-8.1/gdb/sh-tdep.h
820 /* Non-NULL when debugging from a core file. Provides the offset 820 /* Non-NULL when debugging from a core file. Provides the offset
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. */
823Index: gdb-8.1/gdb/testsuite/gdb.asm/asm-source.exp 823diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
824=================================================================== 824index 9879f0ca47..cbc0e4d5f7 100644
825--- gdb-8.1.orig/gdb/testsuite/gdb.asm/asm-source.exp 825--- a/gdb/testsuite/gdb.asm/asm-source.exp
826+++ gdb-8.1/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] {
828 append link-flags " -m elf32ppc" 828 append link-flags " -m elf32ppc"
829 } 829 }
@@ -836,10 +836,10 @@ Index: gdb-8.1/gdb/testsuite/gdb.asm/asm-source.exp
836 "sh*-*-*" { 836 "sh*-*-*" {
837 set asm-arch sh 837 set asm-arch sh
838 set debug-flags "-gdwarf-2" 838 set debug-flags "-gdwarf-2"
839Index: gdb-8.1/gdb/testsuite/gdb.asm/sh.inc 839diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc
840=================================================================== 840index a4a5fc545e..89efed7795 100644
841--- gdb-8.1.orig/gdb/testsuite/gdb.asm/sh.inc 841--- a/gdb/testsuite/gdb.asm/sh.inc
842+++ gdb-8.1/gdb/testsuite/gdb.asm/sh.inc 842+++ b/gdb/testsuite/gdb.asm/sh.inc
843@@ -40,9 +40,8 @@ 843@@ -40,9 +40,8 @@
844 mov.l .Lconst\@,r1 844 mov.l .Lconst\@,r1
845 bra .Lafterconst\@ 845 bra .Lafterconst\@
@@ -851,10 +851,10 @@ Index: gdb-8.1/gdb/testsuite/gdb.asm/sh.inc
851 .long \subr 851 .long \subr
852 .align 1 852 .align 1
853 .Lafterconst\@: 853 .Lafterconst\@:
854Index: gdb-8.1/gdb/testsuite/gdb.base/annota1.c 854diff --git a/gdb/testsuite/gdb.base/annota1.c b/gdb/testsuite/gdb.base/annota1.c
855=================================================================== 855index 424e1b8327..0de2e7b633 100644
856--- gdb-8.1.orig/gdb/testsuite/gdb.base/annota1.c 856--- a/gdb/testsuite/gdb.base/annota1.c
857+++ gdb-8.1/gdb/testsuite/gdb.base/annota1.c 857+++ b/gdb/testsuite/gdb.base/annota1.c
858@@ -1,6 +1,9 @@ 858@@ -1,6 +1,9 @@
859 #include <stdio.h> 859 #include <stdio.h>
860 #include <signal.h> 860 #include <signal.h>
@@ -865,10 +865,10 @@ Index: gdb-8.1/gdb/testsuite/gdb.base/annota1.c
865 865
866 void 866 void
867 handle_USR1 (int sig) 867 handle_USR1 (int sig)
868Index: gdb-8.1/gdb/testsuite/gdb.base/annota3.c 868diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c
869=================================================================== 869index 424e1b8327..952aaf218a 100644
870--- gdb-8.1.orig/gdb/testsuite/gdb.base/annota3.c 870--- a/gdb/testsuite/gdb.base/annota3.c
871+++ gdb-8.1/gdb/testsuite/gdb.base/annota3.c 871+++ b/gdb/testsuite/gdb.base/annota3.c
872@@ -1,6 +1,10 @@ 872@@ -1,6 +1,10 @@
873 #include <stdio.h> 873 #include <stdio.h>
874 #include <signal.h> 874 #include <signal.h>
@@ -880,10 +880,10 @@ Index: gdb-8.1/gdb/testsuite/gdb.base/annota3.c
880 880
881 void 881 void
882 handle_USR1 (int sig) 882 handle_USR1 (int sig)
883Index: gdb-8.1/gdb/testsuite/gdb.base/sigall.c 883diff --git a/gdb/testsuite/gdb.base/sigall.c b/gdb/testsuite/gdb.base/sigall.c
884=================================================================== 884index 81f3b08d6b..1574b2d6cb 100644
885--- gdb-8.1.orig/gdb/testsuite/gdb.base/sigall.c 885--- a/gdb/testsuite/gdb.base/sigall.c
886+++ gdb-8.1/gdb/testsuite/gdb.base/sigall.c 886+++ b/gdb/testsuite/gdb.base/sigall.c
887@@ -1,6 +1,9 @@ 887@@ -1,6 +1,9 @@
888 #include <signal.h> 888 #include <signal.h>
889 #include <unistd.h> 889 #include <unistd.h>
@@ -894,10 +894,10 @@ Index: gdb-8.1/gdb/testsuite/gdb.base/sigall.c
894 894
895 /* Signal handlers, we set breakpoints in them to make sure that the 895 /* Signal handlers, we set breakpoints in them to make sure that the
896 signals really get delivered. */ 896 signals really get delivered. */
897Index: gdb-8.1/gdb/testsuite/gdb.base/signals.c 897diff --git a/gdb/testsuite/gdb.base/signals.c b/gdb/testsuite/gdb.base/signals.c
898=================================================================== 898index 756606880f..1205a9bc9c 100644
899--- gdb-8.1.orig/gdb/testsuite/gdb.base/signals.c 899--- a/gdb/testsuite/gdb.base/signals.c
900+++ gdb-8.1/gdb/testsuite/gdb.base/signals.c 900+++ b/gdb/testsuite/gdb.base/signals.c
901@@ -3,6 +3,10 @@ 901@@ -3,6 +3,10 @@
902 #include <signal.h> 902 #include <signal.h>
903 #include <unistd.h> 903 #include <unistd.h>
@@ -909,3 +909,6 @@ Index: gdb-8.1/gdb/testsuite/gdb.base/signals.c
909 909
910 static int count = 0; 910 static int count = 0;
911 911
912--
9132.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/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
index 8b13958101..9ae3ee62be 100644
--- a/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
+++ b/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
@@ -1,7 +1,7 @@
1From 5c92ebd5e117e4cf118c984171e0703dfcfb8cd8 Mon Sep 17 00:00:00 2001 1From 5fdd42acaa965be7c420a3f2ba12b77ea503c59b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:25:03 -0700 3Date: Sat, 30 Apr 2016 15:25:03 -0700
4Subject: [PATCH 06/10] Dont disable libreadline.a when using --disable-static 4Subject: [PATCH 06/11] Dont disable libreadline.a when using --disable-static
5 5
6If gdb is configured with --disable-static then this is dutifully passed to 6If gdb is configured with --disable-static then this is dutifully passed to
7readline which then disables libreadline.a, which causes a problem when gdb 7readline 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
21diff --git a/Makefile.def b/Makefile.def 21diff --git a/Makefile.def b/Makefile.def
22index 0d13f037d0..8bcd86e13f 100644 22index 75063b6d12..c27bbe4d28 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,7 +33,7 @@ index 0d13f037d0..8bcd86e13f 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; };
35diff --git a/Makefile.in b/Makefile.in 35diff --git a/Makefile.in b/Makefile.in
36index 3acb83b8de..e348907128 100644 36index 7814fe745f..3b0dc7cbb0 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@@ -25470,7 +25470,7 @@ configure-readline:
@@ -46,5 +46,5 @@ index 3acb83b8de..e348907128 100644
46 @endif readline 46 @endif readline
47 47
48-- 48--
492.13.1 492.18.0
50 50
diff --git a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
index 33b4c30eef..808f4bfa14 100644
--- a/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
+++ b/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
@@ -1,7 +1,7 @@
1From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 1From d6e12d52f9cef7f5e6315003ceaa236f6cc7723b Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <amccurdy@gmail.com> 2From: Andre McCurdy <amccurdy@gmail.com>
3Date: Sat, 30 Apr 2016 15:29:06 -0700 3Date: Sat, 30 Apr 2016 15:29:06 -0700
4Subject: [PATCH 07/10] use <asm/sgidefs.h> 4Subject: [PATCH 07/11] use <asm/sgidefs.h>
5 5
6Build fix for MIPS with musl libc 6Build 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
21diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c 21diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
22index f2df1b9907..d24664cb56 100644 22index 68a7587af2..2b77221372 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 @@
@@ -32,5 +32,5 @@ index f2df1b9907..d24664cb56 100644
32 #include <asm/ptrace.h> 32 #include <asm/ptrace.h>
33 #include "inf-ptrace.h" 33 #include "inf-ptrace.h"
34-- 34--
352.13.1 352.18.0
36 36
diff --git a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
index 4f64dea254..d32352b813 100644
--- a/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
+++ b/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
@@ -1,7 +1,7 @@
1From d3f240b38eed7cd08f6c50ea896572f1327b437a Mon Sep 17 00:00:00 2001 1From d97878b272bd7c4993f4205983ae8b7ecddbcf82 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:31:40 -0700 3Date: Sat, 30 Apr 2016 15:31:40 -0700
4Subject: [PATCH 08/10] Use exorted definitions of SIGRTMIN 4Subject: [PATCH 08/11] Use exorted definitions of SIGRTMIN
5 5
6Define W_STOPCODE if not defined already 6Define W_STOPCODE if not defined already
7 7
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
20 2 files changed, 6 insertions(+), 2 deletions(-) 20 2 files changed, 6 insertions(+), 2 deletions(-)
21 21
22diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c 22diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
23index 8b29245c3d..f424ae9711 100644 23index 64015e7520..acf950c38b 100644
24--- a/gdb/linux-nat.c 24--- a/gdb/linux-nat.c
25+++ b/gdb/linux-nat.c 25+++ b/gdb/linux-nat.c
26@@ -5021,6 +5021,6 @@ lin_thread_get_thread_signals (sigset_t *set) 26@@ -4724,6 +4724,6 @@ lin_thread_get_thread_signals (sigset_t *set)
27 /* 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
28 way for the debugger to query the signal numbers - fortunately 28 way for the debugger to query the signal numbers - fortunately
29 they don't change. */ 29 they don't change. */
@@ -33,7 +33,7 @@ index 8b29245c3d..f424ae9711 100644
33+ sigaddset (set, SIGRTMIN + 1); 33+ sigaddset (set, SIGRTMIN + 1);
34 } 34 }
35diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h 35diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
36index 7dd18fefff..35137ab34f 100644 36index a90a124d3a..4f3e681962 100644
37--- a/gdb/nat/linux-nat.h 37--- a/gdb/nat/linux-nat.h
38+++ b/gdb/nat/linux-nat.h 38+++ b/gdb/nat/linux-nat.h
39@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp); 39@@ -90,4 +90,8 @@ extern void linux_stop_lwp (struct lwp_info *lwp);
@@ -46,5 +46,5 @@ index 7dd18fefff..35137ab34f 100644
46+ 46+
47 #endif /* LINUX_NAT_H */ 47 #endif /* LINUX_NAT_H */
48-- 48--
492.13.1 492.18.0
50 50
diff --git a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
index 0c103ef3f6..bc4bc26835 100644
--- a/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
+++ b/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
@@ -1,7 +1,7 @@
1From 3f54036b891054072b3e43ea8daaa57aa367b2e0 Mon Sep 17 00:00:00 2001 1From ba6ffa461fe781d44d6dcbc0fbd569237b450fdc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:35:39 -0700 3Date: Sat, 30 Apr 2016 15:35:39 -0700
4Subject: [PATCH 09/10] Change order of CFLAGS 4Subject: [PATCH 09/11] Change order of CFLAGS
5 5
6Lets us override Werror if need be 6Lets us override Werror if need be
7 7
@@ -13,10 +13,10 @@ 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
15diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in 15diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
16index 01dfdc0b89..f6aebef464 100644 16index f2f8a084bd..9528db1364 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@@ -140,7 +140,7 @@ CPPFLAGS = @CPPFLAGS@ 19@@ -143,7 +143,7 @@ CPPFLAGS = @CPPFLAGS@
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}
22 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) 22 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
@@ -26,5 +26,5 @@ index 01dfdc0b89..f6aebef464 100644
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-- 28--
292.13.1 292.18.0
30 30
diff --git a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
index c9507109b9..809d52f250 100644
--- a/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
+++ b/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
@@ -1,7 +1,7 @@
1From 3ead0dd143521b0ba69c9e753bc4a236f9445ad9 Mon Sep 17 00:00:00 2001 1From 19b581056c1709f7d2872cd76b977542a0fe6142 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 May 2016 08:47:05 -0700 3Date: Tue, 10 May 2016 08:47:05 -0700
4Subject: [PATCH 10/10] resolve restrict keyword conflict 4Subject: [PATCH 10/11] resolve restrict keyword conflict
5 5
6GCC detects that we call 'restrict' as param name in function 6GCC detects that we call 'restrict' as param name in function
7signatures and complains since both params are called 'restrict' 7signatures and complains since both params are called 'restrict'
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 4 deletions(-) 15 1 file changed, 4 insertions(+), 4 deletions(-)
16 16
17diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h 17diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h
18index d535a6a48b..7c34d5a1aa 100644 18index b4a0e49c50..d22cea9aaf 100644
19--- a/gdb/gnulib/import/sys_time.in.h 19--- a/gdb/gnulib/import/sys_time.in.h
20+++ b/gdb/gnulib/import/sys_time.in.h 20+++ b/gdb/gnulib/import/sys_time.in.h
21@@ -93,20 +93,20 @@ struct timeval 21@@ -93,20 +93,20 @@ struct timeval
@@ -44,5 +44,5 @@ index d535a6a48b..7c34d5a1aa 100644
44 _GL_CXXALIASWARN (gettimeofday); 44 _GL_CXXALIASWARN (gettimeofday);
45 # if defined __cplusplus && defined GNULIB_NAMESPACE 45 # if defined __cplusplus && defined GNULIB_NAMESPACE
46-- 46--
472.13.1 472.18.0
48 48
diff --git a/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch b/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch
index c5484f789d..bce025c391 100644
--- a/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
+++ b/meta/recipes-devtools/gdb/gdb/0011-Fix-invalid-sigprocmask-call.patch
@@ -1,7 +1,10 @@
1From 56893a61aa4f0270fa8d1197b9848247f90fce0d Mon Sep 17 00:00:00 2001 1From b1985595e46721bb168ac38f4c841a915cc2f799 Mon Sep 17 00:00:00 2001
2From: Yousong Zhou <yszhou4tech@gmail.com> 2From: Yousong Zhou <yszhou4tech@gmail.com>
3Date: Fri, 24 Mar 2017 10:36:03 +0800 3Date: Fri, 24 Mar 2017 10:36:03 +0800
4Subject: [PATCH] Fix invalid sigprocmask call 4Subject: [PATCH 11/11] Fix invalid sigprocmask call
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
5 8
6The POSIX document says 9The POSIX document says
7 10
@@ -20,18 +23,19 @@ gdb/ChangeLog:
20 23
21 * common/signals-state-save-restore.c (save_original_signals_state): 24 * common/signals-state-save-restore.c (save_original_signals_state):
22 Fix invalid sigprocmask call. 25 Fix invalid sigprocmask call.
23--- 26
24Upstream-Status: Pending [not author, cherry-picked from LEDE https://bugs.lede-project.org/index.php?do=details&task_id=637&openedfrom=-1%2Bweek] 27Upstream-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> 28Signed-off-by: André Draszik <adraszik@tycoint.com>
26 gdb/ChangeLog | 5 +++++ 29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30---
27 gdb/common/signals-state-save-restore.c | 2 +- 31 gdb/common/signals-state-save-restore.c | 2 +-
28 2 files changed, 6 insertions(+), 1 deletion(-) 32 1 file changed, 1 insertion(+), 1 deletion(-)
29 33
30diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c 34diff --git a/gdb/common/signals-state-save-restore.c b/gdb/common/signals-state-save-restore.c
31index d11a9ae..734335c 100644 35index 5bb66321bb..6597decbc6 100644
32--- a/gdb/common/signals-state-save-restore.c 36--- a/gdb/common/signals-state-save-restore.c
33+++ b/gdb/common/signals-state-save-restore.c 37+++ b/gdb/common/signals-state-save-restore.c
34@@ -41,7 +41,7 @@ save_original_signals_state (void) 38@@ -41,7 +41,7 @@ save_original_signals_state (bool quiet)
35 int i; 39 int i;
36 int res; 40 int res;
37 41
@@ -41,5 +45,5 @@ index d11a9ae..734335c 100644
41 perror_with_name (("sigprocmask")); 45 perror_with_name (("sigprocmask"));
42 46
43-- 47--
442.6.4 482.18.0
45 49
diff --git a/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch b/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
deleted file mode 100644
index ef97de7772..0000000000
--- a/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From b033a9663053eed87cb572397176747b88e9a699 Mon Sep 17 00:00:00 2001
2From: James Clarke <jrtc27@jrtc27.com>
3Date: Fri, 19 Jan 2018 17:22:49 +0000
4Subject: [PATCH] gdb: Fix ia64 defining TRAP_HWBKPT before including
5 gdb_wait.h
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which
11contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot
12define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included
13earlier; include it from linux-ptrace.h so it can never come afterwards.
14
15gdb/ChangeLog:
16
17 * nat/linux-ptrace.c: Remove unnecessary reinclusion of
18 gdb_ptrace.h, and move including gdb_wait.h ...
19 * nat/linux-ptrace.h: ... to here.
20
21Upstream-Status: Accepted [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8]
22
23Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
24---
25 gdb/nat/linux-ptrace.c | 2 --
26 gdb/nat/linux-ptrace.h | 1 +
27 2 files changed, 1 insertion(+), 2 deletions(-)
28
29diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
30index 3265b16..559c2de 100644
31--- a/gdb/nat/linux-ptrace.c
32+++ b/gdb/nat/linux-ptrace.c
33@@ -21,8 +21,6 @@
34 #include "linux-procfs.h"
35 #include "linux-waitpid.h"
36 #include "buffer.h"
37-#include "gdb_wait.h"
38-#include "gdb_ptrace.h"
39 #ifdef HAVE_SYS_PROCFS_H
40 #include <sys/procfs.h>
41 #endif
42diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
43index 5954945..6faa89b 100644
44--- a/gdb/nat/linux-ptrace.h
45+++ b/gdb/nat/linux-ptrace.h
46@@ -21,6 +21,7 @@
47 struct buffer;
48
49 #include "nat/gdb_ptrace.h"
50+#include "gdb_wait.h"
51
52 #ifdef __UCLIBC__
53 #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
54--
552.7.4
56
diff --git a/meta/recipes-devtools/gdb/gdb_8.1.1.bb b/meta/recipes-devtools/gdb/gdb_8.2.bb
index c6eac84dd8..c6eac84dd8 100644
--- a/meta/recipes-devtools/gdb/gdb_8.1.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_8.2.bb