From 49bb82c9f4456b048c7c24ed79584551735199eb Mon Sep 17 00:00:00 2001 From: Nigel Kukard Date: Sun, 30 Mar 2008 08:12:22 +0000 Subject: [PATCH] * Removed GCC 4.2.0, added GCC 4.2.3 (take 2) --- target/device/x86/i386/i686_defconfig | 6 +++--- .../gcc/{4.2.2 => 4.2.3}/100-uclibc-conf.patch | 0 .../103-uclibc-conf-noupstream.patch | 0 .../104-gnuhurd-uclibc-conf.patch | 0 .../{4.2.2 => 4.2.3}/200-uclibc-locale.patch | 0 .../203-uclibc-locale-no__x.patch | 0 .../204-uclibc-locale-wchar_fix.patch | 0 .../205-uclibc-locale-update.patch | 0 .../{4.2.2 => 4.2.3}/300-libstdc++-pic.patch | 0 .../301-missing-execinfo_h.patch | 0 .../gcc/{4.2.2 => 4.2.3}/302-c99-snprintf.patch | 0 .../303-c99-complex-ugly-hack.patch | 0 .../gcc/{4.2.2 => 4.2.3}/304-index_macro.patch | 0 .../305-libmudflap-susv3-legacy.patch | 0 .../306-libstdc++-namespace.patch | 0 .../{4.2.2 => 4.2.3}/307-locale_facets.patch | 0 .../402-libbackend_dep_gcov-iov.h.patch | 0 .../{4.2.2 => 4.2.3}/800-arm-bigendian.patch | 0 .../904-flatten-switch-stmt-00.patch | 0 .../gcc/{4.2.2 => 4.2.3}/910-soft-float.patch | 0 .../gcc/{4.2.2 => 4.2.3}/920-soft-float.patch | 0 toolchain/gcc/Config.in | 17 ++++++++--------- 22 files changed, 11 insertions(+), 12 deletions(-) rename toolchain/gcc/{4.2.2 => 4.2.3}/100-uclibc-conf.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/103-uclibc-conf-noupstream.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/104-gnuhurd-uclibc-conf.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/200-uclibc-locale.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/203-uclibc-locale-no__x.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/204-uclibc-locale-wchar_fix.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/205-uclibc-locale-update.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/300-libstdc++-pic.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/301-missing-execinfo_h.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/302-c99-snprintf.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/303-c99-complex-ugly-hack.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/304-index_macro.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/305-libmudflap-susv3-legacy.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/306-libstdc++-namespace.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/307-locale_facets.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/402-libbackend_dep_gcov-iov.h.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/800-arm-bigendian.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/904-flatten-switch-stmt-00.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/910-soft-float.patch (100%) rename toolchain/gcc/{4.2.2 => 4.2.3}/920-soft-float.patch (100%) diff --git a/target/device/x86/i386/i686_defconfig b/target/device/x86/i386/i686_defconfig index 3ea1a1a7f8..e5f02c0306 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 similarity index 100% rename from toolchain/gcc/4.2.2/100-uclibc-conf.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/103-uclibc-conf-noupstream.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/104-gnuhurd-uclibc-conf.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/200-uclibc-locale.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/203-uclibc-locale-no__x.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/204-uclibc-locale-wchar_fix.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/205-uclibc-locale-update.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/300-libstdc++-pic.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/301-missing-execinfo_h.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/302-c99-snprintf.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/303-c99-complex-ugly-hack.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/304-index_macro.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/305-libmudflap-susv3-legacy.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/306-libstdc++-namespace.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/307-locale_facets.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/402-libbackend_dep_gcov-iov.h.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/800-arm-bigendian.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/904-flatten-switch-stmt-00.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/910-soft-float.patch rename to 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 similarity index 100% rename from toolchain/gcc/4.2.2/920-soft-float.patch rename to toolchain/gcc/4.2.3/920-soft-float.patch diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 20b8b03125..4f8eb46a90 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 -- 2.30.2