summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-05-15 23:32:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:33 +0100
commite51c0c398c4bbaec18c7e041be210e57847f362d (patch)
treef37626aba78aa864f1d76047e98a63e4524986a2 /meta
parent69eb0135878f0f9a73a55d0e5a31a5844b890690 (diff)
downloadpoky-e51c0c398c4bbaec18c7e041be210e57847f362d.tar.gz
gdb: Upgrade to 8.1 release
cache strerror so it does not try to use rpl_* versions (From OE-Core rev: 02664a8dcd1ebb6cd77248e1b97a78390ea06033) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-8.1.inc (renamed from meta/recipes-devtools/gdb/gdb-8.0.1.inc)5
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_8.1.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch12
-rw-r--r--meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch153
-rw-r--r--meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch101
-rw-r--r--meta/recipes-devtools/gdb/gdb_8.1.bb (renamed from meta/recipes-devtools/gdb/gdb_8.0.1.bb)2
8 files changed, 82 insertions, 193 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 00399ae820..4b58df0459 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"
25GCCVERSION ?= "7.%" 25GCCVERSION ?= "7.%"
26SDKGCCVERSION ?= "${GCCVERSION}" 26SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.30%" 27BINUVERSION ?= "2.30%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.1%"
29GLIBCVERSION ?= "2.27%" 29GLIBCVERSION ?= "2.27%"
30LINUXLIBCVERSION ?= "4.15%" 30LINUXLIBCVERSION ?= "4.15%"
31QEMUVERSION ?= "2.11%" 31QEMUVERSION ?= "2.11%"
diff --git a/meta/recipes-devtools/gdb/gdb-8.0.1.inc b/meta/recipes-devtools/gdb/gdb-8.1.inc
index 4a5299b73f..4d9faa2d4b 100644
--- a/meta/recipes-devtools/gdb/gdb-8.0.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.1.inc
@@ -16,9 +16,8 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
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://package_devel_gdb_patches_120-sigprocmask-invalid-call.patch \
19 file://0012-Unbreak-GDBserver-build-for-x32.patch \
20 file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \ 19 file://gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch \
21" 20"
22SRC_URI[md5sum] = "48cac527e6f3018b865ece021e9723ac" 21SRC_URI[md5sum] = "f46487561f9a16916a8102316f7fd105"
23SRC_URI[sha256sum] = "3dbd5f93e36ba2815ad0efab030dcd0c7b211d7b353a40a53f4c02d7d56295e3" 22SRC_URI[sha256sum] = "af61a0263858e69c5dce51eab26662ff3d2ad9aa68da9583e8143b5426be4b34"
24 23
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.bb
index 301035940c..301035940c 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb b/meta/recipes-devtools/gdb/gdb-cross_8.1.bb
index 50cf159fdb..50cf159fdb 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_8.1.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 4f06d46d70..5d19380e30 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 91da0458b333249eb9c2f4c1f1e53fa4bc085cc9 Mon Sep 17 00:00:00 2001 1From ff37f9360ab6f841f28ced9f23f66542febcc0f6 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/10] include sys/types.h for mode_t 4Subject: [PATCH 01/11] 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,17 +14,17 @@ 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 3cc2bc4bab..e6b19b06b9 100644 17index 25accd2207..7f6bca8aa4 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@@ -28,6 +28,7 @@ 20@@ -29,6 +29,7 @@
21 #include "target/waitstatus.h"
22 #include "mem-break.h" 21 #include "mem-break.h"
23 #include "btrace-common.h" 22 #include "btrace-common.h"
23 #include <vector>
24+#include <sys/types.h> 24+#include <sys/types.h>
25 25
26 struct emit_ops; 26 struct emit_ops;
27 struct buffer; 27 struct buffer;
28-- 28--
292.13.1 292.17.0
30 30
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 cb1b7abd07..f678598284 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,7 +1,7 @@
1From 60ac68f601885ea6480229a5c8a89a0257da376c Mon Sep 17 00:00:00 2001 1From 8757b36be6109f6d7ea0bd8dafbaed647e0d2192 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/10] Add support for Renesas SH (sh4) architecture. 4Subject: [PATCH 05/11] 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 .
@@ -15,35 +15,35 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15--- 15---
16 gdb/Makefile.in | 2 + 16 gdb/Makefile.in | 2 +
17 gdb/configure.host | 1 + 17 gdb/configure.host | 1 +
18 gdb/sh-linux-tdep.c | 519 +++++++++++++++++++++++++++++++++++ 18 gdb/sh-linux-tdep.c | 519 +++++++++++++++++++++++++++
19 gdb/sh-tdep.c | 54 ++-- 19 gdb/sh-tdep.c | 53 ++-
20 gdb/sh-tdep.h | 49 ++++ 20 gdb/sh-tdep.h | 49 +++
21 gdb/testsuite/gdb.asm/asm-source.exp | 5 + 21 gdb/testsuite/gdb.asm/asm-source.exp | 5 +
22 gdb/testsuite/gdb.asm/sh.inc | 3 +- 22 gdb/testsuite/gdb.asm/sh.inc | 3 +-
23 gdb/testsuite/gdb.base/annota1.c | 3 + 23 gdb/testsuite/gdb.base/annota1.c | 3 +
24 gdb/testsuite/gdb.base/annota3.c | 4 + 24 gdb/testsuite/gdb.base/annota3.c | 4 +
25 gdb/testsuite/gdb.base/sigall.c | 3 + 25 gdb/testsuite/gdb.base/sigall.c | 3 +
26 gdb/testsuite/gdb.base/signals.c | 4 + 26 gdb/testsuite/gdb.base/signals.c | 4 +
27 11 files changed, 618 insertions(+), 29 deletions(-) 27 11 files changed, 617 insertions(+), 29 deletions(-)
28 28
29diff --git a/gdb/Makefile.in b/gdb/Makefile.in 29Index: gdb-8.1/gdb/Makefile.in
30index 8be73ba423..e287ff6a2e 100644 30===================================================================
31--- a/gdb/Makefile.in 31--- gdb-8.1.orig/gdb/Makefile.in
32+++ b/gdb/Makefile.in 32+++ gdb-8.1/gdb/Makefile.in
33@@ -2638,6 +2638,8 @@ ALLDEPFILES = \ 33@@ -758,6 +758,8 @@ ALL_TARGET_OBS = \
34 sh-nbsd-tdep.c \ 34 sh-linux-tdep.o \
35 sh-tdep.c \ 35 sh-nbsd-tdep.o \
36 sh64-tdep.c \ 36 sh-tdep.o \
37+ sh-linux-tdep.c \ 37+ sh-linux-tdep.o \
38+ sh-linux-nat.c \ 38+ sh-linux-nat.o \
39 sol2-tdep.c \ 39 sh64-tdep.o \
40 solib-aix.c \ 40 sol2-tdep.o \
41 solib-spu.c \ 41 solib-aix.o \
42diff --git a/gdb/configure.host b/gdb/configure.host 42Index: gdb-8.1/gdb/configure.host
43index d74fd04934..be12de1446 100644 43===================================================================
44--- a/gdb/configure.host 44--- gdb-8.1.orig/gdb/configure.host
45+++ b/gdb/configure.host 45+++ gdb-8.1/gdb/configure.host
46@@ -150,6 +150,7 @@ powerpc*-*-linux*) gdb_host=linux ;; 46@@ -152,6 +152,7 @@ powerpc*-*-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 d74fd04934..be12de1446 100644
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 ;;
54diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c 54Index: gdb-8.1/gdb/sh-linux-tdep.c
55index c5c745d218..84e539aad3 100644 55===================================================================
56--- a/gdb/sh-linux-tdep.c 56--- gdb-8.1.orig/gdb/sh-linux-tdep.c
57+++ b/gdb/sh-linux-tdep.c 57+++ gdb-8.1/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 c5c745d218..84e539aad3 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@@ -180,9 +203,505 @@ static struct tramp_frame sh_linux_rt_si
97 sh_linux_rt_sigreturn_init 97 sh_linux_rt_sigreturn_init
98 }; 98 };
99 99
@@ -599,10 +599,10 @@ index c5c745d218..84e539aad3 100644
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. */
602diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c 602Index: gdb-8.1/gdb/sh-tdep.c
603index 2c2b26847d..14f5281ed4 100644 603===================================================================
604--- a/gdb/sh-tdep.c 604--- gdb-8.1.orig/gdb/sh-tdep.c
605+++ b/gdb/sh-tdep.c 605+++ gdb-8.1/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,15 +613,7 @@ index 2c2b26847d..14f5281ed4 100644
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@@ -35,6 +38,7 @@ 616@@ -67,23 +70,6 @@ static const char *const sh_cc_enum[] =
617 #include "arch-utils.h"
618 #include "floatformat.h"
619 #include "regcache.h"
620+#include "regset.h"
621 #include "doublest.h"
622 #include "osabi.h"
623 #include "reggroups.h"
624@@ -68,23 +72,6 @@ static const char *const sh_cc_enum[] = {
625 617
626 static const char *sh_active_calling_convention = sh_cc_gcc; 618 static const char *sh_active_calling_convention = sh_cc_gcc;
627 619
@@ -645,7 +637,7 @@ index 2c2b26847d..14f5281ed4 100644
645 static int 637 static int
646 sh_is_renesas_calling_convention (struct type *func_type) 638 sh_is_renesas_calling_convention (struct type *func_type)
647 { 639 {
648@@ -1052,7 +1039,7 @@ sh_treat_as_flt_p (struct type *type) 640@@ -1051,7 +1037,7 @@ sh_treat_as_flt_p (struct type *type)
649 return 0; 641 return 0;
650 /* 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
651 treated as float. */ 643 treated as float. */
@@ -654,7 +646,7 @@ index 2c2b26847d..14f5281ed4 100644
654 return 1; 646 return 1;
655 /* Otherwise it's not treated as float. */ 647 /* Otherwise it's not treated as float. */
656 return 0; 648 return 0;
657@@ -1102,7 +1089,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch, 649@@ -1101,7 +1087,7 @@ sh_push_dummy_call_fpu (struct gdbarch *
658 in four registers available. Loop thru args from first to last. */ 650 in four registers available. Loop thru args from first to last. */
659 for (argnum = 0; argnum < nargs; argnum++) 651 for (argnum = 0; argnum < nargs; argnum++)
660 { 652 {
@@ -663,7 +655,7 @@ index 2c2b26847d..14f5281ed4 100644
663 len = TYPE_LENGTH (type); 655 len = TYPE_LENGTH (type);
664 val = sh_justify_value_in_reg (gdbarch, args[argnum], len); 656 val = sh_justify_value_in_reg (gdbarch, args[argnum], len);
665 657
666@@ -1828,7 +1815,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum, 658@@ -1835,7 +1821,7 @@ sh_dwarf2_frame_init_reg (struct gdbarch
667 reg->how = DWARF2_FRAME_REG_UNDEFINED; 659 reg->how = DWARF2_FRAME_REG_UNDEFINED;
668 } 660 }
669 661
@@ -672,7 +664,7 @@ index 2c2b26847d..14f5281ed4 100644
672 sh_alloc_frame_cache (void) 664 sh_alloc_frame_cache (void)
673 { 665 {
674 struct sh_frame_cache *cache; 666 struct sh_frame_cache *cache;
675@@ -1855,7 +1842,7 @@ sh_alloc_frame_cache (void) 667@@ -1862,7 +1848,7 @@ sh_alloc_frame_cache (void)
676 return cache; 668 return cache;
677 } 669 }
678 670
@@ -681,7 +673,7 @@ index 2c2b26847d..14f5281ed4 100644
681 sh_frame_cache (struct frame_info *this_frame, void **this_cache) 673 sh_frame_cache (struct frame_info *this_frame, void **this_cache)
682 { 674 {
683 struct gdbarch *gdbarch = get_frame_arch (this_frame); 675 struct gdbarch *gdbarch = get_frame_arch (this_frame);
684@@ -1922,9 +1909,9 @@ sh_frame_cache (struct frame_info *this_frame, void **this_cache) 676@@ -1929,9 +1915,9 @@ sh_frame_cache (struct frame_info *this_
685 return cache; 677 return cache;
686 } 678 }
687 679
@@ -694,7 +686,7 @@ index 2c2b26847d..14f5281ed4 100644
694 { 686 {
695 struct gdbarch *gdbarch = get_frame_arch (this_frame); 687 struct gdbarch *gdbarch = get_frame_arch (this_frame);
696 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);
697@@ -1938,7 +1925,7 @@ sh_frame_prev_register (struct frame_info *this_frame, 689@@ -1945,7 +1931,7 @@ sh_frame_prev_register (struct frame_inf
698 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
699 the correct place. */ 691 the correct place. */
700 if (regnum == gdbarch_pc_regnum (gdbarch)) 692 if (regnum == gdbarch_pc_regnum (gdbarch))
@@ -703,7 +695,7 @@ index 2c2b26847d..14f5281ed4 100644
703 695
704 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) 696 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1)
705 return frame_unwind_got_memory (this_frame, regnum, 697 return frame_unwind_got_memory (this_frame, regnum,
706@@ -2247,8 +2234,8 @@ sh_return_in_first_hidden_param_p (struct gdbarch *gdbarch, 698@@ -2254,8 +2240,8 @@ sh_return_in_first_hidden_param_p (struc
707 static struct gdbarch * 699 static struct gdbarch *
708 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 700 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
709 { 701 {
@@ -713,7 +705,7 @@ index 2c2b26847d..14f5281ed4 100644
713 705
714 /* SH5 is handled entirely in sh64-tdep.c. */ 706 /* SH5 is handled entirely in sh64-tdep.c. */
715 if (info.bfd_arch_info->mach == bfd_mach_sh5) 707 if (info.bfd_arch_info->mach == bfd_mach_sh5)
716@@ -2264,6 +2251,18 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 708@@ -2271,6 +2257,18 @@ sh_gdbarch_init (struct gdbarch_info inf
717 tdep = XCNEW (struct gdbarch_tdep); 709 tdep = XCNEW (struct gdbarch_tdep);
718 gdbarch = gdbarch_alloc (&info, tdep); 710 gdbarch = gdbarch_alloc (&info, tdep);
719 711
@@ -732,7 +724,7 @@ index 2c2b26847d..14f5281ed4 100644
732 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); 724 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT);
733 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); 725 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT);
734 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); 726 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
735@@ -2418,10 +2417,11 @@ sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 727@@ -2425,10 +2423,11 @@ sh_gdbarch_init (struct gdbarch_info inf
736 break; 728 break;
737 } 729 }
738 730
@@ -745,10 +737,10 @@ index 2c2b26847d..14f5281ed4 100644
745 frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind); 737 frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind);
746 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); 738 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind);
747 739
748diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h 740Index: gdb-8.1/gdb/sh-tdep.h
749index d15ef050e0..c4642cefa4 100644 741===================================================================
750--- a/gdb/sh-tdep.h 742--- gdb-8.1.orig/gdb/sh-tdep.h
751+++ b/gdb/sh-tdep.h 743+++ gdb-8.1/gdb/sh-tdep.h
752@@ -21,6 +21,12 @@ 744@@ -21,6 +21,12 @@
753 745
754 /* Contributed by Steve Chamberlain sac@cygnus.com. */ 746 /* Contributed by Steve Chamberlain sac@cygnus.com. */
@@ -828,10 +820,10 @@ index d15ef050e0..c4642cefa4 100644
828 /* Non-NULL when debugging from a core file. Provides the offset 820 /* Non-NULL when debugging from a core file. Provides the offset
829 where each general-purpose register is stored inside the associated 821 where each general-purpose register is stored inside the associated
830 core file section. */ 822 core file section. */
831diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp 823Index: gdb-8.1/gdb/testsuite/gdb.asm/asm-source.exp
832index e07e5543f2..f5e60e1002 100644 824===================================================================
833--- a/gdb/testsuite/gdb.asm/asm-source.exp 825--- gdb-8.1.orig/gdb/testsuite/gdb.asm/asm-source.exp
834+++ b/gdb/testsuite/gdb.asm/asm-source.exp 826+++ gdb-8.1/gdb/testsuite/gdb.asm/asm-source.exp
835@@ -116,6 +116,11 @@ switch -glob -- [istarget] { 827@@ -116,6 +116,11 @@ switch -glob -- [istarget] {
836 append link-flags " -m elf32ppc" 828 append link-flags " -m elf32ppc"
837 } 829 }
@@ -844,10 +836,10 @@ index e07e5543f2..f5e60e1002 100644
844 "sh*-*-*" { 836 "sh*-*-*" {
845 set asm-arch sh 837 set asm-arch sh
846 set debug-flags "-gdwarf-2" 838 set debug-flags "-gdwarf-2"
847diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc 839Index: gdb-8.1/gdb/testsuite/gdb.asm/sh.inc
848index a4a5fc545e..89efed7795 100644 840===================================================================
849--- a/gdb/testsuite/gdb.asm/sh.inc 841--- gdb-8.1.orig/gdb/testsuite/gdb.asm/sh.inc
850+++ b/gdb/testsuite/gdb.asm/sh.inc 842+++ gdb-8.1/gdb/testsuite/gdb.asm/sh.inc
851@@ -40,9 +40,8 @@ 843@@ -40,9 +40,8 @@
852 mov.l .Lconst\@,r1 844 mov.l .Lconst\@,r1
853 bra .Lafterconst\@ 845 bra .Lafterconst\@
@@ -859,10 +851,10 @@ index a4a5fc545e..89efed7795 100644
859 .long \subr 851 .long \subr
860 .align 1 852 .align 1
861 .Lafterconst\@: 853 .Lafterconst\@:
862diff --git a/gdb/testsuite/gdb.base/annota1.c b/gdb/testsuite/gdb.base/annota1.c 854Index: gdb-8.1/gdb/testsuite/gdb.base/annota1.c
863index 424e1b8327..0de2e7b633 100644 855===================================================================
864--- a/gdb/testsuite/gdb.base/annota1.c 856--- gdb-8.1.orig/gdb/testsuite/gdb.base/annota1.c
865+++ b/gdb/testsuite/gdb.base/annota1.c 857+++ gdb-8.1/gdb/testsuite/gdb.base/annota1.c
866@@ -1,6 +1,9 @@ 858@@ -1,6 +1,9 @@
867 #include <stdio.h> 859 #include <stdio.h>
868 #include <signal.h> 860 #include <signal.h>
@@ -873,10 +865,10 @@ index 424e1b8327..0de2e7b633 100644
873 865
874 void 866 void
875 handle_USR1 (int sig) 867 handle_USR1 (int sig)
876diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c 868Index: gdb-8.1/gdb/testsuite/gdb.base/annota3.c
877index 424e1b8327..952aaf218a 100644 869===================================================================
878--- a/gdb/testsuite/gdb.base/annota3.c 870--- gdb-8.1.orig/gdb/testsuite/gdb.base/annota3.c
879+++ b/gdb/testsuite/gdb.base/annota3.c 871+++ gdb-8.1/gdb/testsuite/gdb.base/annota3.c
880@@ -1,6 +1,10 @@ 872@@ -1,6 +1,10 @@
881 #include <stdio.h> 873 #include <stdio.h>
882 #include <signal.h> 874 #include <signal.h>
@@ -888,10 +880,10 @@ index 424e1b8327..952aaf218a 100644
888 880
889 void 881 void
890 handle_USR1 (int sig) 882 handle_USR1 (int sig)
891diff --git a/gdb/testsuite/gdb.base/sigall.c b/gdb/testsuite/gdb.base/sigall.c 883Index: gdb-8.1/gdb/testsuite/gdb.base/sigall.c
892index 81f3b08d6b..1574b2d6cb 100644 884===================================================================
893--- a/gdb/testsuite/gdb.base/sigall.c 885--- gdb-8.1.orig/gdb/testsuite/gdb.base/sigall.c
894+++ b/gdb/testsuite/gdb.base/sigall.c 886+++ gdb-8.1/gdb/testsuite/gdb.base/sigall.c
895@@ -1,6 +1,9 @@ 887@@ -1,6 +1,9 @@
896 #include <signal.h> 888 #include <signal.h>
897 #include <unistd.h> 889 #include <unistd.h>
@@ -902,10 +894,10 @@ index 81f3b08d6b..1574b2d6cb 100644
902 894
903 /* 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
904 signals really get delivered. */ 896 signals really get delivered. */
905diff --git a/gdb/testsuite/gdb.base/signals.c b/gdb/testsuite/gdb.base/signals.c 897Index: gdb-8.1/gdb/testsuite/gdb.base/signals.c
906index 756606880f..1205a9bc9c 100644 898===================================================================
907--- a/gdb/testsuite/gdb.base/signals.c 899--- gdb-8.1.orig/gdb/testsuite/gdb.base/signals.c
908+++ b/gdb/testsuite/gdb.base/signals.c 900+++ gdb-8.1/gdb/testsuite/gdb.base/signals.c
909@@ -3,6 +3,10 @@ 901@@ -3,6 +3,10 @@
910 #include <signal.h> 902 #include <signal.h>
911 #include <unistd.h> 903 #include <unistd.h>
@@ -917,6 +909,3 @@ index 756606880f..1205a9bc9c 100644
917 909
918 static int count = 0; 910 static int count = 0;
919 911
920--
9212.13.1
922
diff --git a/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch b/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch
deleted file mode 100644
index 18a3ce3d63..0000000000
--- a/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch
+++ /dev/null
@@ -1,101 +0,0 @@
1From 3e1e401053ea5f02a9e9c65abddd31a03baa1bd1 Mon Sep 17 00:00:00 2001
2From: Yao Qi <yao.qi@linaro.org>
3Date: Fri, 29 Dec 2017 12:57:25 +0800
4Subject: [PATCH] Unbreak GDBserver build for x32
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9When I verify my target description changes, I build GDB and GDBserver for
10x32, but it failed.
11
12/../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c
13../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c: In function ‘const target_desc* get_ipa_tdesc(int)’:
14../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:184:10: error: ‘X86_TDESC_AVX512’ was not declared in this scope
15 case X86_TDESC_AVX512:
16 ^
17../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:185:14: error: ‘tdesc_x32_avx512_linux’ was not declared in this scope
18 return tdesc_x32_avx512_linux;
19 ^
20../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c: In function ‘void initialize_low_tracepoint()’:
21../../../binutils-gdb/gdb/gdbserver/linux-amd64-ipa.c:282:36: error: ‘init_registers_x32_avx512_linux’ was not declared in this scope
22 init_registers_x32_avx512_linux ();
23 ^
24
25ipa_x32_linux_regobj use to be there, but removed by
2622049425ce40324139be82d9a6ec518c46b65815 by mistake.
27
28gdb/gdbserver:
29
302017-08-04 Yao Qi <yao.qi@linaro.org>
31
32 * configure.srv (ipa_x32_linux_regobj): New.
33 * linux-amd64-ipa.c (get_ipa_tdesc): Use X86_TDESC_AVX_AVX512
34 instead of X86_TDESC_AVX512.
35 (initialize_low_tracepoint): Call
36 init_registers_x32_avx_avx512_linux.
37
38Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=f02fd7745d003d65fd3b981618e07b874b721d79]
39
40Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
41---
42 ChangeLog | 8 ++++++++
43 gdb/gdbserver/configure.srv | 1 +
44 gdb/gdbserver/linux-amd64-ipa.c | 6 +++---
45 3 files changed, 12 insertions(+), 3 deletions(-)
46
47diff --git a/ChangeLog b/ChangeLog
48index 4ac2d63..b5b8228 100644
49--- a/ChangeLog
50+++ b/ChangeLog
51@@ -1,3 +1,11 @@
52+ 2017-08-04 Yao Qi <yao.qi@linaro.org>
53+
54+ * configure.srv (ipa_x32_linux_regobj): New.
55+ * linux-amd64-ipa.c (get_ipa_tdesc): Use X86_TDESC_AVX_AVX512
56+ instead of X86_TDESC_AVX512.
57+ (initialize_low_tracepoint): Call
58+ init_registers_x32_avx_avx512_linux.
59+
60 2017-04-13 Andrew Jenner <andrew@codesourcery.com>
61
62 * config.sub: Sync with master version in config project.
63diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
64index d00d9e2..56951c8 100644
65--- a/gdb/gdbserver/configure.srv
66+++ b/gdb/gdbserver/configure.srv
67@@ -31,6 +31,7 @@ srv_amd64_linux_regobj="amd64-linux.o amd64-avx-linux.o amd64-avx-avx512-linux.o
68
69 ipa_i386_linux_regobj="i386-linux-ipa.o i386-avx-linux-ipa.o i386-avx-mpx-linux-ipa.o i386-avx-avx512-linux-ipa.o i386-avx-mpx-avx512-pku-linux-ipa.o i386-mpx-linux-ipa.o i386-mmx-linux-ipa.o"
70 ipa_amd64_linux_regobj="amd64-linux-ipa.o amd64-avx-linux-ipa.o amd64-avx-mpx-linux-ipa.o amd64-avx-avx512-linux-ipa.o amd64-avx-mpx-avx512-pku-linux-ipa.o amd64-mpx-linux-ipa.o"
71+ipa_x32_linux_regobj="x32-linux-ipa.o x32-avx-linux-ipa.o x32-avx-avx512-linux-ipa.o"
72 ipa_ppc_linux_regobj="powerpc-32l-ipa.o powerpc-altivec32l-ipa.o powerpc-cell32l-ipa.o powerpc-vsx32l-ipa.o powerpc-isa205-32l-ipa.o powerpc-isa205-altivec32l-ipa.o powerpc-isa205-vsx32l-ipa.o powerpc-e500l-ipa.o powerpc-64l-ipa.o powerpc-altivec64l-ipa.o powerpc-cell64l-ipa.o powerpc-vsx64l-ipa.o powerpc-isa205-64l-ipa.o powerpc-isa205-altivec64l-ipa.o powerpc-isa205-vsx64l-ipa.o"
73
74 srv_i386_32bit_xmlfiles="i386/32bit-core.xml i386/32bit-sse.xml i386/32bit-avx.xml i386/32bit-avx512.xml i386/32bit-mpx.xml i386/32bit-pkeys.xml"
75diff --git a/gdb/gdbserver/linux-amd64-ipa.c b/gdb/gdbserver/linux-amd64-ipa.c
76index 67f36c2..683339b 100644
77--- a/gdb/gdbserver/linux-amd64-ipa.c
78+++ b/gdb/gdbserver/linux-amd64-ipa.c
79@@ -181,8 +181,8 @@ get_ipa_tdesc (int idx)
80 return tdesc_x32_linux;
81 case X86_TDESC_AVX:
82 return tdesc_x32_avx_linux;
83- case X86_TDESC_AVX512:
84- return tdesc_x32_avx512_linux;
85+ case X86_TDESC_AVX_AVX512:
86+ return tdesc_x32_avx_avx512_linux;
87 default:
88 break;
89 }
90@@ -279,7 +279,7 @@ initialize_low_tracepoint (void)
91 #if defined __ILP32__
92 init_registers_x32_linux ();
93 init_registers_x32_avx_linux ();
94- init_registers_x32_avx512_linux ();
95+ init_registers_x32_avx_avx512_linux ();
96 #else
97 init_registers_amd64_linux ();
98 init_registers_amd64_avx_linux ();
99--
1002.7.4
101
diff --git a/meta/recipes-devtools/gdb/gdb_8.0.1.bb b/meta/recipes-devtools/gdb/gdb_8.1.bb
index ea8fef122c..84ab08ce93 100644
--- a/meta/recipes-devtools/gdb/gdb_8.0.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_8.1.bb
@@ -6,6 +6,8 @@ inherit python3-dir
6EXTRA_OEMAKE_append_libc-musl = "\ 6EXTRA_OEMAKE_append_libc-musl = "\
7 gt_cv_func_gnugettext1_libc=yes \ 7 gt_cv_func_gnugettext1_libc=yes \
8 gt_cv_func_gnugettext2_libc=yes \ 8 gt_cv_func_gnugettext2_libc=yes \
9 gl_cv_func_working_strerror=yes \
10 gl_cv_func_strerror_0_works=yes \
9 gl_cv_func_gettimeofday_clobber=no \ 11 gl_cv_func_gettimeofday_clobber=no \
10 " 12 "
11 13