1.1 --- a/config/debug/gdb.in	Fri Apr 09 21:04:33 2010 +0200
     1.2 +++ b/config/debug/gdb.in	Sun Apr 11 23:05:48 2010 +0200
     1.3 @@ -37,12 +37,6 @@
     1.4      bool
     1.5      prompt "6.8"
     1.6  
     1.7 -config GDB_V_snapshot
     1.8 -    bool
     1.9 -    prompt "snapshot (EXPERIMENTAL)"
    1.10 -    depends on EXPERIMENTAL
    1.11 -    depends on ! GDB_CROSS_INSIGHT
    1.12 -
    1.13  endchoice
    1.14  
    1.15  config GDB_7_0_or_later
    1.16 @@ -56,4 +50,3 @@
    1.17      default "7.0.1" if GDB_V_7_0_1
    1.18      default "7.0" if GDB_V_7_0
    1.19      default "6.8" if GDB_V_6_8
    1.20 -    default "snapshot" if GDB_V_snapshot

     2.1 --- a/scripts/build/debug/300-gdb.sh	Fri Apr 09 21:04:33 2010 +0200
     2.2 +++ b/scripts/build/debug/300-gdb.sh	Sun Apr 11 23:05:48 2010 +0200
     2.3 @@ -6,13 +6,6 @@
     2.4  # config options for this.
     2.5  CT_DEBUG_GDB_NCURSES_VERSION="5.7"
     2.6  
     2.7 -do_debug_gdb_suffix() {
     2.8 -    case "${CT_GDB_VERSION}" in
     2.9 -        snapshot)   ;;
    2.10 -        *)          echo "-${CT_GDB_VERSION}";;
    2.11 -    esac
    2.12 -}
    2.13 -
    2.14  do_debug_gdb_parts() {
    2.15      do_gdb=
    2.16      do_insight=
    2.17 @@ -40,9 +33,9 @@
    2.18      do_debug_gdb_parts
    2.19  
    2.20      if [ "${do_gdb}" = "y" ]; then
    2.21 -        CT_GetFile "gdb$(do_debug_gdb_suffix)"              \
    2.22 -                   {ftp,http}://ftp.gnu.org/pub/gnu/gdb     \
    2.23 -                   ftp://sources.redhat.com/pub/gdb/{{,old-}releases,snapshots/current}
    2.24 +        CT_GetFile "gdb-${CT_GDB_VERSION}"                          \
    2.25 +                   {ftp,http}://ftp.gnu.org/pub/gnu/gdb             \
    2.26 +                   ftp://sources.redhat.com/pub/gdb/{,old-}releases
    2.27      fi
    2.28  
    2.29      if [ "${do_insight}" = "y" ]; then
    2.30 @@ -63,8 +56,8 @@
    2.31      do_debug_gdb_parts
    2.32  
    2.33      if [ "${do_gdb}" = "y" ]; then
    2.34 -        CT_Extract "gdb$(do_debug_gdb_suffix)"
    2.35 -        CT_Patch "gdb$(do_debug_gdb_suffix)"
    2.36 +        CT_Extract "gdb-${CT_GDB_VERSION}"
    2.37 +        CT_Patch "gdb-${CT_GDB_VERSION}"
    2.38      fi
    2.39  
    2.40      if [ "${do_insight}" = "y" ]; then
    2.41 @@ -81,7 +74,7 @@
    2.42  do_debug_gdb_build() {
    2.43      local -a extra_config
    2.44  
    2.45 -    gdb_src_dir="${CT_SRC_DIR}/gdb$(do_debug_gdb_suffix)"
    2.46 +    gdb_src_dir="${CT_SRC_DIR}/gdb-${CT_GDB_VERSION}"
    2.47      insight_src_dir="${CT_SRC_DIR}/insight-${CT_GDB_VERSION}"
    2.48  
    2.49      # Version 6.3 and below behave badly with gdbmi