diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/gdb | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gdb')
| -rw-r--r-- | package/gdb/Config.in.host | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 1ba3664981..d5954f236d 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -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 |
