* Reverted r21540

diff --git a/.defconfig b/.defconfig
index 4d0d5269e03ec3fe11a5553a0fa18173f11c700a..866c60ba1d723cb7a89effc163298af9b5574f65 100644 (file)
--- a/.defconfig
+++ b/.defconfig
@@ -133,7 +133,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -191,12 +191,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/ARMLTD/integrator926_defconfig b/target/device/ARMLTD/integrator926_defconfig
index acfd3833d02812b294f7768f29ea0044d35f74eb..58fc0b47fb6c70a34e8009916f9d2813b1402d92 100644 (file)
--- a/target/device/ARMLTD/integrator926_defconfig
+++ b/target/device/ARMLTD/integrator926_defconfig
@@ -196,12 +196,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/ARMLTD/integrator926_huge_defconfig b/target/device/ARMLTD/integrator926_huge_defconfig
index a7f1d86a72d158a213c7b12e62df634046505eb1..d7cb4872c4f68b583408843970c5ffabef401a95 100644 (file)
--- a/target/device/ARMLTD/integrator926_huge_defconfig
+++ b/target/device/ARMLTD/integrator926_huge_defconfig
@@ -172,12 +172,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
index bf86e271327b1447bb21c75e6222346ca0e04f56..c625d57d8c983f80e862bd62d0cb3b6dcfdf6ed3 100644 (file)
--- a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
+++ b/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig
@@ -166,7 +166,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -227,12 +227,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
index b5b3ba75619bd7257f0a3273cf554d0021980e28..fe8bb89cae5acb9b954afc136847889bc7efb405 100644 (file)
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
@@ -177,7 +177,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -239,12 +239,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig b/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig
index adcbee4b612087f5aab85a54b9d3c43d53f803f1..3c1e8903de2c5768eaefcc45c2de99898d6944bd 100644 (file)
--- a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig
+++ b/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig
@@ -183,7 +183,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -244,12 +244,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
index c3f978e9932fefdfc73d95f924f4c445ae20ee3d..1dffcdb5d8b15a7fc3b9ca34a780cf2819b740e3 100644 (file)
--- a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
+++ b/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig
@@ -180,7 +180,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -241,12 +241,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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/atngw100-base/atngw100-base_defconfig b/target/device/Atmel/atngw100-base/atngw100-base_defconfig
index 0e7734959f17582ac23b069c399a047520c73849..29dc94b9cf234c218ed02b3c3539126c573dbc82 100644 (file)
--- a/target/device/Atmel/atngw100-base/atngw100-base_defconfig
+++ b/target/device/Atmel/atngw100-base/atngw100-base_defconfig
@@ -132,7 +132,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -190,11 +190,11 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.1"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/atngw100-expanded/atngw100_expanded_defconfig b/target/device/Atmel/atngw100-expanded/atngw100_expanded_defconfig
index 1e70daab09562e299133ed2912a615f67f3e6ca8..0fda32c1e18457f916d52b4db276e8833fc372db 100644 (file)
--- a/target/device/Atmel/atngw100-expanded/atngw100_expanded_defconfig
+++ b/target/device/Atmel/atngw100-expanded/atngw100_expanded_defconfig
@@ -132,7 +132,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -190,8 +190,8 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.1"

