[Buildroot] [git commit] package/gdb: remove version 14.x
Julien Olivain via buildroot <[email protected]>
| Newsgroups | net.busybox.buildroot |
|---|---|
| Message-ID | <[email protected]> |
commit: https://gitlab.com/buildroot.org/buildroot/-/commit/6737c90bc6f89cf0c702707933207dd7c5e3398a branch: https://gitlab.com/buildroot.org/buildroot/-/tree/master Now that gdb 17.x has been added[1], and gdb 16.x made the default[2], let's remove support for gdb 14.x. Aside from the usual removal, we also simplify things a bit as GDB 14.x was the last version not depending on gcc >= 9.x. As it is now a mandatory dependency we move it outside the choice. [1] 4868e0dd621013ff3d3b6e81a86d0d981ae21646 [2] 23e70547ca1746c638a4e327548eefeb205faeff Signed-off-by: Bernd Kuhls <[email protected]> Signed-off-by: Julien Olivain <[email protected]> --- .checkpackageignore | 9 ---- Config.in.legacy | 7 +++ ...Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ------------------- ...efine-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 --------------- package/gdb/14.2/0003-use-asm-sgidefs.h.patch | 40 -------------- .../14.2/0004-gdbserver-fix-build-for-m68k.patch | 63 ---------------------- ...-nat-fork-inferior-include-linux-ptrace.h.patch | 53 ------------------ ...-Fix-getrandom-compile-for-uclibc-v1.0.35.patch | 39 -------------- .../gdb/14.2/0007-fix-musl-build-on-riscv.patch | 60 --------------------- .../0008-gdbserver-Makefile.in-fix-NLS-build.patch | 38 ------------- .../14.2/0009-gdb-Fix-native-build-on-xtensa.patch | 57 -------------------- package/gdb/Config.in.host | 18 +++---- package/gdb/gdb.hash | 1 - 13 files changed, 13 insertions(+), 470 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index c815170e9a..2567d30c51 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -356,15 +356,6 @@ package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch lib_patch.Upstream package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch lib_patch.Upstream package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch lib_patch.Upstream package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch lib_patch.Upstream -package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream -package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream -package/gdb/14.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream -package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch lib_patch.Upstream -package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch lib_patch.Upstream -package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch lib_patch.Upstream -package/gdb/14.2/0007-fix-musl-build-on-riscv.patch lib_patch.Upstream -package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch lib_patch.Upstream -package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch lib_patch.Upstream package/gdb/15.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch lib_patch.Upstream package/gdb/15.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch lib_patch.Upstream package/gdb/15.2/0003-use-asm-sgidefs.h.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 9a6c417f03..0f9b7e9e7a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.08" +config BR2_GDB_VERSION_14 + bool "gdb 14.x has been removed" + select BR2_LEGACY + help + GDB 14.x support has been removed, a newer version should be + used instead. + config BR2_PACKAGE_ARGPARSE bool "argparse has been removed" select BR2_LEGACY diff --git a/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index b213ba5a09..0000000000 --- a/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ee74f5a6fa98b43c45c9c56a26c00abc21aeeaa1 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 c84f9146bbd..8c8580c95e1 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 86fbc8f5d96..8a1a39bc750 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.43.0 - diff --git a/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index b070c4fc05..0000000000 --- a/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 57b2606e39b2ac90a3810baccbd73161ffdb5f2d 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 782b8292010..e42f29b845a 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.43.0 - diff --git a/package/gdb/14.2/0003-use-asm-sgidefs.h.patch b/package/gdb/14.2/0003-use-asm-sgidefs.h.patch deleted file mode 100644 index 12f0885b34..0000000000 --- a/package/gdb/14.2/0003-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5288e2a3dcb2928e1367cd1d4c31da3b8310f3a0 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 8a7cc95f2a4..3686f43abfd 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.43.0 - diff --git a/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch deleted file mode 100644 index 21509b3283..0000000000 --- a/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5e352184c2fc696c5b7aff1985098c460686a638 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 6094fd914f5..3613d9f642a 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.43.0 - diff --git a/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch deleted file mode 100644 index 43ed3778ca..0000000000 --- a/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3e55ad5448f5379e3d7e079f17a18904e905cebf 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 968983b2021..8ef620c7193 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.43.0 - diff --git a/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch deleted file mode 100644 index 7fed8266df..0000000000 --- a/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c87940ff1c2efd22c3dab9cd712531281144ed89 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -Date: Sat, 6 Nov 2021 10:06:25 +0100 -Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h - include (fixed in uclibc since v1.0.35, see [1]) - -Fixes: - - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’ - 27 | extern int getrandom(void *__buf, size_t count, unsigned int flags) - | ^~~~~~ - -[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t - -Signed-off-by: Peter Seiderer <[email protected]> ---- - gnulib/import/getrandom.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c -index e1468730933..3948d8d552a 100644 ---- a/gnulib/import/getrandom.c -+++ b/gnulib/import/getrandom.c -@@ -19,6 +19,7 @@ - - #include <config.h> - -+#include <stddef.h> - #include <sys/random.h> - - #include <errno.h> --- -2.43.0 - diff --git a/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch b/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch deleted file mode 100644 index ca6af2522f..0000000000 --- a/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f297ef653008b47fdaa4eebbccf2705f3d0996a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Wed, 10 Nov 2021 23:14:54 +0100 -Subject: [PATCH] fix musl build on riscv - -Fix the following build failure raised with musl: - -../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)': -../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'? - 140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen) - | ^~~~~~~~~~ - | ELF_NGREG - -musl fixed the issue with -https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570 - -Fixes: - - http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - gdb/nat/riscv-linux-tdesc.c | 5 +++++ - gdbserver/linux-riscv-low.cc | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c -index d676233cc31..b620aab5b72 100644 ---- a/gdb/nat/riscv-linux-tdesc.c -+++ b/gdb/nat/riscv-linux-tdesc.c -@@ -31,6 +31,11 @@ - # define NFPREG 33 - #endif - -+/* Work around musl breakage since version 1.1.24. */ -+#ifndef ELF_NFPREG -+# define ELF_NFPREG 33 -+#endif -+ - /* See nat/riscv-linux-tdesc.h. */ - - struct riscv_gdbarch_features -diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc -index 4c251bb179c..77a48ac9ee1 100644 ---- a/gdbserver/linux-riscv-low.cc -+++ b/gdbserver/linux-riscv-low.cc -@@ -30,6 +30,11 @@ - # define NFPREG 33 - #endif - -+/* Work around musl breakage since version 1.1.24. */ -+#ifndef ELF_NFPREG -+# define ELF_NFPREG 33 -+#endif -+ - /* Linux target op definitions for the RISC-V architecture. */ - - class riscv_target : public linux_process_target --- -2.43.0 - diff --git a/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch deleted file mode 100644 index 05fedfc960..0000000000 --- a/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 49cc0d8a7a930eab1eb8c848101150ca83145334 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Thu, 18 Nov 2021 22:52:08 +0100 -Subject: [PATCH] gdbserver/Makefile.in: fix NLS build - -Fix the following build failure raised since gdb version 10.1 and -https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63: - - CXXLD libinproctrace.so -/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)': -/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext' - -Fixes: - - http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: -https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html] ---- - gdbserver/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in -index b597515d428..54cc7ccb0f6 100644 ---- a/gdbserver/Makefile.in -+++ b/gdbserver/Makefile.in -@@ -389,7 +389,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS} - $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \ - -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ - $(CXXFLAGS) \ -- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread -+ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL) - - # Put the proper machine-specific files first, so M-. on a machine - # specific routine gets the one for the correct machine. --- -2.43.0 - diff --git a/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch deleted file mode 100644 index 10302a4bb6..0000000000 --- a/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0533122983d2ac973453915cb1331b87d8d7fc0a Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sun, 28 Aug 2022 23:21:37 +0200 -Subject: [PATCH] gdb: Fix native build on xtensa -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apply a similar fix than for Alpha architecture on gdb 9: -https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=7a27b85f6d9b5eea9bd1493f903158fbea4b2231 - -Fixes: - -../../gdb/xtensa-linux-nat.c: In function ‘void fill_gregset(const regcache*, elf_greg_t (*)[128], int)’: -../../gdb/xtensa-linux-nat.c:66:17: error: ‘gdbarch_pc_regnum’ was not declared in this scope - 66 | if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1) - | ^~~~~~~~~~~~~~~~~ - CXX complaints.o -../../gdb/xtensa-linux-nat.c:68:17: error: ‘gdbarch_ps_regnum’ was not declared in this scope - 68 | if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1) - | ^~~~~~~~~~~~~~~~~ -../../gdb/xtensa-linux-nat.c:71:38: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ - 71 | if (regnum == gdbarch_tdep (gdbarch)->wb_regnum || regnum == -1) - | ^ -In file included from ../../gdb/xtensa-linux-nat.c:38: -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘gdbarch_tdep::gdbarch_tdep()’ - 160 | struct gdbarch_tdep - | ^~~~~~~~~~~~ -../../gdb/xtensa-tdep.h:160:8: note: candidate expects 0 arguments, 1 provided -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(const gdbarch_tdep&)’ -../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘const gdbarch_tdep&’ -../../gdb/xtensa-tdep.h:160:8: note: candidate: ‘constexpr gdbarch_tdep::gdbarch_tdep(gdbarch_tdep&&)’ -../../gdb/xtensa-tdep.h:160:8: note: no known conversion for argument 1 from ‘gdbarch*’ to ‘gdbarch_tdep&&’ -../../gdb/xtensa-linux-nat.c:72:49: error: no matching function for call to ‘gdbarch_tdep::gdbarch_tdep(gdbarch*&)’ - 72 | regcache->raw_collect (gdbarch_tdep (gdbarch)->wb_regnum, - | ^ - -Signed-off-by: Romain Naour <[email protected]> ---- - gdb/xtensa-linux-nat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index e3da3c6a7a5..61834bc28d0 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -36,6 +36,7 @@ - - #include "gregset.h" - #include "xtensa-tdep.h" -+#include "gdbarch.h" - - /* Defines ps_err_e, struct ps_prochandle. */ - #include "gdb_proc_service.h" --- -2.43.0 - diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index fe639a4019..0cc28ef7f0 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -8,6 +8,10 @@ comment "Host GDB Options" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY depends on BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS +comment "cross gdb for the host needs host and target gcc >= 9" + depends on !BR2_HOST_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + config BR2_PACKAGE_HOST_GDB bool "Build cross gdb for the host" # When the external toolchain gdbserver is used, we shouldn't @@ -15,6 +19,7 @@ config BR2_PACKAGE_HOST_GDB # toolchain should be used. depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY depends on BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 help Build a cross gdb that runs on the host machine and debugs programs running on the target. It requires 'gdbserver' @@ -50,24 +55,14 @@ config BR2_GDB_VERSION_ARC bool "gdb arc (15.x)" depends on BR2_arc -config BR2_GDB_VERSION_14 - bool "gdb 14.x" - config BR2_GDB_VERSION_15 bool "gdb 15.x" - depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 config BR2_GDB_VERSION_16 bool "gdb 16.x" - depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 config BR2_GDB_VERSION_17 bool "gdb 17.x" - depends on BR2_HOST_GCC_AT_LEAST_9 && BR2_TOOLCHAIN_GCC_AT_LEAST_9 - -comment "gdb 15.x/16.x/17.x need host and target gcc >= 9" - depends on !BR2_HOST_GCC_AT_LEAST_9 || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 endchoice @@ -77,8 +72,7 @@ endif config BR2_GDB_VERSION string default "arc-2024.12-release-gdb" if BR2_GDB_VERSION_ARC || (!BR2_PACKAGE_HOST_GDB && BR2_arc) - default "14.2" if BR2_GDB_VERSION_14 || (!BR2_PACKAGE_HOST_GDB && !BR2_TOOLCHAIN_GCC_AT_LEAST_9) default "15.2" if BR2_GDB_VERSION_15 - default "16.3" if BR2_GDB_VERSION_16 || (!BR2_PACKAGE_HOST_GDB && BR2_TOOLCHAIN_GCC_AT_LEAST_9) + default "16.3" if BR2_GDB_VERSION_16 default "17.1" if BR2_GDB_VERSION_17 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index e2a250c0c7..a0add73dca 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,5 +1,4 @@ # From https://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede gdb-14.2.tar.xz sha512 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba gdb-15.2.tar.xz sha512 fffd6689c3405466a179670b04720dc825e4f210a761f63dd2b33027432f8cd5d1c059c431a5ec9e165eedd1901220b5329d73c522f9a444788888c731b29e9c gdb-16.3.tar.xz sha512 f1a6751e439a2128fecf3eae8b57c1608a0dc7cfe79b4356a937874e5a42bb2df0aba36eb6a9452c41966908b9a59076c7cad9720f684688ab956b65080f1d7c gdb-17.1.tar.xz _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot