diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 15:00:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:54:47 +0000 |
commit | a37843008ff7f21e9c74430cc0a2d4f1b42403f9 (patch) | |
tree | 495f859e9e316edd6b13b37f7190181a4d20326c | |
parent | 92cc02fe517bad0af4e493fda3331738cbcc9a26 (diff) | |
download | poky-a37843008ff7f21e9c74430cc0a2d4f1b42403f9.tar.gz |
gdb: upgrade to 7.10.1
The PPC inferior patch was dropped since an equivalent fix was merged
upstream.
(From OE-Core rev: 564c56207edd9a7dcef3ea966580e11a1548115c)
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-7.10.1.inc (renamed from meta/recipes-devtools/gdb/gdb-7.9.1.inc) | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch | 56 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb_7.10.1.bb (renamed from meta/recipes-devtools/gdb/gdb_7.9.1.bb) | 0 |
7 files changed, 3 insertions, 60 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 16507c4464..cd9bfaf295 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -25,7 +25,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" | |||
25 | GCCVERSION ?= "5.%" | 25 | GCCVERSION ?= "5.%" |
26 | SDKGCCVERSION ?= "${GCCVERSION}" | 26 | SDKGCCVERSION ?= "${GCCVERSION}" |
27 | BINUVERSION ?= "2.25%" | 27 | BINUVERSION ?= "2.25%" |
28 | GDBVERSION ?= "7.9%" | 28 | GDBVERSION ?= "7.10%" |
29 | GLIBCVERSION ?= "2.22" | 29 | GLIBCVERSION ?= "2.22" |
30 | UCLIBCVERSION ?= "1.0%" | 30 | UCLIBCVERSION ?= "1.0%" |
31 | LINUXLIBCVERSION ?= "4.1" | 31 | LINUXLIBCVERSION ?= "4.1" |
diff --git a/meta/recipes-devtools/gdb/gdb-7.9.1.inc b/meta/recipes-devtools/gdb/gdb-7.10.1.inc index 1ca95afdcc..a9267d5548 100644 --- a/meta/recipes-devtools/gdb/gdb-7.9.1.inc +++ b/meta/recipes-devtools/gdb/gdb-7.10.1.inc | |||
@@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | 4 | file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ |
5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" | 5 | file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" |
6 | 6 | ||
7 | SRC_URI[md5sum] = "f3b97de919a9dba84490b2e076ec4cb0" | 7 | SRC_URI[md5sum] = "b93a2721393e5fa226375b42d567d90b" |
8 | SRC_URI[sha256sum] = "4994ad986726ac4128a6f1bd8020cd672e9a92aa76b80736563ef992992764ef" | 8 | SRC_URI[sha256sum] = "ff14f8050e6484508c73cbfa63731e57901478490ca1672dc0b5e2b03f6af622" |
9 | 9 | ||
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb index 301035940c..301035940c 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.9.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.10.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb index 3a95cfb035..3a95cfb035 100644 --- a/meta/recipes-devtools/gdb/gdb-cross_7.9.1.bb +++ b/meta/recipes-devtools/gdb/gdb-cross_7.10.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 2162cadb9e..e970450fa3 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
@@ -4,7 +4,6 @@ inherit gettext | |||
4 | 4 | ||
5 | SRC_URI += "file://0002-Change-order-of-CFLAGS.patch \ | 5 | SRC_URI += "file://0002-Change-order-of-CFLAGS.patch \ |
6 | file://0003-Add-support-for-Renesas-SH-sh4-architecture.patch \ | 6 | file://0003-Add-support-for-Renesas-SH-sh4-architecture.patch \ |
7 | file://fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch \ | ||
8 | file://0001-Use-exported-definitions-of-SIGRTMIN.patch \ | 7 | file://0001-Use-exported-definitions-of-SIGRTMIN.patch \ |
9 | " | 8 | " |
10 | #LDFLAGS_append = " -s" | 9 | #LDFLAGS_append = " -s" |
diff --git a/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch b/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch deleted file mode 100644 index 2854352309..0000000000 --- a/meta/recipes-devtools/gdb/gdb/fix-detection-of-64-bit-PPC-inferior-in-gdbserver.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 4fe67dbafa1bee679daecc12ed30621d5c2605de Mon Sep 17 00:00:00 2001 | ||
2 | From: Yao Qi <yao@codesourcery.com> | ||
3 | Date: Mon, 11 May 2015 10:57:33 +0800 | ||
4 | Subject: [PATCH] Fix detection of 64-bit PPC inferior in gdbserver | ||
5 | |||
6 | Issue #16775 | ||
7 | |||
8 | * gdbserver/linux-ppc-low.c (ppc_arch_setup): Change variable msr to type | ||
9 | 'unsigned long'. Check bit 63 or bit 31 is one. | ||
10 | |||
11 | https://sourceware.org/ml/gdb-patches/2014-12/msg00239.html | ||
12 | Written by: Yao Qi <yao@codesourcery.com> | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> | ||
17 | --- | ||
18 | gdb/gdbserver/linux-ppc-low.c | 11 +++++++---- | ||
19 | 1 file changed, 7 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c | ||
22 | index 63d4218..a62cf22 100644 | ||
23 | --- a/gdb/gdbserver/linux-ppc-low.c | ||
24 | +++ b/gdb/gdbserver/linux-ppc-low.c | ||
25 | @@ -374,7 +374,7 @@ ppc_arch_setup (void) | ||
26 | { | ||
27 | const struct target_desc *tdesc; | ||
28 | #ifdef __powerpc64__ | ||
29 | - long msr; | ||
30 | + unsigned long msr; | ||
31 | struct regcache *regcache; | ||
32 | |||
33 | /* On a 64-bit host, assume 64-bit inferior process with no | ||
34 | @@ -384,13 +384,16 @@ ppc_arch_setup (void) | ||
35 | current_process ()->tdesc = tdesc; | ||
36 | ppc_hwcap = 0; | ||
37 | |||
38 | - /* Only if the high bit of the MSR is set, we actually have | ||
39 | - a 64-bit inferior. */ | ||
40 | + /* We actually have a 64-bit inferior only if the certain bit of the | ||
41 | + MSR is set. The PowerISA Book III-S MSR is different from the | ||
42 | + PowerISA Book III-E MSR. The Book III-S MSR is 64 bits wide, and | ||
43 | + its MSR[SF] is the bit 0 of a 64-bit value. Book III-E MSR is 32 | ||
44 | + bits wide, and its MSR[CM] is the bit 0 of a 32-bit value. */ | ||
45 | regcache = new_register_cache (tdesc); | ||
46 | fetch_inferior_registers (regcache, find_regno (tdesc, "msr")); | ||
47 | collect_register_by_name (regcache, "msr", &msr); | ||
48 | free_register_cache (regcache); | ||
49 | - if (msr < 0) | ||
50 | + if (msr & 0x8000000080000000) | ||
51 | { | ||
52 | ppc_get_hwcap (&ppc_hwcap); | ||
53 | if (ppc_hwcap & PPC_FEATURE_CELL) | ||
54 | -- | ||
55 | 1.8.5.2.233.g932f7e4 | ||
56 | |||
diff --git a/meta/recipes-devtools/gdb/gdb_7.9.1.bb b/meta/recipes-devtools/gdb/gdb_7.10.1.bb index cd52e27d56..cd52e27d56 100644 --- a/meta/recipes-devtools/gdb/gdb_7.9.1.bb +++ b/meta/recipes-devtools/gdb/gdb_7.10.1.bb | |||