diff options
| -rw-r--r-- | target/device/x86/i386/i686_defconfig | 6 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/100-uclibc-conf.patch (renamed from toolchain/gcc/4.2.2/100-uclibc-conf.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/103-uclibc-conf-noupstream.patch (renamed from toolchain/gcc/4.2.2/103-uclibc-conf-noupstream.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/104-gnuhurd-uclibc-conf.patch (renamed from toolchain/gcc/4.2.2/104-gnuhurd-uclibc-conf.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/200-uclibc-locale.patch (renamed from toolchain/gcc/4.2.2/200-uclibc-locale.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/203-uclibc-locale-no__x.patch (renamed from toolchain/gcc/4.2.2/203-uclibc-locale-no__x.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/204-uclibc-locale-wchar_fix.patch (renamed from toolchain/gcc/4.2.2/204-uclibc-locale-wchar_fix.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/205-uclibc-locale-update.patch (renamed from toolchain/gcc/4.2.2/205-uclibc-locale-update.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/300-libstdc++-pic.patch (renamed from toolchain/gcc/4.2.2/300-libstdc++-pic.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/301-missing-execinfo_h.patch (renamed from toolchain/gcc/4.2.2/301-missing-execinfo_h.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/302-c99-snprintf.patch (renamed from toolchain/gcc/4.2.2/302-c99-snprintf.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/303-c99-complex-ugly-hack.patch (renamed from toolchain/gcc/4.2.2/303-c99-complex-ugly-hack.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/304-index_macro.patch (renamed from toolchain/gcc/4.2.2/304-index_macro.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/305-libmudflap-susv3-legacy.patch (renamed from toolchain/gcc/4.2.2/305-libmudflap-susv3-legacy.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/306-libstdc++-namespace.patch (renamed from toolchain/gcc/4.2.2/306-libstdc++-namespace.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/307-locale_facets.patch (renamed from toolchain/gcc/4.2.2/307-locale_facets.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/402-libbackend_dep_gcov-iov.h.patch (renamed from toolchain/gcc/4.2.2/402-libbackend_dep_gcov-iov.h.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/800-arm-bigendian.patch (renamed from toolchain/gcc/4.2.2/800-arm-bigendian.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/904-flatten-switch-stmt-00.patch (renamed from toolchain/gcc/4.2.2/904-flatten-switch-stmt-00.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/910-soft-float.patch (renamed from toolchain/gcc/4.2.2/910-soft-float.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/4.2.3/920-soft-float.patch (renamed from toolchain/gcc/4.2.2/920-soft-float.patch) | 0 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 17 |
22 files changed, 11 insertions, 12 deletions
diff --git a/target/device/x86/i386/i686_defconfig b/target/device/x86/i386/i686_defconfig index 3ea1a1a7f..e5f02c030 100644 --- a/target/device/x86/i386/i686_defconfig +++ b/target/device/x86/i386/i686_defconfig @@ -198,12 +198,12 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS="" # BR2_GCC_VERSION_3_4_6 is not set # BR2_GCC_VERSION_4_0_4 is not set # BR2_GCC_VERSION_4_1_2 is not set -# BR2_GCC_VERSION_4_2_0 is not set -BR2_GCC_VERSION_4_2_1=y +# BR2_GCC_VERSION_4_2_1 is not set +BR2_GCC_VERSION_4_2_3=y # BR2_GCC_IS_SNAP is not set BR2_GCC_SUPPORTS_SYSROOT=y # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set -BR2_GCC_VERSION="4.2.1" +BR2_GCC_VERSION="4.2.3" BR2_TOOLCHAIN_SYSROOT=y # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set BR2_EXTRA_GCC_CONFIG_OPTIONS="" diff --git a/toolchain/gcc/4.2.2/100-uclibc-conf.patch b/toolchain/gcc/4.2.3/100-uclibc-conf.patch index 4243ff7b9..4243ff7b9 100644 --- a/toolchain/gcc/4.2.2/100-uclibc-conf.patch +++ b/toolchain/gcc/4.2.3/100-uclibc-conf.patch diff --git a/toolchain/gcc/4.2.2/103-uclibc-conf-noupstream.patch b/toolchain/gcc/4.2.3/103-uclibc-conf-noupstream.patch index 09c9bbecf..09c9bbecf 100644 --- a/toolchain/gcc/4.2.2/103-uclibc-conf-noupstream.patch +++ b/toolchain/gcc/4.2.3/103-uclibc-conf-noupstream.patch diff --git a/toolchain/gcc/4.2.2/104-gnuhurd-uclibc-conf.patch b/toolchain/gcc/4.2.3/104-gnuhurd-uclibc-conf.patch index c04dd9ff0..c04dd9ff0 100644 --- a/toolchain/gcc/4.2.2/104-gnuhurd-uclibc-conf.patch +++ b/toolchain/gcc/4.2.3/104-gnuhurd-uclibc-conf.patch diff --git a/toolchain/gcc/4.2.2/200-uclibc-locale.patch b/toolchain/gcc/4.2.3/200-uclibc-locale.patch index ea21388b7..ea21388b7 100644 --- a/toolchain/gcc/4.2.2/200-uclibc-locale.patch +++ b/toolchain/gcc/4.2.3/200-uclibc-locale.patch diff --git a/toolchain/gcc/4.2.2/203-uclibc-locale-no__x.patch b/toolchain/gcc/4.2.3/203-uclibc-locale-no__x.patch index 6ba47003b..6ba47003b 100644 --- a/toolchain/gcc/4.2.2/203-uclibc-locale-no__x.patch +++ b/toolchain/gcc/4.2.3/203-uclibc-locale-no__x.patch diff --git a/toolchain/gcc/4.2.2/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/4.2.3/204-uclibc-locale-wchar_fix.patch index 160ab35bb..160ab35bb 100644 --- a/toolchain/gcc/4.2.2/204-uclibc-locale-wchar_fix.patch +++ b/toolchain/gcc/4.2.3/204-uclibc-locale-wchar_fix.patch diff --git a/toolchain/gcc/4.2.2/205-uclibc-locale-update.patch b/toolchain/gcc/4.2.3/205-uclibc-locale-update.patch index 86b284455..86b284455 100644 --- a/toolchain/gcc/4.2.2/205-uclibc-locale-update.patch +++ b/toolchain/gcc/4.2.3/205-uclibc-locale-update.patch diff --git a/toolchain/gcc/4.2.2/300-libstdc++-pic.patch b/toolchain/gcc/4.2.3/300-libstdc++-pic.patch index 560bcb237..560bcb237 100644 --- a/toolchain/gcc/4.2.2/300-libstdc++-pic.patch +++ b/toolchain/gcc/4.2.3/300-libstdc++-pic.patch diff --git a/toolchain/gcc/4.2.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.2.3/301-missing-execinfo_h.patch index 0e2092f3f..0e2092f3f 100644 --- a/toolchain/gcc/4.2.2/301-missing-execinfo_h.patch +++ b/toolchain/gcc/4.2.3/301-missing-execinfo_h.patch diff --git a/toolchain/gcc/4.2.2/302-c99-snprintf.patch b/toolchain/gcc/4.2.3/302-c99-snprintf.patch index dfb22d681..dfb22d681 100644 --- a/toolchain/gcc/4.2.2/302-c99-snprintf.patch +++ b/toolchain/gcc/4.2.3/302-c99-snprintf.patch diff --git a/toolchain/gcc/4.2.2/303-c99-complex-ugly-hack.patch b/toolchain/gcc/4.2.3/303-c99-complex-ugly-hack.patch index 2ccc80d9b..2ccc80d9b 100644 --- a/toolchain/gcc/4.2.2/303-c99-complex-ugly-hack.patch +++ b/toolchain/gcc/4.2.3/303-c99-complex-ugly-hack.patch diff --git a/toolchain/gcc/4.2.2/304-index_macro.patch b/toolchain/gcc/4.2.3/304-index_macro.patch index d8e476555..d8e476555 100644 --- a/toolchain/gcc/4.2.2/304-index_macro.patch +++ b/toolchain/gcc/4.2.3/304-index_macro.patch diff --git a/toolchain/gcc/4.2.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.2.3/305-libmudflap-susv3-legacy.patch index 374b1f865..374b1f865 100644 --- a/toolchain/gcc/4.2.2/305-libmudflap-susv3-legacy.patch +++ b/toolchain/gcc/4.2.3/305-libmudflap-susv3-legacy.patch diff --git a/toolchain/gcc/4.2.2/306-libstdc++-namespace.patch b/toolchain/gcc/4.2.3/306-libstdc++-namespace.patch index 69587ca63..69587ca63 100644 --- a/toolchain/gcc/4.2.2/306-libstdc++-namespace.patch +++ b/toolchain/gcc/4.2.3/306-libstdc++-namespace.patch diff --git a/toolchain/gcc/4.2.2/307-locale_facets.patch b/toolchain/gcc/4.2.3/307-locale_facets.patch index 412f8657d..412f8657d 100644 --- a/toolchain/gcc/4.2.2/307-locale_facets.patch +++ b/toolchain/gcc/4.2.3/307-locale_facets.patch diff --git a/toolchain/gcc/4.2.2/402-libbackend_dep_gcov-iov.h.patch b/toolchain/gcc/4.2.3/402-libbackend_dep_gcov-iov.h.patch index 0bf115c45..0bf115c45 100644 --- a/toolchain/gcc/4.2.2/402-libbackend_dep_gcov-iov.h.patch +++ b/toolchain/gcc/4.2.3/402-libbackend_dep_gcov-iov.h.patch diff --git a/toolchain/gcc/4.2.2/800-arm-bigendian.patch b/toolchain/gcc/4.2.3/800-arm-bigendian.patch index 07c609337..07c609337 100644 --- a/toolchain/gcc/4.2.2/800-arm-bigendian.patch +++ b/toolchain/gcc/4.2.3/800-arm-bigendian.patch diff --git a/toolchain/gcc/4.2.2/904-flatten-switch-stmt-00.patch b/toolchain/gcc/4.2.3/904-flatten-switch-stmt-00.patch index 8fac37c4d..8fac37c4d 100644 --- a/toolchain/gcc/4.2.2/904-flatten-switch-stmt-00.patch +++ b/toolchain/gcc/4.2.3/904-flatten-switch-stmt-00.patch diff --git a/toolchain/gcc/4.2.2/910-soft-float.patch b/toolchain/gcc/4.2.3/910-soft-float.patch index 3f886acbf..3f886acbf 100644 --- a/toolchain/gcc/4.2.2/910-soft-float.patch +++ b/toolchain/gcc/4.2.3/910-soft-float.patch diff --git a/toolchain/gcc/4.2.2/920-soft-float.patch b/toolchain/gcc/4.2.3/920-soft-float.patch index 4287bfae2..4287bfae2 100644 --- a/toolchain/gcc/4.2.2/920-soft-float.patch +++ b/toolchain/gcc/4.2.3/920-soft-float.patch diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 20b8b0312..4f8eb46a9 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_1 if !BR2_avr32 + default BR2_GCC_VERSION_4_2_3 if !BR2_avr32 default BR2_GCC_VERSION_4_1_2 if BR2_avr32 help Select the version of gcc you wish to use. @@ -23,16 +23,15 @@ choice depends BR2_EXT_GCC_VERSION_4_1_2 bool "gcc 4.1.2" - config BR2_GCC_VERSION_4_2_0 - depends !BR2_avr32 && !BR2_nios2 - depends BR2_DEPRECATED || BR2_RECENT - bool "gcc 4.2.0" - config BR2_GCC_VERSION_4_2_1 depends !BR2_nios2 depends BR2_EXT_GCC_VERSION_4_2_1 bool "gcc 4.2.1" + config BR2_GCC_VERSION_4_2_3 + depends !BR2_nios2 && !BR2_avr32 + bool "gcc 4.2.3" + # config BR2_GCC_VERSION_4_3 # depends !BR2_avr32 && !BR2_nios2 # select BR2_GCC_IS_SNAP @@ -52,8 +51,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_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 + 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_3 + 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_3 config BR2_GCC_SNAP_DATE string "GCC snapshot date" @@ -68,8 +67,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.3" if BR2_GCC_VERSION_4_2_3 default "4.3" if BR2_GCC_VERSION_4_3 config BR2_TOOLCHAIN_SYSROOT |