1.1 --- a/config/debug/gdb.in	Fri Mar 05 18:55:25 2010 +0100
     1.2 +++ b/config/debug/gdb.in	Mon Mar 15 21:42:55 2010 +0100
     1.3 @@ -4,94 +4,9 @@
     1.4      help
     1.5        Enable gdb for the target
     1.6  
     1.7 -config GDB_CROSS
     1.8 -    bool
     1.9 -    prompt "Cross-gdb"
    1.10 -    default y
    1.11 -    select GDB_GDBSERVER if ! BARE_METAL
    1.12 -    help
    1.13 -      Build and install a cross-gdb for the target, to run on host.
    1.14 -
    1.15 -config GDB_CROSS_STATIC
    1.16 -    bool
    1.17 -    prompt "Build a static cross gdb"
    1.18 -    default n
    1.19 -    depends on GDB_CROSS
    1.20 -    help
    1.21 -      A static cross gdb can be usefull if you debug on a machine that is
    1.22 -      not the one that is used to compile the toolchain.
    1.23 -      
    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_CROSS_INSIGHT
    1.28 -    bool
    1.29 -    prompt "Use Insight instead (EXPERIMENTAL)"
    1.30 -    default n
    1.31 -    depends on GDB_CROSS
    1.32 -    depends on EXPERIMENTAL
    1.33 -    help
    1.34 -      If you say 'Y' here, then Insight will be used to build the cross
    1.35 -      debugger, instead of the plain gdb.
    1.36 -      
    1.37 -      Insight is gdb plus a TCL/TK GUI: http://sourceware.org/insight/
    1.38 -
    1.39 -config GDB_NATIVE
    1.40 -    bool
    1.41 -    prompt "Native gdb"
    1.42 -    default n
    1.43 -    depends on ! BARE_METAL
    1.44 -    depends on ! BACKEND
    1.45 -    help
    1.46 -      Build and install a native gdb for the target, to run on the target.
    1.47 -
    1.48 -config GDB_NATIVE_STATIC
    1.49 -    bool
    1.50 -    prompt "Build a static native gdb"
    1.51 -    default n
    1.52 -    depends on GDB_NATIVE
    1.53 -    help
    1.54 -      In case you have trouble with dynamic loading of shared libraries,
    1.55 -      you will find that a static gdb comes in handy.
    1.56 -
    1.57 -config GDB_NATIVE_USE_GMP_MPFR
    1.58 -    bool
    1.59 -    prompt "Use GMP and MPFR"
    1.60 -    default n
    1.61 -    depends on GDB_NATIVE
    1.62 -    select GMP_TARGET
    1.63 -    select MPFR_TARGET
    1.64 -    help
    1.65 -      gdb can make use of the GMP and MPFR libraries.
    1.66 -      
    1.67 -      While the cross-gdb (above) can use the libraries compiled for the
    1.68 -      host, the native gdb needs the libraries for the target (where it will
    1.69 -      eventually run).
    1.70 -      
    1.71 -      Setting this option will force building the GMP and MPFR libraries for
    1.72 -      the target, and configure the native gdb to use them.
    1.73 -
    1.74 -config GDB_GDBSERVER
    1.75 -    bool
    1.76 -    prompt "gdbserver"
    1.77 -    default n
    1.78 -    depends on ! BARE_METAL
    1.79 -    help
    1.80 -      Build and install a gdbserver for the target, to run on the target.
    1.81 -
    1.82 -config GDB_GDBSERVER_STATIC
    1.83 -    bool
    1.84 -    prompt "Build a static gdbserver"
    1.85 -    default y
    1.86 -    depends on GDB_GDBSERVER
    1.87 -    help
    1.88 -      In case you have trouble with dynamic loading of shared libraries,
    1.89 -      you will find that a static gdbserver comes in handy.
    1.90 -
    1.91 -if BARE_METAL
    1.92 -comment "In bare-metal, you'll need to   "
    1.93 -comment "provide your own gdbserver stub."
    1.94 -endif # BARE_METAL
    1.95 +source "config/debug/gdb.in.cross"
    1.96 +source "config/debug/gdb.in.native"
    1.97 +source "config/debug/gdb.in.gdbserver"
    1.98  
    1.99  choice
   1.100      bool

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/debug/gdb.in.cross	Mon Mar 15 21:42:55 2010 +0100
     2.3 @@ -0,0 +1,35 @@
     2.4 +# Menu for the cross GDB
     2.5 +
     2.6 +config GDB_CROSS
     2.7 +    bool
     2.8 +    prompt "Cross-gdb"
     2.9 +    default y
    2.10 +    select GDB_GDBSERVER if ! BARE_METAL
    2.11 +    help
    2.12 +      Build and install a cross-gdb for the target, to run on host.
    2.13 +
    2.14 +if GDB_CROSS
    2.15 +
    2.16 +config GDB_CROSS_STATIC
    2.17 +    bool
    2.18 +    prompt "Build a static cross gdb"
    2.19 +    default n
    2.20 +    help
    2.21 +      A static cross gdb can be usefull if you debug on a machine that is
    2.22 +      not the one that is used to compile the toolchain.
    2.23 +      
    2.24 +      That way, you can share the cross-gdb without installing a toolchain
    2.25 +      on every machine that will be used to debug target programs.
    2.26 +
    2.27 +config GDB_CROSS_INSIGHT
    2.28 +    bool
    2.29 +    prompt "Use Insight instead (EXPERIMENTAL)"
    2.30 +    default n
    2.31 +    depends on EXPERIMENTAL
    2.32 +    help
    2.33 +      If you say 'Y' here, then Insight will be used to build the cross
    2.34 +      debugger, instead of the plain gdb.
    2.35 +      
    2.36 +      Insight is gdb plus a TCL/TK GUI: http://sourceware.org/insight/
    2.37 +
    2.38 +endif # GDB_CROSS

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/config/debug/gdb.in.gdbserver	Mon Mar 15 21:42:55 2010 +0100
     3.3 @@ -0,0 +1,26 @@
     3.4 +# Menu for the native gdbserver
     3.5 +
     3.6 +config GDB_GDBSERVER
     3.7 +    bool
     3.8 +    prompt "gdbserver"
     3.9 +    default n
    3.10 +    depends on ! BARE_METAL
    3.11 +    help
    3.12 +      Build and install a gdbserver for the target, to run on the target.
    3.13 +
    3.14 +if GDB_GDBSERVER
    3.15 +
    3.16 +config GDB_GDBSERVER_STATIC
    3.17 +    bool
    3.18 +    prompt "Build a static gdbserver"
    3.19 +    default y
    3.20 +    help
    3.21 +      In case you have trouble with dynamic loading of shared libraries,
    3.22 +      you will find that a static gdbserver comes in handy.
    3.23 +
    3.24 +endif # GDB_GDBSERVER
    3.25 +
    3.26 +if BARE_METAL
    3.27 +comment "In bare-metal, you'll need to   "
    3.28 +comment "provide your own gdbserver stub."
    3.29 +endif # BARE_METAL

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/config/debug/gdb.in.native	Mon Mar 15 21:42:55 2010 +0100
     4.3 @@ -0,0 +1,38 @@
     4.4 +# Menu for the native GDB
     4.5 +
     4.6 +config GDB_NATIVE
     4.7 +    bool
     4.8 +    prompt "Native gdb"
     4.9 +    default n
    4.10 +    depends on ! BARE_METAL
    4.11 +    depends on ! BACKEND
    4.12 +    help
    4.13 +      Build and install a native gdb for the target, to run on the target.
    4.14 +
    4.15 +if GDB_NATIVE
    4.16 +
    4.17 +config GDB_NATIVE_STATIC
    4.18 +    bool
    4.19 +    prompt "Build a static native gdb"
    4.20 +    default n
    4.21 +    help
    4.22 +      In case you have trouble with dynamic loading of shared libraries,
    4.23 +      you will find that a static gdb comes in handy.
    4.24 +
    4.25 +config GDB_NATIVE_USE_GMP_MPFR
    4.26 +    bool
    4.27 +    prompt "Use GMP and MPFR"
    4.28 +    default n
    4.29 +    select GMP_TARGET
    4.30 +    select MPFR_TARGET
    4.31 +    help
    4.32 +      gdb can make use of the GMP and MPFR libraries.
    4.33 +      
    4.34 +      While the cross-gdb (above) can use the libraries compiled for the
    4.35 +      host, the native gdb needs the libraries for the target (where it will
    4.36 +      eventually run).
    4.37 +      
    4.38 +      Setting this option will force building the GMP and MPFR libraries for
    4.39 +      the target, and configure the native gdb to use them.
    4.40 +
    4.41 +endif # GDB_NATIVE