cc/gcc: suffle options around
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Apr 27 22:41:17 2011 +0200 (2011-04-27)
changeset 2415ae9899116f19
parent 2414 8f84a8897204
child 2416 e4044a447612
cc/gcc: suffle options around

Move options around so it feels more organised.
Add comments to separate groups of related options.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
config/cc/gcc.in
config/cc/gcc.in.2
     1.1 --- a/config/cc/gcc.in	Wed Apr 27 22:37:32 2011 +0200
     1.2 +++ b/config/cc/gcc.in	Wed Apr 27 22:41:17 2011 +0200
     1.3 @@ -336,52 +336,3 @@
     1.4      default y
     1.5      depends on CC_LANG_JAVA
     1.6      depends on CC_GCC_4_3_or_later
     1.7 -
     1.8 -config CC_PKGVERSION
     1.9 -    string
    1.10 -    prompt "gcc ID string"
    1.11 -    depends on CC_GCC_4_3_or_later
    1.12 -    default "crosstool-NG-${CT_VERSION}"
    1.13 -    help
    1.14 -      Specify a string that identifies your package. You may wish to include
    1.15 -      a build number or build date. This version string will be included in
    1.16 -      the output of gcc --version.
    1.17 -
    1.18 -      This is passed to the configure flag --with-pkgversion.
    1.19 -
    1.20 -config CC_BUGURL
    1.21 -    string
    1.22 -    prompt "gcc bug URL"
    1.23 -    depends on CC_GCC_4_3_or_later
    1.24 -    default ""
    1.25 -    help
    1.26 -      Specify the URL that users should visit if they wish to report a bug.
    1.27 -
    1.28 -config CC_ENABLE_CXX_FLAGS
    1.29 -    string
    1.30 -    prompt "Flags to pass to --enable-cxx-flags"
    1.31 -    default ""
    1.32 -    help
    1.33 -      Enter here the value of the gcc's ./configure option --enable-cxx-flags.
    1.34 -      Leave empty if you don't know better.
    1.35 -      
    1.36 -      Note: just pass in the option _value_, that is only the part that goes
    1.37 -      after the '=' sign.
    1.38 -
    1.39 -config CC_CORE_EXTRA_CONFIG
    1.40 -    string
    1.41 -    prompt "Core gcc extra config"
    1.42 -    default ""
    1.43 -    help
    1.44 -      Extra flags to pass onto ./configure when configuring the core gcc.
    1.45 -      
    1.46 -      The core gcc is a stripped down, C-only compiler needed to build
    1.47 -      the C library. Kinda bootstrap gcc, if you wish.
    1.48 -
    1.49 -config CC_EXTRA_CONFIG
    1.50 -    string
    1.51 -    prompt "gcc extra config"
    1.52 -    default ""
    1.53 -    depends on ! BARE_METAL
    1.54 -    help
    1.55 -      Extra flags to pass onto ./configure when configuring gcc.
     2.1 --- a/config/cc/gcc.in.2	Wed Apr 27 22:37:32 2011 +0200
     2.2 +++ b/config/cc/gcc.in.2	Wed Apr 27 22:41:17 2011 +0200
     2.3 @@ -1,13 +1,73 @@
     2.4 -# Misc library-related options
     2.5 +# gcc configuration options
     2.6  
     2.7 -config CC_GCC_ENABLE_TARGET_OPTSPACE
     2.8 +config CC_PKGVERSION
     2.9 +    string
    2.10 +    prompt "gcc ID string"
    2.11 +    depends on CC_GCC_4_3_or_later
    2.12 +    default "crosstool-NG-${CT_VERSION}"
    2.13 +    help
    2.14 +      Specify a string that identifies your package. You may wish to include
    2.15 +      a build number or build date. This version string will be included in
    2.16 +      the output of gcc --version.
    2.17 +
    2.18 +      This is passed to the configure flag --with-pkgversion.
    2.19 +
    2.20 +config CC_BUGURL
    2.21 +    string
    2.22 +    prompt "gcc bug URL"
    2.23 +    depends on CC_GCC_4_3_or_later
    2.24 +    default ""
    2.25 +    help
    2.26 +      Specify the URL that users should visit if they wish to report a bug.
    2.27 +
    2.28 +config CC_ENABLE_CXX_FLAGS
    2.29 +    string
    2.30 +    prompt "Flags to pass to --enable-cxx-flags"
    2.31 +    default ""
    2.32 +    help
    2.33 +      Enter here the value of the gcc's ./configure option --enable-cxx-flags.
    2.34 +      Leave empty if you don't know better.
    2.35 +      
    2.36 +      Note: just pass in the option _value_, that is only the part that goes
    2.37 +      after the '=' sign.
    2.38 +
    2.39 +config CC_CORE_EXTRA_CONFIG
    2.40 +    string
    2.41 +    prompt "Core gcc extra config"
    2.42 +    default ""
    2.43 +    help
    2.44 +      Extra flags to pass onto ./configure when configuring the core gcc.
    2.45 +      
    2.46 +      The core gcc is a stripped down, C-only compiler needed to build
    2.47 +      the C library. Kinda bootstrap gcc, if you wish.
    2.48 +
    2.49 +config CC_EXTRA_CONFIG
    2.50 +    string
    2.51 +    prompt "gcc extra config"
    2.52 +    default ""
    2.53 +    depends on ! BARE_METAL
    2.54 +    help
    2.55 +      Extra flags to pass onto ./configure when configuring gcc.
    2.56 +
    2.57 +config STATIC_TOOLCHAIN
    2.58 +    select CC_STATIC_LIBSTDCXX if CC_GCC_4_4_or_later
    2.59 +
    2.60 +config CC_STATIC_LIBSTDCXX
    2.61      bool
    2.62 -    prompt "Optimize gcc libs for size"
    2.63 +    prompt "Link libstdc++ statically into the gcc binary"
    2.64      default y
    2.65 +    depends on CC_GCC_4_4_or_later
    2.66      help
    2.67 -      Pass --enable-target-optspace to crossgcc's configure.
    2.68 -      
    2.69 -      This will compile crossgcc's libs with -Os.
    2.70 +      Newer gcc versions use the PPL library which is C++ code.  Statically
    2.71 +      linking libstdc++ increases the likeliness that the gcc binary will
    2.72 +      run on machines other than the one which it was built on, without
    2.73 +      having to worry about distributing the matching version of libstdc++
    2.74 +      along with it.
    2.75 +
    2.76 +#-----------------------------------------------------------------------------
    2.77 +# Optimisation features
    2.78 +
    2.79 +comment "Optimisation features"
    2.80  
    2.81  config CC_GCC_USE_GRAPHITE
    2.82      bool
    2.83 @@ -46,20 +106,17 @@
    2.84        This will require the libelf companion library, and it
    2.85        wil be build automatically for you.
    2.86  
    2.87 -config STATIC_TOOLCHAIN
    2.88 -    select CC_STATIC_LIBSTDCXX if CC_GCC_4_4_or_later
    2.89 +#-----------------------------------------------------------------------------
    2.90 +comment "Settings for libraries running on target"
    2.91  
    2.92 -config CC_STATIC_LIBSTDCXX
    2.93 +config CC_GCC_ENABLE_TARGET_OPTSPACE
    2.94      bool
    2.95 -    prompt "Link libstdc++ statically into the gcc binary"
    2.96 +    prompt "Optimize gcc libs for size"
    2.97      default y
    2.98 -    depends on CC_GCC_4_4_or_later
    2.99      help
   2.100 -      Newer gcc versions use the PPL library which is C++ code.  Statically
   2.101 -      linking libstdc++ increases the likeliness that the gcc binary will
   2.102 -      run on machines other than the one which it was built on, without
   2.103 -      having to worry about distributing the matching version of libstdc++
   2.104 -      along with it.
   2.105 +      Pass --enable-target-optspace to crossgcc's configure.
   2.106 +      
   2.107 +      This will compile crossgcc's libs with -Os.
   2.108  
   2.109  config CC_GCC_LIBMUDFLAP
   2.110      bool