diff options
| author | Nigel Kukard <nkukard@lbsd.net> | 2008-03-28 22:08:37 +0000 |
|---|---|---|
| committer | Nigel Kukard <nkukard@lbsd.net> | 2008-03-28 22:08:37 +0000 |
| commit | 80f199c3d873fe1ea03a2a709e4dc6a5cbfb318b (patch) | |
| tree | 0207016130de33a2603e301003490d7a2b683db4 /toolchain/gcc/Config.in | |
| parent | d0e5797a62debf300c227a9f510be37708f8864c (diff) | |
* Reverted r21540
Diffstat (limited to 'toolchain/gcc/Config.in')
| -rw-r--r-- | toolchain/gcc/Config.in | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 903a4fa9a..20b8b0312 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -4,7 +4,7 @@ comment "GCC Options" choice prompt "GCC compiler Version" - default BR2_GCC_VERSION_4_2_2 if !BR2_avr32 + default BR2_GCC_VERSION_4_2_1 if !BR2_avr32 default BR2_GCC_VERSION_4_1_2 if BR2_avr32 help Select the version of gcc you wish to use. @@ -23,15 +23,15 @@ choice depends BR2_EXT_GCC_VERSION_4_1_2 bool "gcc 4.1.2" - config BR2_GCC_VERSION_4_2_1 - depends !BR2_nios2 + config BR2_GCC_VERSION_4_2_0 + depends !BR2_avr32 && !BR2_nios2 depends BR2_DEPRECATED || BR2_RECENT - bool "gcc 4.2.1" + bool "gcc 4.2.0" - config BR2_GCC_VERSION_4_2_2 + config BR2_GCC_VERSION_4_2_1 depends !BR2_nios2 - depends BR2_EXT_GCC_VERSION_4_2_2 - bool "gcc 4.2.2" + depends BR2_EXT_GCC_VERSION_4_2_1 + bool "gcc 4.2.1" # config BR2_GCC_VERSION_4_3 # depends !BR2_avr32 && !BR2_nios2 @@ -52,11 +52,8 @@ config BR2_GCC_SUPPORTS_SYSROOT config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE bool - default n if BR2_GCC_VERSION_3_4_6 || BR2_GCC_VERSION_4_0_4 || BR2_GCC_VERSION_4_1_2 || BR2_GCC_VERSION_4_2_1 \ - || BR2_GCC_VERSION_4_2_2 - default y if !BR2_GCC_VERSION_3_4_6 && !BR2_GCC_VERSION_4_0_4 && !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 \ - && !BR2_GCC_VERSION_4_2_2 - + default n if BR2_GCC_VERSION_3_4_6 || BR2_GCC_VERSION_4_0_4 || BR2_GCC_VERSION_4_1_2 || BR2_GCC_VERSION_4_2_0 || BR2_GCC_VERSION_4_2_1 + default y if !BR2_GCC_VERSION_3_4_6 && !BR2_GCC_VERSION_4_0_4 && !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_0 && !BR2_GCC_VERSION_4_2_1 config BR2_GCC_SNAP_DATE string "GCC snapshot date" @@ -71,8 +68,8 @@ config BR2_GCC_VERSION default "3.4.6" if BR2_GCC_VERSION_3_4_6 default "4.0.4" if BR2_GCC_VERSION_4_0_4 default "4.1.2" if BR2_GCC_VERSION_4_1_2 + default "4.2.0" if BR2_GCC_VERSION_4_2_0 default "4.2.1" if BR2_GCC_VERSION_4_2_1 - default "4.2.2" if BR2_GCC_VERSION_4_2_2 default "4.3" if BR2_GCC_VERSION_4_3 config BR2_TOOLCHAIN_SYSROOT |