toolchain: update gcc snapshot version

* Make mpc mandatory since we are probably building bleeding-edge
* Change snapshot naming convention to match the source

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 437b86bb7def8e6cc5da0cd411aaba1b4cea95a6..f11c80fab2f2e233b09ebe4c9cdb162e4ab24910 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -45,11 +45,17 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 
 config BR2_GCC_SNAP_DATE
        string "GCC snapshot date"
-       default "20070921"
+       default "4.7-20110430"
        depends on BR2_GCC_VERSION_SNAP
        help
-         Enter snapshot date to use for gcc.  Format is:
-         YYYYMMDD
+         Enter snapshot date to use for gcc.
+         Format is: A.B-YYYYMMDD
+
+         A is GCC major version, for example 4.
+         B is GCC minor version, for example 7.
+         YYYYMMDD is snapshot date, for example 20110430.
+
+         This way we'd get version 4.7-20110430
 
 config BR2_GCC_VERSION
        string

diff --git a/toolchain/gcc/Config.in.2 b/toolchain/gcc/Config.in.2
index 7a49068a753edd63c8b861738a4cae3516fb4c62..c76d12583208b780326fd00bbe9ce84382ef2f33 100644 (file)
--- a/toolchain/gcc/Config.in.2
+++ b/toolchain/gcc/Config.in.2
@@ -3,7 +3,7 @@ config BR2_PACKAGE_GCC_TARGET
        depends on BR2_HAVE_DEVFILES && BR2_TOOLCHAIN_BUILDROOT
        select BR2_PACKAGE_BINUTILS
        select BR2_PACKAGE_BINUTILS_TARGET
-       select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X)
+       select BR2_PACKAGE_MPC if (BR2_GCC_VERSION_4_5_X || BR2_GCC_VERSION_4_6_X || BR2_GCC_VERSION_SNAP)
        select BR2_PACKAGE_MPFR
        select BR2_PACKAGE_GMP
        help

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 9b8bf685cc7a4907568332c1eedb26d62b06f930..7123615495b645f1dac692044a317389373bf3a0 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -141,6 +141,17 @@ endif
 GCC_HOST_PREREQ += host-mpc
 endif
 
+# GCC snapshot prerequisites
+# Since we don't know and it can be quite new just ask for everything known
+ifneq ($(GCC_SNAP_DATE),)
+GCC_WITH_HOST_MPC = --with-mpc=$(HOST_DIR)/usr
+GCC_TARGET_PREREQ += mpc
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+HOST_SOURCE += host-mpc-source
+endif
+GCC_HOST_PREREQ += host-mpc
+endif
+
 ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
 GCC_SHARED_LIBGCC:=--enable-shared
 else