package/gdb: add support for gdb 10.x
PATCH 1/3 package/gdb: add support for gdb 10.x
All patches from gdb 9.2 are kept, except 0006-sim-ppc-Fix-linker-error-with-fno-common.patch which is upstream. The other patches are rebased to accommodate some code re-organization in gdb 10.x, especially the move of the gdbserver code from gdb/gdbserver/ to gdbserver/.
--- ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++ ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++ package/gdb/10.1/0003-use-asm-sgidefs.h.patch | 40 ++++++++++++ .../0004-gdbserver-fix-build-for-m68k.patch | 63 +++++++++++++++++++ ...fork-inferior-include-linux-ptrace.h.patch | 53 ++++++++++++++++ package/gdb/Config.in.host | 4 ++ package/gdb/gdb.hash | 1 + package/gdb/gdb.mk | 6 ++ 8 files changed, 265 insertions(+) create mode 100644 package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/10.1/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch
package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file +55 -0
@@ -0,0 +1,55 @@ +From 64b8ab56118d2fea027adfb7ebbc01668b29528e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Thomas Petazzoni <[email protected]> +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour <[email protected]> +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index d937a65b69c..1fd54b4a0e0 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include <asm/cputable.h> + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 337d555aee7..5d518f37268 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include <sys/uio.h> + #include <elf.h> ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.29.2 +
package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file +43 -0
43 lines not on this page · raw message
package/gdb/10.1/0003-use-asm-sgidefs.h.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <[email protected]> +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use <asm/sgidefs.h> + +Build fix for MIPS with musl libc + +The MIPS specific header <sgidefs.h> is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide +<asm/sgidefs.h> which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy <[email protected]> +Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Vicente Olivert Riera <[email protected]> +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 38ff461a35b..b6cf194b2bf 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include <sgidefs.h> ++#include <asm/sgidefs.h> + #include "nat/gdb_ptrace.h" + #include <asm/ptrace.h> + #include "inf-ptrace.h" +-- +2.29.2 +
package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch new file +63 -0
63 lines not on this page · raw message
package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file +53 -0
53 lines not on this page · raw message
package/gdb/Config.in.host +4 -0
@@ -78,6 +78,9 @@ config BR2_GDB_VERSION_8_3 config BR2_GDB_VERSION_9_2 bool "gdb 9.2.x" +config BR2_GDB_VERSION_10 + bool "gdb 10.x" + endchoice endif
@@ -90,4 +93,5 @@ config BR2_GDB_VERSION default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB default "8.3.1" if BR2_GDB_VERSION_8_3 default "9.2" if BR2_GDB_VERSION_9_2 + default "10.1" if BR2_GDB_VERSION_10 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
package/gdb/gdb.hash +1 -0
@@ -2,6 +2,7 @@ sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz
package/gdb/gdb.mk +6 -0
@@ -8,6 +8,12 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz +# recent gdb versions (>= 10) have gdbserver moved at the top-level, +# which requires a different build logic. +ifeq ($(BR2_GDB_VERSION_10),y) +GDB_GDBSERVER_TOPLEVEL = y +endif + ifeq ($(BR2_arc),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
Signature · 1 line
2.29.2
PATCH 2/3 package/gdb: make gdb 9.2 the default version
Now that we have added gdb 10.1, let's switch to using gdb 9.2 as the default version.
--- package/gdb/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/gdb/Config.in.host +3 -3
@@ -63,7 +63,7 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_8_3 + default BR2_GDB_VERSION_9_2 depends on !BR2_arc depends on !BR2_csky help
@@ -90,8 +90,8 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB + default "8.2.1" if BR2_GDB_VERSION_8_2 default "8.3.1" if BR2_GDB_VERSION_8_3 - default "9.2" if BR2_GDB_VERSION_9_2 + default "9.2" if BR2_GDB_VERSION_9_2 || !BR2_PACKAGE_HOST_GDB default "10.1" if BR2_GDB_VERSION_10 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
Signature · 1 line
2.29.2
PATCH 3/3 package/gdb: drop gdb 8.2
In reply to Thomas PetazzoniWith the introduction of gdb 10.1, we now have four versions of gdb supported, so let's drop support for the oldest.
--- Config.in.legacy | 7 +++ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ---------------- ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 ------------- .../gdb/8.2.1/0003-use-asm-sgidefs.h.patch | 40 ------------ .../0004-gdbserver-fix-build-for-m68k.patch | 62 ------------------- ...fork-inferior-include-linux-ptrace.h.patch | 51 --------------- ...e-of-is-operator-for-comparison-in-p.patch | 42 ------------- package/gdb/Config.in.host | 4 -- package/gdb/gdb.hash | 1 - 9 files changed, 7 insertions(+), 298 deletions(-) delete mode 100644 package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch delete mode 100644 package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch delete mode 100644 package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch delete mode 100644 package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch delete mode 100644 package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch delete mode 100644 package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch
Config.in.legacy +7 -0
@@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.02" +config BR2_GDB_VERSION_8_2 + bool "gdb 8.2.x has been removed" + select BR2_LEGACY + help + gdb 8.2 support has been removed, you can use a newer + version such as 8.3 or more recent. + config BR2_PACKAGE_HOST_RCW bool "rcw package was renamed to oriq-rcw" select BR2_PACKAGE_HOST_QORIQ_RCW
package/gdb/8.2.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted +0 -55
55 lines not on this page · raw message
package/gdb/8.2.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted +0 -43
43 lines not on this page · raw message
package/gdb/8.2.1/0003-use-asm-sgidefs.h.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From b286989e94e09c992462771cdbd3dc684f660b4f Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <[email protected]> -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use <asm/sgidefs.h> - -Build fix for MIPS with musl libc - -The MIPS specific header <sgidefs.h> is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide -<asm/sgidefs.h> which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy <[email protected]> -Signed-off-by: Khem Raj <[email protected]> -Signed-off-by: Vicente Olivert Riera <[email protected]> ---- - gdb/mips-linux-nat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index 21b1f583b92..de525ae6b01 100644 ---- a/gdb/mips-linux-nat.c -+++ b/gdb/mips-linux-nat.c -@@ -31,7 +31,7 @@ - #include "gdb_proc_service.h" - #include "gregset.h" - --#include <sgidefs.h> -+#include <asm/sgidefs.h> - #include "nat/gdb_ptrace.h" - #include <asm/ptrace.h> - #include "inf-ptrace.h" --- -2.14.4 -
package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch deleted +0 -62
62 lines not on this page · raw message
package/gdb/8.2.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch deleted +0 -51
51 lines not on this page · raw message
package/gdb/8.2.1/0006-Fix-incorrect-use-of-is-operator-for-comparison-in-p.patch deleted +0 -42
42 lines not on this page · raw message
package/gdb/Config.in.host +0 -4
@@ -69,9 +69,6 @@ choice help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_8_2 - bool "gdb 8.2.x" - config BR2_GDB_VERSION_8_3 bool "gdb 8.3.x"
@@ -90,7 +87,6 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "8.2.1" if BR2_GDB_VERSION_8_2 default "8.3.1" if BR2_GDB_VERSION_8_3 default "9.2" if BR2_GDB_VERSION_9_2 || !BR2_PACKAGE_HOST_GDB default "10.1" if BR2_GDB_VERSION_10
package/gdb/gdb.hash +0 -1
@@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz
Signature · 1 line
2.29.2
PATCH 1/3 package/gdb: add support for gdb 10.x
In reply to Thomas PetazzoniThomas, All,
On 2020-12-28 21:10 +0100, Thomas Petazzoni spake thusly:
Quoted 7 lines
All patches from gdb 9.2 are kept, except 0006-sim-ppc-Fix-linker-error-with-fno-common.patch which is upstream. The other patches are rebased to accommodate some code re-organization in gdb 10.x, especially the move of the gdbserver code from gdb/gdbserver/ to gdbserver/.
Signed-off-by Thomas Petazzoni <[email protected]>
Full series applied to master, thanks.
I just added a blurb in the patch 2/3 commit log, about the previous discrepancy about default version.
Thanks!
Regards,
Yann E. MORIN.
Quoted 356 lines
--- ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++ ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++ package/gdb/10.1/0003-use-asm-sgidefs.h.patch | 40 ++++++++++++ .../0004-gdbserver-fix-build-for-m68k.patch | 63 +++++++++++++++++++ ...fork-inferior-include-linux-ptrace.h.patch | 53 ++++++++++++++++ package/gdb/Config.in.host | 4 ++ package/gdb/gdb.hash | 1 + package/gdb/gdb.mk | 6 ++ 8 files changed, 265 insertions(+) create mode 100644 package/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch create mode 100644 package/gdb/10.1/0003-use-asm-sgidefs.h.patch create mode 100644 package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch create mode 100644 package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patchpackage/gdb/10.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file +55
-0@@ -0,0 +1,55 @@ +From 64b8ab56118d2fea027adfb7ebbc01668b29528e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 6 Aug 2016 17:32:50 -0700 +Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Thomas Petazzoni <[email protected]> +[Rebase on gdb 8.3] +Signed-off-by: Romain Naour <[email protected]> +--- + gdb/nat/ppc-linux.h | 6 ++++++ + gdbserver/linux-ppc-low.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h +index d937a65b69c..1fd54b4a0e0 100644 +--- a/gdb/nat/ppc-linux.h ++++ b/gdb/nat/ppc-linux.h +@@ -18,7 +18,13 @@ + #ifndef NAT_PPC_LINUX_H + #define NAT_PPC_LINUX_H + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + #include <asm/cputable.h> + + /* This sometimes isn't defined. */ +diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc +index 337d555aee7..5d518f37268 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,13 @@ + #include "elf/common.h" + #include <sys/uio.h> + #include <elf.h> ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++#endif + + #include "arch/ppc-linux-common.h" + #include "arch/ppc-linux-tdesc.h" +-- +2.29.2 +package/gdb/10.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file +43
-0@@ -0,0 +1,43 @@ +From d205f398e1e36f9673f50f368a3f29fd1dfaa794 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sat, 3 Jun 2017 21:23:52 +0200 +Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC + systems + +Fixes a pt_{dsp,}regs redefinition when building with the musl C library +on SuperH. + +Inspired by +http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch, +adapted for SuperH. + +Signed-off-by: Thomas Petazzoni <[email protected]> +[Rebase on gdb 8.0] +Signed-off-by: Romain Naour <[email protected]> +--- + gdbserver/linux-sh-low.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc +index a6d3fc60047..b83cce6b9fe 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh; + #include <sys/reg.h> + #endif + ++#if !defined(__GLIBC__) ++# define pt_regs uapi_pt_regs ++# define pt_dspregs uapi_pt_dspregs ++#endif + #include <asm/ptrace.h> ++#if !defined(__GLIBC__) ++# undef pt_regs ++# undef pt_dspregs ++#endif + + #define sh_num_regs 41 + +-- +2.29.2 +package/gdb/10.1/0003-use-asm-sgidefs.h.patch new file +40
-0@@ -0,0 +1,40 @@ +From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <[email protected]> +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use <asm/sgidefs.h> + +Build fix for MIPS with musl libc + +The MIPS specific header <sgidefs.h> is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide +<asm/sgidefs.h> which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy <[email protected]> +Signed-off-by: Khem Raj <[email protected]> +Signed-off-by: Vicente Olivert Riera <[email protected]> +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 38ff461a35b..b6cf194b2bf 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include <sgidefs.h> ++#include <asm/sgidefs.h> + #include "nat/gdb_ptrace.h" + #include <asm/ptrace.h> + #include "inf-ptrace.h" +-- +2.29.2 +package/gdb/10.1/0004-gdbserver-fix-build-for-m68k.patch new file +63
-0@@ -0,0 +1,63 @@ +From 90ebe548922538b854de52e8b687384f44360984 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Fri, 22 Jun 2018 22:40:26 +0200 +Subject: [PATCH] gdbserver: fix build for m68k +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As for strace [1], when <sys/reg.h> is included after <linux/ptrace.h>, +the build fails on m68k with the following diagnostics: + +In file included from ./../nat/linux-ptrace.h:28:0, + from linux-low.h:27, + from linux-m68k-low.c:20: +[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant + PT_D1 = 0, + ^ +[...]usr/include/sys/reg.h:26:3: error: expected ??}?? before numeric constant +[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant +In file included from linux-m68k-low.c:27:0: +[...]usr/include/sys/reg.h:99:1: error: expected declaration before ??}?? token + }; + ^ + +Fix this by moving <sys/reg.h> on top of "linux-low.h". + +[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92 + +Signed-off-by: Romain Naour <[email protected]> +--- + gdbserver/linux-m68k-low.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 838ba353b0b..36679682b9a 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -17,6 +17,11 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include "server.h" ++ ++#ifdef HAVE_SYS_REG_H ++#include <sys/reg.h> ++#endif ++ + #include "linux-low.h" + + /* Linux target op definitions for the m68k architecture. */ +@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () + void init_registers_m68k (void); + extern const struct target_desc *tdesc_m68k; + +-#ifdef HAVE_SYS_REG_H +-#include <sys/reg.h> +-#endif +- + #define m68k_num_regs 29 + #define m68k_num_gregs 18 + +-- +2.29.2 +package/gdb/10.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file +53
-0@@ -0,0 +1,53 @@ +From c8454711eca2e79437e17ed1e1e68b48b4c8d927 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 24 Jun 2018 23:33:55 +0200 +Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h + +To decide whether fork() or vfork() should be used, fork-inferior.c +uses the following test: + + #if !(defined(__UCLIBC__) && defined(HAS_NOMMU)) + +However, HAS_NOMMU is never defined, because it gets defined in +linux-ptrace.h, which is not included by fork-inferior.c. Due to this, +gdbserver fails to build on noMMU architectures. This commit fixes +that by simply including linux-ptrace.h. + +This bug was introduced by commit +2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al +with gdbserver"). Indeed, the same fork()/vfork() selection was done, +but in another file where linux-ptrace.h was included. + +Fixes the following build issue: + +../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))': +../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope + pid = fork (); + ^~~~ +../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork' + pid = fork (); + ^~~~ + vfork + +Signed-off-by: Thomas Petazzoni <[email protected]> +[Romain: rebase on gdb 8.3] +Signed-off-by: Romain Naour <[email protected]> +--- + gdb/nat/fork-inferior.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c +index 7ba0126871d..53e1ec72f09 100644 +--- a/gdb/nat/fork-inferior.c ++++ b/gdb/nat/fork-inferior.c +@@ -27,6 +27,7 @@ + #include "gdbsupport/pathstuff.h" + #include "gdbsupport/signals-state-save-restore.h" + #include "gdbsupport/gdb_tilde_expand.h" ++#include "linux-ptrace.h" + #include <vector> + + extern char **environ; +-- +2.29.2 +package/gdb/Config.in.host +4
-0@@ -78,6 +78,9 @@ config BR2_GDB_VERSION_8_3 config BR2_GDB_VERSION_9_2 bool "gdb 9.2.x" +config BR2_GDB_VERSION_10 + bool "gdb 10.x" + endchoice endif@@ -90,4 +93,5 @@ config BR2_GDB_VERSION default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB default "8.3.1" if BR2_GDB_VERSION_8_3 default "9.2" if BR2_GDB_VERSION_9_2 + default "10.1" if BR2_GDB_VERSION_10 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDBpackage/gdb/gdb.hash +1
-0@@ -2,6 +2,7 @@ sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +sha512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 gdb-10.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gzpackage/gdb/gdb.mk +6
-0@@ -8,6 +8,12 @@ GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) GDB_SITE = $(BR2_GNU_MIRROR)/gdb GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz +# recent gdb versions (>= 10) have gdbserver moved at the top-level, +# which requires a different build logic. +ifeq ($(BR2_GDB_VERSION_10),y) +GDB_GDBSERVER_TOPLEVEL = y +endif + ifeq ($(BR2_arc),y) GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) GDB_SOURCE = gdb-$(GDB_VERSION).tar.gzSignature · 6 lines
2.29.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'