From 02972acf3f676d94e360f4b562b412d36133d246 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 9 Oct 2021 21:16:43 +0200 Subject: [PATCH] package/gdb: switch to gdb 10.x as the default When doing this, we can simplify the RISC-V related logic. Indeed, as there was no support for RISC-V in gdb 9.x, which was the current default, we had some trickery in the Config.in file to ensure gdb 10.x was used by default on RISC-V. However now that 10.x is the default for everybody, this trickery is no longer needed. Also, we now needs to enable BR2_PACKAGE_GDB_TOPLEVEL when host-gdb is not built, as the default target gdb version is 10.x, and threfore requires BR2_PACKAGE_GDB_TOPLEVEL=y. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gdb/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 2f9790f6e1..fd739f3969 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -61,7 +61,7 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_9_2 + default BR2_GDB_VERSION_10 depends on !BR2_arc depends on !BR2_csky help @@ -93,8 +93,8 @@ config BR2_GDB_VERSION default "arc-2020.09-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "8.3.1" if BR2_GDB_VERSION_8_3 - default "9.2" if BR2_GDB_VERSION_9_2 || (!BR2_PACKAGE_HOST_GDB && !BR2_riscv) - default "10.2" if BR2_GDB_VERSION_10 || (!BR2_PACKAGE_HOST_GDB && BR2_riscv) + default "9.2" if BR2_GDB_VERSION_9_2 + default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB default "11.1" if BR2_GDB_VERSION_11 depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB @@ -105,5 +105,5 @@ config BR2_PACKAGE_GDB_TOPLEVEL default y if BR2_arc default y if BR2_GDB_VERSION_10 default y if BR2_GDB_VERSION_11 - default y if !BR2_PACKAGE_HOST_GDB && BR2_riscv + default y if !BR2_PACKAGE_HOST_GDB depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB