From 382d33dfa64202a79968ff54d729fb37479cbd65 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 21 Sep 2022 16:33:28 +0200 Subject: [PATCH] package/gdb: enable host-gdb and gdbserver support for or1k with gdb 12.1 The gdbserver support for or1k is available since 12.1 release, since commit [1]. Restrict the gdb version choice for or1k to 12.1 for simplicity. Also enable host-gdb to connect to the gdbserver on the target. [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=4933265c3f71b9134363d0c05f09542d5cc677f4 Signed-off-by: Romain Naour Cc: Stafford Horne Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in | 3 --- package/gdb/Config.in.host | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 1cad3c4fd8..273b3072ae 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -17,8 +17,6 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP - # no gdbserver on or1k - select BR2_PACKAGE_GDB_DEBUGGER if BR2_or1k # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. @@ -45,7 +43,6 @@ if BR2_PACKAGE_GDB config BR2_PACKAGE_GDB_SERVER bool "gdbserver" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY - depends on !BR2_or1k help Build the gdbserver stub to run on the target. A full gdb is needed to debug the progam. diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 3b8d456f1c..e8a34e0834 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS default y depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze - depends on !BR2_or1k comment "Host GDB Options" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY @@ -49,9 +48,13 @@ choice config BR2_GDB_VERSION_10 bool "gdb 10.x" + # gdbserver support missing + depends on !BR2_or1k config BR2_GDB_VERSION_11 bool "gdb 11.x" + # gdbserver support missing + depends on !BR2_or1k config BR2_GDB_VERSION_12 bool "gdb 12.x" @@ -65,6 +68,6 @@ config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc default "10.2" if BR2_GDB_VERSION_10 - default "11.2" if BR2_GDB_VERSION_11 || !BR2_PACKAGE_HOST_GDB - default "12.1" if BR2_GDB_VERSION_12 + default "11.2" if BR2_GDB_VERSION_11 || (!BR2_PACKAGE_HOST_GDB && !BR2_or1k) + default "12.1" if BR2_GDB_VERSION_12 || (!BR2_PACKAGE_HOST_GDB && BR2_or1k) depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB