1.1 --- a/config/debug/gdb.in	Wed Jun 18 12:33:32 2008 +0000
     1.2 +++ b/config/debug/gdb.in	Thu Jun 19 15:33:33 2008 +0000
     1.3 @@ -13,38 +13,59 @@
     1.4      bool
     1.5      prompt "Cross-gdb"
     1.6      default y
     1.7 +    select GDB_GDBSERVER
     1.8      help
     1.9 -      Build and install a cross-gdb for the target, and to run on host.
    1.10 +      Build and install a cross-gdb for the target, to run on host.
    1.11  
    1.12 -config GDB_CROSS_STATIC_GDB
    1.13 +config GDB_CROSS_STATIC
    1.14      bool
    1.15      prompt "Build a static cross gdb"
    1.16      default n
    1.17      depends on GDB_CROSS
    1.18      help
    1.19        A static cross gdb can be usefull if you debug on a machine that is
    1.20 -      not the one that is used to compile.
    1.21 +      not the one that is used to compile the toolchain.
    1.22  
    1.23 -config GDB_CROSS_STATIC_GDBSERVER
    1.24 +      That way, you can share the cross-gdb without installing a toolchain
    1.25 +      on every machine that will be used to debug target programs.
    1.26 +
    1.27 +config GDB_NATIVE
    1.28 +    bool
    1.29 +    prompt "Native gdb"
    1.30 +    default n
    1.31 +    select GDB_GDBSERVER
    1.32 +    help
    1.33 +      Build and install a native gdb for the target, to run on the target.
    1.34 +
    1.35 +config GDB_NATIVE_STATIC
    1.36 +    bool
    1.37 +    prompt "Build a static native gdb"
    1.38 +    default n
    1.39 +    depends on GDB_NATIVE
    1.40 +    help
    1.41 +      In case you have trouble with dynamic loading of shared libraries,
    1.42 +      you will find that a static gdb comes in handy.
    1.43 +
    1.44 +config GDB_GDBSERVER
    1.45 +    bool
    1.46 +    prompt "gdbserver"
    1.47 +    default n
    1.48 +    help
    1.49 +      Build and install a gdbserver for the target, to run on the target.
    1.50 +
    1.51 +config GDB_GDBSERVER_STATIC
    1.52      bool
    1.53      prompt "Build a static gdbserver"
    1.54      default n
    1.55 -    depends on GDB_CROSS
    1.56 +    depends on GDB_GDBSERVER
    1.57      help
    1.58        In case you have trouble with dynamic loading of shared libraries,
    1.59        you will find that a static gdbserver comes in handy.
    1.60  
    1.61 -config GDB_NATIVE
    1.62 -    bool
    1.63 -    prompt "Native gdb (EXPERIMENTAL)"
    1.64 -    default n
    1.65 -    depends on EXPERIMENTAL
    1.66 -    help
    1.67 -      Build and install a native gdb for the target, to run on the target.
    1.68 -
    1.69  choice
    1.70      bool
    1.71      prompt "gdb version"
    1.72 +    depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
    1.73  
    1.74  config GDB_V_snapshot
    1.75      bool
    1.76 @@ -118,6 +139,6 @@
    1.77      default "4.2" if NCURSES_V_4_2
    1.78      default "5.6" if NCURSES_V_5_6
    1.79  
    1.80 -endif # ncurses
    1.81 +endif # GDB_NATIVE --> ncurses
    1.82  
    1.83  endif