summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gdb
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-04-30 18:41:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-14 23:05:12 +0100
commit0c717ff4e706220467924b5159dbeca12184e7fb (patch)
tree6a5bf7b738c8839d6b78b1b4c760490c1c40d71c /meta/recipes-devtools/gdb
parent6d27c16ec0c63da001a21f8e3157e7cbfa57e554 (diff)
downloadpoky-0c717ff4e706220467924b5159dbeca12184e7fb.tar.gz
gdb: Upgrade to 7.11
(From OE-Core rev: 0cea061bf62f3092d857bc503b96e77f55134a39) 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-7.11.inc (renamed from meta/recipes-devtools/gdb/gdb-7.10.1.inc)0
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc20
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.11.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb4
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.11.bb2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc10
-rw-r--r--meta/recipes-devtools/gdb/gdb/0001-Use-exported-definitions-of-SIGRTMIN.patch54
-rw-r--r--meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch10
-rw-r--r--meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch (renamed from meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch)8
-rw-r--r--meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch (renamed from meta/recipes-devtools/gdb/gdb/0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch)8
-rw-r--r--meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (renamed from meta/recipes-devtools/gdb/gdb/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch)11
-rw-r--r--meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch (renamed from meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch)32
-rw-r--r--meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch (renamed from meta/recipes-devtools/gdb/gdb/force-readline-static.patch)21
-rw-r--r--meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch (renamed from meta/recipes-devtools/gdb/gdb/0001-use-asm-sgidefs.h.patch)15
-rw-r--r--meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch50
-rw-r--r--meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch (renamed from meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch)18
-rw-r--r--meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch48
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.11.bb (renamed from meta/recipes-devtools/gdb/gdb_7.10.1.bb)1
18 files changed, 186 insertions, 126 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-7.10.1.inc b/meta/recipes-devtools/gdb/gdb-7.11.inc
index a9267d5548..a9267d5548 100644
--- a/meta/recipes-devtools/gdb/gdb-7.10.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.11.inc
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 3260dbd723..1d1cf8fed3 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -16,8 +16,6 @@ LTTNGUST_mips64eln32 = ""
16LTTNGUST_sh4 = "" 16LTTNGUST_sh4 = ""
17LTTNGUST_libc-musl = "" 17LTTNGUST_libc-musl = ""
18 18
19INC_PR = "r0"
20
21LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 19LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
22 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ 20 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
23 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ 21 file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
@@ -25,8 +23,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
25 23
26inherit autotools texinfo 24inherit autotools texinfo
27 25
28SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ 26SRCREV = "1a982b689ce4e20523bdf69e47fdd574c4f63934"
29 " 27
28SRC_URI = "git://sourceware.org/git/binutils-gdb.git;branch=gdb-7.11-branch \
29 file://0001-include-sys-types.h-for-mode_t.patch \
30 file://0002-make-man-install-relative-to-DESTDIR.patch \
31 file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
32 file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
33 file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \
34 file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \
35 file://0007-use-asm-sgidefs.h.patch \
36 file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \
37 file://0009-Change-order-of-CFLAGS.patch \
38 file://0010-resolve-restrict-keyword-conflict.patch \
39"
40
41S = "${WORKDIR}/git"
30 42
31B = "${WORKDIR}/build-${TARGET_SYS}" 43B = "${WORKDIR}/build-${TARGET_SYS}"
32 44
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.11.bb
index 301035940c..301035940c 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.11.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb
deleted file mode 100644
index 3a95cfb035..0000000000
--- a/meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require gdb-cross.inc
2require gdb-${PV}.inc
3
4SRC_URI += "file://0001-make-man-install-relative-to-DESTDIR.patch"
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.11.bb b/meta/recipes-devtools/gdb/gdb-cross_7.11.bb
new file mode 100644
index 0000000000..50cf159fdb
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.11.bb
@@ -0,0 +1,2 @@
1require gdb-cross.inc
2require gdb-${PV}.inc
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index 5a2067e04c..52119a0aaa 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -2,16 +2,6 @@ require gdb-common.inc
2 2
3inherit gettext 3inherit gettext
4 4
5SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
6 file://0002-Change-order-of-CFLAGS.patch \
7 file://0003-Add-support-for-Renesas-SH-sh4-architecture.patch \
8 file://0001-Use-exported-definitions-of-SIGRTMIN.patch \
9 file://0001-include-sys-types.h-for-mode_t.patch \
10 file://0001-use-asm-sgidefs.h.patch \
11 file://force-readline-static.patch \
12 file://0001-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \
13 file://0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \
14 "
15#LDFLAGS_append = " -s" 5#LDFLAGS_append = " -s"
16#export CFLAGS_append=" -L${STAGING_LIBDIR}" 6#export CFLAGS_append=" -L${STAGING_LIBDIR}"
17 7
diff --git a/meta/recipes-devtools/gdb/gdb/0001-Use-exported-definitions-of-SIGRTMIN.patch b/meta/recipes-devtools/gdb/gdb/0001-Use-exported-definitions-of-SIGRTMIN.patch
deleted file mode 100644
index 5f0c096939..0000000000
--- a/meta/recipes-devtools/gdb/gdb/0001-Use-exported-definitions-of-SIGRTMIN.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 2f97e89e9e4e5797d0d973e1d05c1f44c46b4912 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 20:21:38 -0700
4Subject: [PATCH] Use exorted definitions of SIGRTMIN
5
6Define W_STOPCODE if not defined already
7
8__SIGRTMIN is internal to glibc and other libcs e.g. musl
9may not provide them
10
11Fixes
12https://sourceware.org/bugzilla/show_bug.cgi?id=13012
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Submitted
17
18 gdb/linux-nat.c | 4 ++--
19 gdb/nat/linux-nat.h | 4 ++++
20 2 files changed, 6 insertions(+), 2 deletions(-)
21
22diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
23index 396c30c..50320ee 100644
24--- a/gdb/linux-nat.c
25+++ b/gdb/linux-nat.c
26@@ -4856,10 +4856,10 @@ lin_thread_get_thread_signals (sigset_t *set)
27 fortunately they don't change! */
28
29 if (restart == 0)
30- restart = __SIGRTMIN;
31+ restart = SIGRTMIN;
32
33 if (cancel == 0)
34- cancel = __SIGRTMIN + 1;
35+ cancel = SIGRTMIN + 1;
36
37 sigaddset (set, restart);
38 sigaddset (set, cancel);
39diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
40index 83a6d91..efbe0fd 100644
41--- a/gdb/nat/linux-nat.h
42+++ b/gdb/nat/linux-nat.h
43@@ -25,4 +25,8 @@
44 instead SIGTRAP with bit 7 set. */
45 #define SYSCALL_SIGTRAP (SIGTRAP | 0x80)
46
47+#ifndef W_STOPCODE
48+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
49+#endif
50+
51 #endif /* LINUX_NAT_H */
52--
532.1.4
54
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 a0292e4166..0042c00634 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,7 +1,7 @@
1From acbee4edacb80b5eeaff2480712fe98e56443997 Mon Sep 17 00:00:00 2001 1From fddd7178915968acf680814411b8b3cb137d0587 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] include sys/types.h for mode_t 4Subject: [PATCH 01/10] include sys/types.h for mode_t
5 5
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
@@ -14,10 +14,10 @@ Upstream-Status: Pending
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h 16diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
17index 9a40867..aaecab9 100644 17index 5af2051..f42c510 100644
18--- a/gdb/gdbserver/target.h 18--- a/gdb/gdbserver/target.h
19+++ b/gdb/gdbserver/target.h 19+++ b/gdb/gdbserver/target.h
20@@ -27,6 +27,7 @@ 20@@ -28,6 +28,7 @@
21 #include "target/waitstatus.h" 21 #include "target/waitstatus.h"
22 #include "mem-break.h" 22 #include "mem-break.h"
23 #include "btrace-common.h" 23 #include "btrace-common.h"
@@ -26,5 +26,5 @@ index 9a40867..aaecab9 100644
26 struct emit_ops; 26 struct emit_ops;
27 struct buffer; 27 struct buffer;
28-- 28--
292.7.0 292.8.2
30 30
diff --git a/meta/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch b/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
index 6996c183bb..defed621f4 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-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 12b0506951460c3cc37d775478d024db3f95e9d8 Mon Sep 17 00:00:00 2001 1From 3229cb09033eeb5003a08d91fa9d43be8ba4c86b 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 1/3] make man install relative to DESTDIR 4Subject: [PATCH 02/10] 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 d49a93b..2121c46 100644 14index a05f507..8d0fa64 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 d49a93b..2121c46 100644
24 includedir = @includedir@ 24 includedir = @includedir@
25 25
26-- 26--
272.1.4 272.8.2
28 28
diff --git a/meta/recipes-devtools/gdb/gdb/0001-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 31739525ae..bac793964a 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-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 e92f8932ef488de2a56db4299131ce6a4eb170bd Mon Sep 17 00:00:00 2001 1From 88e67caed662d8344c8db56176c9f1221e6cd2a2 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] mips-linux-nat: Define _ABIO32 if not defined 4Subject: [PATCH 03/10] 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
@@ -17,7 +17,7 @@ Upstream-Status: Pending
17 1 file changed, 5 insertions(+) 17 1 file changed, 5 insertions(+)
18 18
19diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c 19diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
20index fd5c705..753f29d 100644 20index bfe9fcb..449b43a 100644
21--- a/gdb/mips-linux-nat.c 21--- a/gdb/mips-linux-nat.c
22+++ b/gdb/mips-linux-nat.c 22+++ b/gdb/mips-linux-nat.c
23@@ -46,6 +46,11 @@ 23@@ -46,6 +46,11 @@
@@ -33,5 +33,5 @@ index fd5c705..753f29d 100644
33 we'll clear this and use PTRACE_PEEKUSER instead. */ 33 we'll clear this and use PTRACE_PEEKUSER instead. */
34 static int have_ptrace_regsets = 1; 34 static int have_ptrace_regsets = 1;
35-- 35--
361.8.3.1 362.8.2
37 37
diff --git a/meta/recipes-devtools/gdb/gdb/0001-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 342f1ce425..a5fe2a2793 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-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,8 @@
1From 33a2cdb731298b73277507f01b9a21cd340c5b5c Mon Sep 17 00:00:00 2001 1From bec564eb454bc7fc6ecfcb573aa53040bf39c1d5 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 16:46:03 +0000 3Date: Sat, 30 Apr 2016 16:46:03 +0000
4Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems 4Subject: [PATCH 04/10] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC
5 systems
5 6
6Upstream-Status: Pending 7Upstream-Status: Pending
7 8
@@ -12,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 12 insertions(+) 13 2 files changed, 12 insertions(+)
13 14
14diff --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
15index 188fac0..f71d5ab 100644 16index 2145c50..777905d 100644
16--- a/gdb/gdbserver/linux-ppc-low.c 17--- a/gdb/gdbserver/linux-ppc-low.c
17+++ b/gdb/gdbserver/linux-ppc-low.c 18+++ b/gdb/gdbserver/linux-ppc-low.c
18@@ -21,7 +21,13 @@ 19@@ -21,7 +21,13 @@
@@ -30,7 +31,7 @@ index 188fac0..f71d5ab 100644
30 #include "nat/ppc-linux.h" 31 #include "nat/ppc-linux.h"
31 32
32diff --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
33index 0ff2223..c978daa 100644 34index 85fbcd8..cbec9c5 100644
34--- a/gdb/nat/ppc-linux.h 35--- a/gdb/nat/ppc-linux.h
35+++ b/gdb/nat/ppc-linux.h 36+++ b/gdb/nat/ppc-linux.h
36@@ -18,7 +18,13 @@ 37@@ -18,7 +18,13 @@
@@ -48,5 +49,5 @@ index 0ff2223..c978daa 100644
48 49
49 /* This sometimes isn't defined. */ 50 /* This sometimes isn't defined. */
50-- 51--
511.8.3.1 522.8.2
52 53
diff --git a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch b/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
index 4a3e22c445..8809e6f8b2 100644
--- a/meta/recipes-devtools/gdb/gdb/0003-Add-support-for-Renesas-SH-sh4-architecture.patch
+++ b/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
@@ -1,7 +1,7 @@
1From 407cb13cfb70697f45dfb761304e005e1ecbd0e9 Mon Sep 17 00:00:00 2001 1From 8c5fe58c5a0044ddb517a41b277ed27fb3d3bedc 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 3/3] Add support for Renesas SH (sh4) architecture. 4Subject: [PATCH 05/10] Add support for Renesas SH (sh4) architecture.
5 5
6gdb (7.4-1~cvs20111117.2) experimental; urgency=low 6gdb (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
29diff --git a/gdb/Makefile.in b/gdb/Makefile.in 29diff --git a/gdb/Makefile.in b/gdb/Makefile.in
30index 7937801..63baf81 100644 30index ec2af52..df8e84d 100644
31--- a/gdb/Makefile.in 31--- a/gdb/Makefile.in
32+++ b/gdb/Makefile.in 32+++ b/gdb/Makefile.in
33@@ -1707,6 +1707,7 @@ ALLDEPFILES = \ 33@@ -1736,6 +1736,7 @@ ALLDEPFILES = \
34 score-tdep.c \ 34 score-tdep.c \
35 ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \ 35 ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \
36 sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \ 36 sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \
@@ -39,10 +39,10 @@ index 7937801..63baf81 100644
39 solib-svr4.c \ 39 solib-svr4.c \
40 sparc-linux-nat.c sparc-linux-tdep.c \ 40 sparc-linux-nat.c sparc-linux-tdep.c \
41diff --git a/gdb/configure.host b/gdb/configure.host 41diff --git a/gdb/configure.host b/gdb/configure.host
42index d07be4b..b6391c5 100644 42index ef265eb..322a1e2 100644
43--- a/gdb/configure.host 43--- a/gdb/configure.host
44+++ b/gdb/configure.host 44+++ b/gdb/configure.host
45@@ -150,6 +150,7 @@ powerpc*-*-linux*) gdb_host=linux ;; 45@@ -149,6 +149,7 @@ powerpc*-*-linux*) gdb_host=linux ;;
46 46
47 s390*-*-linux*) gdb_host=linux ;; 47 s390*-*-linux*) gdb_host=linux ;;
48 48
@@ -51,7 +51,7 @@ index d07be4b..b6391c5 100644
51 gdb_host=nbsd ;; 51 gdb_host=nbsd ;;
52 sh*-*-openbsd*) gdb_host=nbsd ;; 52 sh*-*-openbsd*) gdb_host=nbsd ;;
53diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c 53diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c
54index 2ff2ee8..1a11262 100644 54index 2418d25..ac8ea9e 100644
55--- a/gdb/sh-linux-tdep.c 55--- a/gdb/sh-linux-tdep.c
56+++ b/gdb/sh-linux-tdep.c 56+++ b/gdb/sh-linux-tdep.c
57@@ -18,14 +18,37 @@ 57@@ -18,14 +18,37 @@
@@ -599,7 +599,7 @@ index 2ff2ee8..1a11262 100644
599 599
600 /* GNU/Linux uses SVR4-style shared libraries. */ 600 /* GNU/Linux uses SVR4-style shared libraries. */
601diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c 601diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
602index 82cf2f4..b443e46 100644 602index 336b48e..847b271 100644
603--- a/gdb/sh-tdep.c 603--- a/gdb/sh-tdep.c
604+++ b/gdb/sh-tdep.c 604+++ b/gdb/sh-tdep.c
605@@ -21,6 +21,9 @@ 605@@ -21,6 +21,9 @@
@@ -702,7 +702,7 @@ index 82cf2f4..b443e46 100644
702 702
703 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) 703 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1)
704 return frame_unwind_got_memory (this_frame, regnum, 704 return frame_unwind_got_memory (this_frame, regnum,
705@@ -2237,8 +2224,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, 705@@ -2240,8 +2227,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch,
706 static struct gdbarch * 706 static struct gdbarch *
707 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 707 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
708 { 708 {
@@ -712,7 +712,7 @@ index 82cf2f4..b443e46 100644
712 712
713 /* SH5 is handled entirely in sh64-tdep.c. */ 713 /* SH5 is handled entirely in sh64-tdep.c. */
714 if (info.bfd_arch_info->mach == bfd_mach_sh5) 714 if (info.bfd_arch_info->mach == bfd_mach_sh5)
715@@ -2254,6 +2241,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 715@@ -2257,6 +2244,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
716 tdep = XCNEW (struct gdbarch_tdep); 716 tdep = XCNEW (struct gdbarch_tdep);
717 gdbarch = gdbarch_alloc (&info, tdep); 717 gdbarch = gdbarch_alloc (&info, tdep);
718 718
@@ -731,7 +731,7 @@ index 82cf2f4..b443e46 100644
731 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); 731 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT);
732 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); 732 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT);
733 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); 733 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
734@@ -2404,10 +2403,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 734@@ -2407,10 +2406,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
735 break; 735 break;
736 } 736 }
737 737
@@ -745,7 +745,7 @@ index 82cf2f4..b443e46 100644
745 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); 745 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind);
746 746
747diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h 747diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h
748index fc671a5..699f59f 100644 748index 666968f..62c65b5 100644
749--- a/gdb/sh-tdep.h 749--- a/gdb/sh-tdep.h
750+++ b/gdb/sh-tdep.h 750+++ b/gdb/sh-tdep.h
751@@ -21,6 +21,12 @@ 751@@ -21,6 +21,12 @@
@@ -828,10 +828,10 @@ index fc671a5..699f59f 100644
828 where each general-purpose register is stored inside the associated 828 where each general-purpose register is stored inside the associated
829 core file section. */ 829 core file section. */
830diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp 830diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
831index 8854af0..ef44682 100644 831index 6d9aef8..5b66b42 100644
832--- a/gdb/testsuite/gdb.asm/asm-source.exp 832--- a/gdb/testsuite/gdb.asm/asm-source.exp
833+++ b/gdb/testsuite/gdb.asm/asm-source.exp 833+++ b/gdb/testsuite/gdb.asm/asm-source.exp
834@@ -113,6 +113,11 @@ switch -glob -- [istarget] { 834@@ -116,6 +116,11 @@ switch -glob -- [istarget] {
835 append link-flags " -m elf32ppc" 835 append link-flags " -m elf32ppc"
836 } 836 }
837 } 837 }
@@ -873,7 +873,7 @@ index 424e1b8..0de2e7b 100644
873 void 873 void
874 handle_USR1 (int sig) 874 handle_USR1 (int sig)
875diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c 875diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c
876index 424e1b8..952aaf2 100644 876index 424e1b8..952aaf21 100644
877--- a/gdb/testsuite/gdb.base/annota3.c 877--- a/gdb/testsuite/gdb.base/annota3.c
878+++ b/gdb/testsuite/gdb.base/annota3.c 878+++ b/gdb/testsuite/gdb.base/annota3.c
879@@ -1,6 +1,10 @@ 879@@ -1,6 +1,10 @@
@@ -917,5 +917,5 @@ index 7566068..1205a9b 100644
917 static int count = 0; 917 static int count = 0;
918 918
919-- 919--
9202.1.4 9202.8.2
921 921
diff --git a/meta/recipes-devtools/gdb/gdb/force-readline-static.patch b/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
index d34ee8cee9..394d26d063 100644
--- a/meta/recipes-devtools/gdb/gdb/force-readline-static.patch
+++ b/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
@@ -1,3 +1,8 @@
1From f3932cb2960fd54655a448b13d5a5b80f356f8de Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:25:03 -0700
4Subject: [PATCH 06/10] Dont disable libreadline.a when using --disable-static
5
1If 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
2readline which then disables libreadline.a, which causes a problem when gdb 7readline which then disables libreadline.a, which causes a problem when gdb
3tries to link against that. 8tries to link against that.
@@ -7,12 +12,17 @@ the sub-configure.
7 12
8Upstream-Status: Pending 13Upstream-Status: Pending
9Signed-off-by: Ross Burton <ross.burton@intel.com> 14Signed-off-by: Ross Burton <ross.burton@intel.com>
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 Makefile.def | 3 ++-
18 Makefile.in | 2 +-
19 2 files changed, 3 insertions(+), 2 deletions(-)
10 20
11diff --git a/Makefile.def b/Makefile.def 21diff --git a/Makefile.def b/Makefile.def
12index 4394188..05c661a 100644 22index ea8453e..0fc66c6 100644
13--- a/Makefile.def 23--- a/Makefile.def
14+++ b/Makefile.def 24+++ b/Makefile.def
15@@ -100,7 +100,8 @@ host_modules= { module= libiconv; 25@@ -104,7 +104,8 @@ host_modules= { module= libiconv;
16 missing= install-html; 26 missing= install-html;
17 missing= install-info; }; 27 missing= install-info; };
18 host_modules= { module= m4; }; 28 host_modules= { module= m4; };
@@ -23,10 +33,10 @@ index 4394188..05c661a 100644
23 host_modules= { module= sim; }; 33 host_modules= { module= sim; };
24 host_modules= { module= texinfo; no_install= true; }; 34 host_modules= { module= texinfo; no_install= true; };
25diff --git a/Makefile.in b/Makefile.in 35diff --git a/Makefile.in b/Makefile.in
26index 61e0ab6..837f36e 100644 36index 2733c4d..3e04e80 100644
27--- a/Makefile.in 37--- a/Makefile.in
28+++ b/Makefile.in 38+++ b/Makefile.in
29@@ -24971,7 +24971,7 @@ configure-readline: 39@@ -25380,7 +25380,7 @@ configure-readline:
30 $$s/$$module_srcdir/configure \ 40 $$s/$$module_srcdir/configure \
31 --srcdir=$${topdir}/$$module_srcdir \ 41 --srcdir=$${topdir}/$$module_srcdir \
32 $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ 42 $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
@@ -35,3 +45,6 @@ index 61e0ab6..837f36e 100644
35 || exit 1 45 || exit 1
36 @endif readline 46 @endif readline
37 47
48--
492.8.2
50
diff --git a/meta/recipes-devtools/gdb/gdb/0001-use-asm-sgidefs.h.patch b/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
index eaec39030a..f32f8ee417 100644
--- a/meta/recipes-devtools/gdb/gdb/0001-use-asm-sgidefs.h.patch
+++ b/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
@@ -1,7 +1,7 @@
1From 677b5b56135141c0d259e370aacd0e11c810aa15 Mon Sep 17 00:00:00 2001 1From 048675a915a72989f2613386975730da016e7c5d Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <amccurdy@gmail.com>
3Date: Fri, 5 Feb 2016 14:00:00 -0800 3Date: Sat, 30 Apr 2016 15:29:06 -0700
4Subject: [PATCH] use <asm/sgidefs.h> 4Subject: [PATCH 07/10] use <asm/sgidefs.h>
5 5
6Build fix for MIPS with musl libc 6Build fix for MIPS with musl libc
7 7
@@ -13,12 +13,13 @@ instead.
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 15Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
16--- 17---
17 gdb/mips-linux-nat.c | 2 +- 18 gdb/mips-linux-nat.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
19 20
20diff --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
21index a36bb63..fd5c705 100644 22index 449b43a..09603da 100644
22--- a/gdb/mips-linux-nat.c 23--- a/gdb/mips-linux-nat.c
23+++ b/gdb/mips-linux-nat.c 24+++ b/gdb/mips-linux-nat.c
24@@ -31,7 +31,7 @@ 25@@ -31,7 +31,7 @@
@@ -27,9 +28,9 @@ index a36bb63..fd5c705 100644
27 28
28-#include <sgidefs.h> 29-#include <sgidefs.h>
29+#include <asm/sgidefs.h> 30+#include <asm/sgidefs.h>
30 #include <sys/ptrace.h> 31 #include "nat/gdb_ptrace.h"
31 #include <asm/ptrace.h> 32 #include <asm/ptrace.h>
32 33
33-- 34--
341.9.1 352.8.2
35 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
new file mode 100644
index 0000000000..7e58b617ad
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
@@ -0,0 +1,50 @@
1From e54ead9d81f4d38412751b815f909db3cb144bb1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 15:31:40 -0700
4Subject: [PATCH 08/10] Use exorted definitions of SIGRTMIN
5
6Define W_STOPCODE if not defined already
7
8__SIGRTMIN is internal to glibc and other libcs e.g. musl
9may not provide them
10
11Fixes
12https://sourceware.org/bugzilla/show_bug.cgi?id=13012
13
14Upstream-Status: Submitted
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 gdb/linux-nat.c | 4 ++--
19 gdb/nat/linux-nat.h | 4 ++++
20 2 files changed, 6 insertions(+), 2 deletions(-)
21
22diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
23index 0829bcb..3b8a896 100644
24--- a/gdb/linux-nat.c
25+++ b/gdb/linux-nat.c
26@@ -4845,6 +4845,6 @@ lin_thread_get_thread_signals (sigset_t *set)
27 /* NPTL reserves the first two RT signals, but does not provide any
28 way for the debugger to query the signal numbers - fortunately
29 they don't change. */
30- sigaddset (set, __SIGRTMIN);
31- sigaddset (set, __SIGRTMIN + 1);
32+ sigaddset (set, SIGRTMIN);
33+ sigaddset (set, SIGRTMIN + 1);
34 }
35diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
36index 2b485db..d058afc 100644
37--- a/gdb/nat/linux-nat.h
38+++ b/gdb/nat/linux-nat.h
39@@ -85,4 +85,8 @@ extern enum target_stop_reason lwp_stop_reason (struct lwp_info *lwp);
40
41 extern void linux_stop_lwp (struct lwp_info *lwp);
42
43+#ifndef W_STOPCODE
44+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
45+#endif
46+
47 #endif /* LINUX_NAT_H */
48--
492.8.2
50
diff --git a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch b/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
index bccb45fda1..a230047af6 100644
--- a/meta/recipes-devtools/gdb/gdb/0002-Change-order-of-CFLAGS.patch
+++ b/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
@@ -1,7 +1,7 @@
1From 262ccc4fdb2a3df0f16c61a807046964ae7729c9 Mon Sep 17 00:00:00 2001 1From ba0bbf887d4911ccee9df57cb13eafb1de34bb31 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:29:23 +0000 3Date: Sat, 30 Apr 2016 15:35:39 -0700
4Subject: [PATCH 2/3] Change order of CFLAGS 4Subject: [PATCH 09/10] Change order of CFLAGS
5 5
6Lets us override Werror if need be 6Lets us override Werror if need be
7 7
@@ -13,22 +13,22 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 2 insertions(+), 2 deletions(-)
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 1ed2ec8..0cef95b 100644 16index 1e874e3..91e8550 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@@ -131,10 +131,10 @@ CFLAGS = @CFLAGS@ 19@@ -138,10 +138,10 @@ CXXFLAGS = @CXXFLAGS@
20 CPPFLAGS = @CPPFLAGS@ 20 CPPFLAGS = @CPPFLAGS@
21 21
22 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. 22 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
23-INTERNAL_CFLAGS_BASE = ${CFLAGS} ${GLOBAL_CFLAGS} \ 23-INTERNAL_CFLAGS_BASE = ${COMPILER_CFLAGS} ${GLOBAL_CFLAGS} \
24+INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \ 24+INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
25 ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} 25 ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS}
26 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) 26 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
27-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER 27-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
28+INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${CFLAGS} -DGDBSERVER 28+INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) ${COMPILER_CFLAGS} -DGDBSERVER
29 29
30 # LDFLAGS is specifically reserved for setting from the command line 30 # LDFLAGS is specifically reserved for setting from the command line
31 # when running make. 31 # when running make.
32-- 32--
332.1.4 332.8.2
34 34
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
new file mode 100644
index 0000000000..16c34c7035
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
@@ -0,0 +1,48 @@
1From 5a9ccb8c0728b658fc4f7f0f7b36873c64274f10 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 May 2016 08:47:05 -0700
4Subject: [PATCH 10/10] resolve restrict keyword conflict
5
6GCC detects that we call 'restrict' as param name in function
7signatures and complains since both params are called 'restrict'
8therefore we use __restrict to denote the C99 keywork
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 gdb/gnulib/import/sys_time.in.h | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/gdb/gnulib/import/sys_time.in.h b/gdb/gnulib/import/sys_time.in.h
18index c556c5d..2a6107f 100644
19--- a/gdb/gnulib/import/sys_time.in.h
20+++ b/gdb/gnulib/import/sys_time.in.h
21@@ -93,20 +93,20 @@ struct timeval
22 # define gettimeofday rpl_gettimeofday
23 # endif
24 _GL_FUNCDECL_RPL (gettimeofday, int,
25- (struct timeval *restrict, void *restrict)
26+ (struct timeval *__restrict, void *__restrict)
27 _GL_ARG_NONNULL ((1)));
28 _GL_CXXALIAS_RPL (gettimeofday, int,
29- (struct timeval *restrict, void *restrict));
30+ (struct timeval *__restrict, void *__restrict));
31 # else
32 # if !@HAVE_GETTIMEOFDAY@
33 _GL_FUNCDECL_SYS (gettimeofday, int,
34- (struct timeval *restrict, void *restrict)
35+ (struct timeval *__restrict, void *__restrict)
36 _GL_ARG_NONNULL ((1)));
37 # endif
38 /* Need to cast, because on glibc systems, by default, the second argument is
39 struct timezone *. */
40 _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
41- (struct timeval *restrict, void *restrict));
42+ (struct timeval *__restrict, void *__restrict));
43 # endif
44 _GL_CXXALIASWARN (gettimeofday);
45 #elif defined GNULIB_POSIXCHECK
46--
472.8.2
48
diff --git a/meta/recipes-devtools/gdb/gdb_7.10.1.bb b/meta/recipes-devtools/gdb/gdb_7.11.bb
index f897e1213e..ccc33b8656 100644
--- a/meta/recipes-devtools/gdb/gdb_7.10.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.11.bb
@@ -18,3 +18,4 @@ EOF
18 chmod +x ${WORKDIR}/python 18 chmod +x ${WORKDIR}/python
19 fi 19 fi
20} 20}
21CFLAGS_append_libc-musl = " -Drpl_gettimeofday=gettimeofday"