1.1 --- a/config/cc/gcc.in Wed Jul 28 21:32:42 2010 +0200
1.2 +++ b/config/cc/gcc.in Wed Jul 28 21:28:54 2010 +0200
1.3 @@ -130,15 +130,12 @@
1.4 bool
1.5 default n
1.6 select CC_GCC_4_3_or_later
1.7 - select CC_GCC_4_2_or_later
1.8 select CC_GCC_USE_PPL_CLOOG
1.9
1.10 config CC_GCC_4_5_or_later
1.11 bool
1.12 default n
1.13 select CC_GCC_4_4_or_later
1.14 - select CC_GCC_4_3_or_later
1.15 - select CC_GCC_4_2_or_later
1.16 select CC_GCC_USE_MPC_LIBELF
1.17
1.18 config CC_GCC_USE_GMP_MPFR
1.19 @@ -183,52 +180,31 @@
1.20 default "4.0.4" if CC_V_4_0_4
1.21 default "3.4.6" if CC_V_3_4_6
1.22
1.23 -config CC_CXA_ATEXIT
1.24 +config CC_LANG_JAVA_USE_ECJ
1.25 bool
1.26 - prompt "Use __cxa_atexit"
1.27 default y
1.28 - depends on ! BARE_METAL
1.29 + depends on CC_LANG_JAVA
1.30 + depends on CC_GCC_4_3_or_later
1.31 +
1.32 +config CC_PKGVERSION
1.33 + string
1.34 + prompt "gcc ID string"
1.35 + depends on CC_GCC_4_3_or_later
1.36 + default "crosstool-NG-${CT_VERSION}"
1.37 help
1.38 - If you get the missing symbol "__cxa_atexit" when building C++ programs,
1.39 - you might want to try disabling this option.
1.40 + Specify a string that identifies your package. You may wish to include
1.41 + a build number or build date. This version string will be included in
1.42 + the output of gcc --version.
1.43
1.44 -choice
1.45 - bool
1.46 - prompt "Use sjlj for exceptions"
1.47 - default CC_SJLJ_EXCEPTIONS_CONFIGURE
1.48 - depends on ! BARE_METAL
1.49 + This is passed to the configure flag --with-pkgversion.
1.50
1.51 -# This config option is used nowhere in the code on purpose.
1.52 -# It only serves as a choice entry to force neither using nor not using sjlj
1.53 -config CC_SJLJ_EXCEPTIONS_CONFIGURE
1.54 - bool
1.55 - prompt "Let configure decide"
1.56 +config CC_BUGURL
1.57 + string
1.58 + prompt "gcc bug URL"
1.59 + depends on CC_GCC_4_3_or_later
1.60 + default ""
1.61 help
1.62 - Let configure decide if setjmp/longjmp should be used to handle
1.63 - exceptions.
1.64 -
1.65 - Choose that if you trust configure to detect the correct settings.
1.66 - This is the default choice.
1.67 -
1.68 -config CC_SJLJ_EXCEPTIONS_USE
1.69 - bool
1.70 - prompt "Force using sjlj"
1.71 - help
1.72 - Do use setjmp/longjmp for exceptions.
1.73 - This is gcc's --enable-sjlj-exceptions configure switch.
1.74 -
1.75 - Choose that if you want to use setjmp/longjmp to handle exceptions.
1.76 -
1.77 -config CC_SJLJ_EXCEPTIONS_DONT_USE
1.78 - bool
1.79 - prompt "Force not using sjlj"
1.80 - help
1.81 - Do not use setjmp/longjmp for exceptions.
1.82 - This is gcc's --disable-sjlj-exceptions configure switch.
1.83 -
1.84 - Choose that if you want to not use setjmp/longjmp to handle exceptions.
1.85 -
1.86 -endchoice
1.87 + Specify the URL that users should visit if they wish to report a bug.
1.88
1.89 config CC_ENABLE_CXX_FLAGS
1.90 string
1.91 @@ -258,50 +234,3 @@
1.92 depends on ! BARE_METAL
1.93 help
1.94 Extra flags to pass onto ./configure when configuring gcc.
1.95 -
1.96 -config CC_GCC_ENABLE_TARGET_OPTSPACE
1.97 - bool
1.98 - prompt "Optimize gcc libs for size"
1.99 - default y
1.100 - help
1.101 - Pass --enable-target-optspace to crossgcc's configure.
1.102 -
1.103 - This will compile crossgcc's libs with -Os.
1.104 -
1.105 -config CC_GCC_DISABLE_PCH
1.106 - bool
1.107 - prompt "Do not build PCH"
1.108 - default n
1.109 - help
1.110 - Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain.
1.111 - at the expense of speed when compiling C++ code.
1.112 -
1.113 - For some configurations (most notably canadian?), PCH are broken, and
1.114 - need to be disabled. Please see:
1.115 - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974
1.116 -
1.117 -config CC_PKGVERSION
1.118 - string
1.119 - prompt "gcc ID string"
1.120 - depends on CC_GCC_4_3_or_later
1.121 - default "crosstool-NG-${CT_VERSION}"
1.122 - help
1.123 - Specify a string that identifies your package. You may wish to include
1.124 - a build number or build date. This version string will be included in
1.125 - the output of gcc --version.
1.126 -
1.127 - This is passed to the configure flag --with-pkgversion.
1.128 -
1.129 -config CC_BUGURL
1.130 - string
1.131 - prompt "gcc bug URL"
1.132 - depends on CC_GCC_4_3_or_later
1.133 - default ""
1.134 - help
1.135 - Specify the URL that users should visit if they wish to report a bug.
1.136 -
1.137 -config CC_LANG_JAVA_USE_ECJ
1.138 - bool
1.139 - default y
1.140 - depends on CC_LANG_JAVA
1.141 - depends on CC_GCC_4_3_or_later
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/config/cc/gcc.in.2 Wed Jul 28 21:28:54 2010 +0200
2.3 @@ -0,0 +1,69 @@
2.4 +config CC_GCC_ENABLE_TARGET_OPTSPACE
2.5 + bool
2.6 + prompt "Optimize gcc libs for size"
2.7 + default y
2.8 + help
2.9 + Pass --enable-target-optspace to crossgcc's configure.
2.10 +
2.11 + This will compile crossgcc's libs with -Os.
2.12 +
2.13 +comment "Misc. obscure options."
2.14 +
2.15 +config CC_CXA_ATEXIT
2.16 + bool
2.17 + prompt "Use __cxa_atexit"
2.18 + default y
2.19 + depends on ! BARE_METAL
2.20 + help
2.21 + If you get the missing symbol "__cxa_atexit" when building C++ programs,
2.22 + you might want to try disabling this option.
2.23 +
2.24 +config CC_GCC_DISABLE_PCH
2.25 + bool
2.26 + prompt "Do not build PCH"
2.27 + default n
2.28 + help
2.29 + Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain.
2.30 + at the expense of speed when compiling C++ code.
2.31 +
2.32 + For some configurations (most notably canadian?), PCH are broken, and
2.33 + need to be disabled. Please see:
2.34 + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974
2.35 +
2.36 +choice
2.37 + bool
2.38 + prompt "Use sjlj for exceptions"
2.39 + default CC_SJLJ_EXCEPTIONS_CONFIGURE
2.40 + depends on ! BARE_METAL
2.41 +
2.42 +# This config option is used nowhere in the code on purpose.
2.43 +# It only serves as a choice entry to force neither using nor not using sjlj
2.44 +config CC_SJLJ_EXCEPTIONS_CONFIGURE
2.45 + bool
2.46 + prompt "Let configure decide"
2.47 + help
2.48 + Let configure decide if setjmp/longjmp should be used to handle
2.49 + exceptions.
2.50 +
2.51 + Choose that if you trust configure to detect the correct settings.
2.52 + This is the default choice.
2.53 +
2.54 +config CC_SJLJ_EXCEPTIONS_USE
2.55 + bool
2.56 + prompt "Force using sjlj"
2.57 + help
2.58 + Do use setjmp/longjmp for exceptions.
2.59 + This is gcc's --enable-sjlj-exceptions configure switch.
2.60 +
2.61 + Choose that if you want to use setjmp/longjmp to handle exceptions.
2.62 +
2.63 +config CC_SJLJ_EXCEPTIONS_DONT_USE
2.64 + bool
2.65 + prompt "Force not using sjlj"
2.66 + help
2.67 + Do not use setjmp/longjmp for exceptions.
2.68 + This is gcc's --disable-sjlj-exceptions configure switch.
2.69 +
2.70 + Choose that if you want to not use setjmp/longjmp to handle exceptions.
2.71 +
2.72 +endchoice