From d90bd6f13fa1b657f502e0a086c3ca4831af38ea Mon Sep 17 00:00:00 2001
From: Cristoforo Cataldo <cristoforo.cataldo@gmail.com>
Date: Tue, 6 Jan 2015 23:21:28 +0100
Subject: gcc: Add Linaro GCC 4.9-2015.01 and GCC 4.8-2014.11

This commit allows to choose, download and build latest Linaro GCC:
- gcc-linaro-4.9-2015.01
- gcc-linaro-4.8-2014.11

Signed-off-by: Cristoforo Cataldo <cristoforo.cataldo@gmail.com>

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 95abde6..65ecd94 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -36,6 +36,12 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config CC_V_linaro_4_9
+    bool
+    prompt "linaro-4.9-2015.01"
+    depends on CC_GCC_SHOW_LINARO
+    select CC_GCC_4_9
+
 config CC_V_4_9_2
     bool
     prompt "4.9.2"
@@ -53,7 +59,7 @@ config CC_V_4_9_0
 
 config CC_V_linaro_4_8
     bool
-    prompt "linaro-4.8-2014.04"
+    prompt "linaro-4.8-2014.11"
     depends on CC_GCC_SHOW_LINARO
     select CC_GCC_4_8
 
@@ -502,10 +508,11 @@ config CC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "linaro-4.9-2015.01" if CC_V_linaro_4_9
     default "4.9.2" if CC_V_4_9_2
     default "4.9.1" if CC_V_4_9_1
     default "4.9.0" if CC_V_4_9_0
-    default "linaro-4.8-2014.04" if CC_V_linaro_4_8
+    default "linaro-4.8-2014.11" if CC_V_linaro_4_8
     default "4.8.4" if CC_V_4_8_4
     default "4.8.3" if CC_V_4_8_3
     default "4.8.2" if CC_V_4_8_2
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 40241c2..ed78aa1 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -6,30 +6,31 @@
 do_cc_get() {
     local linaro_version=""
     local linaro_series=""
-    local linaro_base_url="http://launchpad.net/gcc-linaro"
 
     if [ "${CT_CC_CUSTOM}" = "y" ]; then
         CT_GetCustom "gcc" "${CT_CC_VERSION}" "${CT_CC_CUSTOM_LOCATION}"
     else
         # Account for the Linaro versioning
         linaro_version="$( echo "${CT_CC_VERSION}"      \
-                           |sed -r -e 's/^linaro-//;'   \
+                           |${sed} -r -e 's/^linaro-//;'   \
                          )"
         linaro_series="$( echo "${linaro_version}"      \
-                          |sed -r -e 's/-.*//;'         \
+                          |${sed} -r -e 's/-.*//;'         \
                         )"
 
-	# The official gcc hosts put gcc under a gcc/release/ directory,
-	# whereas the mirrors put it in the gcc/ directory.
-	# Also, Split out linaro mirrors, so that downloads happen faster.
-	CT_DoLog EXTRA "linaro_version: ${linaro_version} CT_CC_VERSION: ${CT_CC_VERSION}"
+        # The official gcc hosts put gcc under a gcc/release/ directory,
+        # whereas the mirrors put it in the gcc/ directory.
+        # Also, Split out linaro mirrors, so that downloads happen faster.
         if [ x"${linaro_version}" = x"${CT_CC_VERSION}" ]; then
-            CT_GetFile "gcc-${CT_CC_VERSION}"                                                \
-                ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION}     \
-                {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION}
+            CT_GetFile "gcc-${CT_CC_VERSION}"                                                   \
+                       ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION} \
+                       {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION}
         else
-            CT_GetFile "gcc-${CT_CC_VERSION}"                                                \
-                   "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
+            YYMM=`echo ${CT_CC_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'`
+            CT_GetFile "gcc-${CT_CC_VERSION}"                                                               \
+                       "http://launchpad.net/gcc-linaro/${linaro_series}/${linaro_version}/+download"       \
+                       https://releases.linaro.org/${YYMM}/components/toolchain/gcc-linaro/${linaro_series} \
+                       http://cbuild.validation.linaro.org/snapshots
         fi
 
     fi # ! custom location
-- 
cgit v0.10.2-6-g49f6