diff --git a/target/device/Atmel/atngw100/atngw100_defconfig b/target/device/Atmel/atngw100/atngw100_defconfig
index 2ec2a89372238cc9ad6af45e485d3b0192e6f18f..408b0dec3a600eee093569e8d677567f45d6c554 100644 (file)
--- a/target/device/Atmel/atngw100/atngw100_defconfig
+++ b/target/device/Atmel/atngw100/atngw100_defconfig
@@ -132,7 +132,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -190,11 +190,11 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.1"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/atstk1002/atstk1002-no-mplayer_defconfig b/target/device/Atmel/atstk1002/atstk1002-no-mplayer_defconfig
index 159fb5281ff6f7fee4199f2e8a0815e8b541b757..b55698e4943a416e732626425522053615d5a3fa 100644 (file)
--- a/target/device/Atmel/atstk1002/atstk1002-no-mplayer_defconfig
+++ b/target/device/Atmel/atstk1002/atstk1002-no-mplayer_defconfig
@@ -132,7 +132,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -190,11 +190,11 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.1"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Atmel/atstk1002/atstk1002_defconfig b/target/device/Atmel/atstk1002/atstk1002_defconfig
index ac18cb10db49c8d86fbd732cd4a73004a8d5ed86..8dca6ca080edbc0cc5a79a0d05800b09505cdeaa 100644 (file)
--- a/target/device/Atmel/atstk1002/atstk1002_defconfig
+++ b/target/device/Atmel/atstk1002/atstk1002_defconfig
@@ -132,7 +132,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -190,11 +190,11 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.1"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/Config.in.toolchain b/target/device/Config.in.toolchain
index 46acce948fc876828cf37de7299a1324f2b0df3b..2f3e3d73aed05f420474b30566c4ba01f6ced263 100644 (file)
--- a/target/device/Config.in.toolchain
+++ b/target/device/Config.in.toolchain
@@ -1,7 +1,7 @@
 if BR2_TOOLCHAIN_EXTERNAL_SOURCE
 choice
        prompt "Source location:"
-       default BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 if BR2_avr32
+       default BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 if BR2_avr32
        help
          Select whether to use the toolchain built by the buildroot
          system or an external pre-built toolchain.
@@ -16,16 +16,16 @@ config BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
        help
          The gcc-4.1.2 toolchain for the AVR32
 
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
-       bool "Use prepatched source for AVR32 gcc-4.2.2 toolchain"
+config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
+       bool "Use prepatched source for AVR32 gcc-4.2.1 toolchain"
        depends on BR2_avr32
-       select BR2_EXT_GCC_VERSION_4_2_2
+       select BR2_EXT_GCC_VERSION_4_2_1
        select BR2_EXT_BINUTILS_VERSION_2_17
        select BR2_EXT_UCLIBC_VERSION_0_9_29
        select BR2_TOOLCHAIN_ATMEL_AVR32
        help
-         The gcc-4.2.2 toolchain for the AVR32
-         * gcc-4.2.2
+         The gcc-4.2.1 toolchain for the AVR32
+         * gcc-4.2.1
          * binutils-2.17
          * uClibc-0.9.29
          * gdb-6.4
@@ -57,7 +57,7 @@ config BR2_VENDOR_BINUTILS_RELEASE
 config BR2_VENDOR_GCC_RELEASE
        string
        default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
-       default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
+       default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
 
 config BR2_VENDOR_UCLIBC_RELEASE
        string
@@ -110,7 +110,7 @@ config      BR2_EXT_GCC_VERSION_4_1_2
        default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
        default n if  BR2_TOOLCHAIN_EXTERNAL_SOURCE
 
-config BR2_EXT_GCC_VERSION_4_2_2
+config BR2_EXT_GCC_VERSION_4_2_1
        bool
        default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
        default n if  BR2_TOOLCHAIN_EXTERNAL_SOURCE

diff --git a/target/device/valka/v100sc2_defconfig b/target/device/valka/v100sc2_defconfig
index 28ce6e89e41af7c4579d5fc3c346a128ec119f03..040712d9b1cfe34b34d9401f56cd73656f8f75a7 100644 (file)
--- a/target/device/valka/v100sc2_defconfig
+++ b/target/device/valka/v100sc2_defconfig
@@ -109,7 +109,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -167,11 +167,11 @@ 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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/target/device/x86/i386/i686_defconfig b/target/device/x86/i386/i686_defconfig
index bd1c6b3c1d78f62bc14073055f39e3d1540c26b9..3ea1a1a7f898785be7a7b7854a09e7a1fc3b78c4 100644 (file)
--- a/target/device/x86/i386/i686_defconfig
+++ b/target/device/x86/i386/i686_defconfig
@@ -140,7 +140,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
 BR2_TOOLCHAIN_SOURCE=y
 BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_2=y
+BR2_EXT_GCC_VERSION_4_2_1=y
 BR2_EXT_BINUTILS_VERSION_2_17=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
@@ -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_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_0 is not set
+BR2_GCC_VERSION_4_2_1=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.2"
+BR2_GCC_VERSION="4.2.1"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 903a4fa9a4b73d248262d32d8786e04030ee1d50..20b8b03125f773b438770ab0e9939e5b803c7a1b 100644 (file)
--- 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