gdb: misc cleanup

Only use 6.6 on bfin, remove 6.7.1, mark 6.8 + 7.0 as deprecated and
default to 7.3.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-10-05 16:14:26 +02:00
parent 3903c3a73d
commit 37f0d1bb7b
2 changed files with 5 additions and 39 deletions

View File

@ -1,31 +0,0 @@
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -1239,7 +1239,7 @@
ac_cache_corrupted=: ;;
,);;
*)
- if test "x$ac_old_val" != "x$ac_new_val"; then
+ if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then
{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
{ echo "$as_me:$LINENO: former value: $ac_old_val" >&5
--- a/gdb/configure
+++ b/gdb/configure
@@ -272,7 +272,7 @@
PACKAGE_BUGREPORT=
ac_unique_file="main.c"
-ac_subdirs_all="$ac_subdirs_all doc testsuite"
+ac_subdirs_all="$ac_subdirs_all doc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -3077,7 +3077,7 @@
-subdirs="$subdirs doc testsuite"
+subdirs="$subdirs doc"
# Provide defaults for some variables set by the per-host and per-target

View File

@ -26,20 +26,16 @@ config BR2_PACKAGE_GDB_HOST
choice choice
prompt "GDB debugger Version" prompt "GDB debugger Version"
default BR2_GDB_VERSION_6_8 if !BR2_avr32 default BR2_GDB_VERSION_6_6 if !BR2_bfin
default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32 default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
default BR2_GDB_VERSION_7_3
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
help help
Select the version of gdb you wish to use. Select the version of gdb you wish to use.
config BR2_GDB_VERSION_6_6 config BR2_GDB_VERSION_6_6
bool "gdb 6.6" bool "gdb 6.6"
depends on !BR2_avr32 depends on BR2_bfin
depends on BR2_DEPRECATED || BR2_bfin
config BR2_GDB_VERSION_6_7_1
depends on !(BR2_avr32 || BR2_bfin)
bool "gdb 6.7.1"
config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
depends on BR2_avr32 depends on BR2_avr32
@ -48,10 +44,12 @@ choice
config BR2_GDB_VERSION_6_8 config BR2_GDB_VERSION_6_8
bool "gdb 6.8" bool "gdb 6.8"
depends on !(BR2_avr32 || BR2_bfin) depends on !(BR2_avr32 || BR2_bfin)
depends on BR2_DEPRECATED
config BR2_GDB_VERSION_7_0_1 config BR2_GDB_VERSION_7_0_1
bool "gdb 7.0.1" bool "gdb 7.0.1"
depends on !BR2_bfin depends on !BR2_bfin
depends on BR2_DEPRECATED
select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
config BR2_GDB_VERSION_7_1 config BR2_GDB_VERSION_7_1
@ -69,7 +67,6 @@ endchoice
config BR2_GDB_VERSION config BR2_GDB_VERSION
string string
default "6.6" if BR2_GDB_VERSION_6_6 default "6.6" if BR2_GDB_VERSION_6_6
default "6.7.1" if BR2_GDB_VERSION_6_7_1
default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
default "6.8" if BR2_GDB_VERSION_6_8 default "6.8" if BR2_GDB_VERSION_6_8
default "7.0.1" if BR2_GDB_VERSION_7_0_1 default "7.0.1" if BR2_GDB_VERSION_7_0_1