mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 00:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gdb: switch to gdb 14.x as the default

Browse Source 
Now that we have introduced support for gdb 15.x, switch to gdb 14.x
as the default version.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Romain:
  - select mpfr for the target variant
  - remove comment about mpfr dependency
]
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Thomas Petazzoni
2024-07-12 00:20:16 +02:00
committed by Romain Naour
parent 1861c225ea
commit 177da3cf8f
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/gdb/Config.in
View File

@@ -59,7 +59,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
depends on BR2_USE_WCHAR
depends on !BR2_sh
select BR2_PACKAGE_GMP
select BR2_PACKAGE_MPFR if (BR2_GDB_VERSION_14 || BR2_GDB_VERSION_15 || BR2_arc)
select BR2_PACKAGE_MPFR if !(BR2_GDB_VERSION_13)
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_ZLIB

8
package/gdb/Config.in.host
View File

@@ -41,7 +41,7 @@ config BR2_PACKAGE_HOST_GDB_SIM
choice
prompt "GDB debugger Version"
default BR2_GDB_VERSION_13
default BR2_GDB_VERSION_14
depends on !BR2_arc
help
Select the version of gdb you wish to use.
@@ -72,9 +72,7 @@ config BR2_GDB_VERSION
string
default "arc-2023.09-release" if BR2_arc
default "12.1" if BR2_GDB_VERSION_12
default "13.2" if BR2_GDB_VERSION_13 || !BR2_PACKAGE_HOST_GDB
# When making 14.x the default, or 14.x becomes the oldest version,
# be sure to update the target variant to properly select mpfr.
default "14.2" if BR2_GDB_VERSION_14
default "13.2" if BR2_GDB_VERSION_13
default "14.2" if BR2_GDB_VERSION_14 || !BR2_PACKAGE_HOST_GDB
default "15.1" if BR2_GDB_VERSION_15
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB

4
package/gdb/gdb.mk
View File

@@ -166,7 +166,7 @@ endif
# gdb.
# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so
# requires MPFR as well.
ifeq ($(BR2_GDB_VERSION_14)$(BR2_GDB_VERSION_15)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),y:y)
ifeq ($(BR2_PACKAGE_GDB_DEBUGGER):$(BR2_GDB_VERSION_13),y:)
GDB_DEPENDENCIES += mpfr
GDB_CONF_OPTS += --with-mpfr=$(STAGING_DIR)
else
@@ -272,7 +272,7 @@ HOST_GDB_CONF_OPTS = \
# GDB newer than 14.x need host-mpfr
# GDB fork from ARC GNU tools 2023.09 is based on GDB14 branch and so
# requires MPFR as well.
ifeq ($(BR2_GDB_VERSION_14)$(BR2_GDB_VERSION_15)$(BR2_arc),y)
ifeq ($(BR2_GDB_VERSION_13),)
HOST_GDB_DEPENDENCIES += host-mpfr
HOST_GDB_CONF_OPTS += --with-mpfr=$(HOST_DIR)
else