From 83a004e2c46f84ba6cee5aa69377a61ec7f528e2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 17 Feb 2011 22:29:33 +0100
Subject: [PATCH] cc/gcc: add versions from Linaro

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 config/cc/gcc.in        | 15 +++++++++++++++
 scripts/build/cc/gcc.sh | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 3c18b8be..6973c34e 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -19,6 +19,12 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config CC_V_linaro_4_5_2011_02_0
+    bool
+    prompt "linaro-4.5-2011.02-0 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    select CC_GCC_4_5_or_later
+
 config CC_V_4_5_2
     bool
     prompt "4.5.2 (EXPERIMENTAL)"
@@ -37,6 +43,13 @@ config CC_V_4_5_0
     depends on EXPERIMENTAL
     select CC_GCC_4_5_or_later
 
+
+config CC_V_linaro_4_4_2011_02_0
+    bool
+    prompt "linaro-4.4-2011.02-0 (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    select CC_GCC_4_4_or_later
+
 config CC_V_4_4_5
     bool
     prompt "4.4.5"
@@ -216,9 +229,11 @@ config CC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "linaro-4.5-2011.02-0" if CC_V_linaro_4_5_2011_02_0
     default "4.5.2" if CC_V_4_5_2
     default "4.5.1" if CC_V_4_5_1
     default "4.5.0" if CC_V_4_5_0
+    default "linaro-4.4-2011.02-0" if CC_V_linaro_4_4_2011_02_0
     default "4.4.5" if CC_V_4_4_5
     default "4.4.4" if CC_V_4_4_4
     default "4.4.3" if CC_V_4_4_3
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index c0a87743..113292a3 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -4,6 +4,19 @@
 
 # Download gcc
 do_cc_get() {
+    local linaro_version
+    local linaro_series
+    local linaro_base_url="http://launchpad.net/gcc-linaro"
+
+
+    # Account for the Linaro versioning
+    linaro_version="$( echo "${CT_CC_VERSION}"      \
+                       |sed -r -e 's/^linaro-//;'   \
+                     )"
+    linaro_series="$( echo "${linaro_version}"      \
+                      |sed -r -e 's/-.*//;'         \
+                    )"
+
     # Ah! gcc folks are kind of 'different': they store the tarballs in
     # subdirectories of the same name! That's because gcc is such /crap/ that
     # it is such /big/ that it needs being splitted for distribution! Sad. :-(
@@ -13,7 +26,8 @@ do_cc_get() {
     CT_GetFile "gcc-${CT_CC_VERSION}"                                                       \
                {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/gcc-${CT_CC_VERSION}}         \
                ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-${CT_CC_VERSION} \
-               ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}
+               ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION}                         \
+               "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
 
     # Starting with GCC 4.3, ecj is used for Java, and will only be
     # built if the configure script finds ecj.jar at the top of the