mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	package/gdb/Config.in.host

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-06-01 09:58:54 +02:00
parent f6162290fb fc90fa9417
commit 27a5414804
97 changed files with 1657 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,8 @@ choice
depends on !BR2_arc
depends on !BR2_microblaze
default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
default BR2_GDB_VERSION_7_5
default BR2_GDB_VERSION_7_7 if BR2_powerpc64le
default BR2_GDB_VERSION_7_6
help
Select the version of gdb you wish to use.
@@ -28,9 +29,18 @@ choice
config BR2_GDB_VERSION_7_4
bool "gdb 7.4.x"
depends on !BR2_powerpc64le
config BR2_GDB_VERSION_7_5
bool "gdb 7.5.x"
depends on !BR2_powerpc64le
config BR2_GDB_VERSION_7_6
bool "gdb 7.6.x"
depends on !BR2_powerpc64le
config BR2_GDB_VERSION_7_7
bool "gdb 7.7.x"
endchoice
@@ -45,4 +55,6 @@ config BR2_GDB_VERSION
default "arc-4.8-R3" if BR2_arc
default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
default "7.4.1" if BR2_GDB_VERSION_7_4
default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB
default "7.5.1" if BR2_GDB_VERSION_7_5
default "7.6.2" if BR2_GDB_VERSION_7_6 || !BR2_PACKAGE_HOST_GDB
default "7.7.1" if BR2_GDB_VERSION_7_7 || BR2_powerpc64le