From 017d2d014e35bbab346b10e50d6d98222ba2aa1a Mon Sep 17 00:00:00 2001
From: Cristoforo Cataldo <cristoforo.cataldo@gmail.com>
Date: Tue, 6 Jan 2015 23:27:39 +0100
Subject: debug: gdb: Add Linaro GDB 7.8-2014.09 and Linaro GDB 7.6.1-2013.10

This commit allows to choose, download and build latest Linaro GDB:
- gdb-linaro-7.8-2014.09
- gdb-linaro-7.6.1-2013.10

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

diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index bf0925d..9ca84f5 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -33,6 +33,12 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config GDB_V_linaro_7_8
+    bool
+    prompt "linaro-7.8-2014.09"
+    depends on DEBUG_GDB_SHOW_LINARO
+    select GDB_7_2_or_later
+
 config GDB_V_7_8_1
     bool
     prompt "7.8.1"
@@ -53,14 +59,20 @@ config GDB_V_7_7
     prompt "7.7"
     select GDB_7_2_or_later
 
+config GDB_V_linaro_7_6
+    bool
+    prompt "linaro-7.6.1-2013.10"
+    depends on DEBUG_GDB_SHOW_LINARO
+    select GDB_7_2_or_later
+
 config GDB_V_7_6_1
     bool
     prompt "7.6.1"
     select GDB_7_2_or_later
 
-config GDB_V_linaro_7_6_2013_05
+config GDB_V_linaro_7_5
     bool
-    prompt "linaro-7.6-2013.05"
+    prompt "linaro-7.5-2012.12-1"
     depends on DEBUG_GDB_SHOW_LINARO
     select GDB_7_2_or_later
 
@@ -69,13 +81,7 @@ config GDB_V_7_5_1
     prompt "7.5.1"
     select GDB_7_2_or_later
 
-config GDB_V_linaro_7_5_2012_12_1
-    bool
-    prompt "linaro-7.5-2012.12-1"
-    depends on DEBUG_GDB_SHOW_LINARO
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_4_2012_06
+config GDB_V_linaro_7_4
     bool
     prompt "linaro-7.4-2012.06"
     depends on DEBUG_GDB_SHOW_LINARO
@@ -91,7 +97,7 @@ config GDB_V_7_4
     prompt "7.4"
     select GDB_7_2_or_later
 
-config GDB_V_linaro_7_3_2011_12
+config GDB_V_linaro_7_3
     bool
     prompt "linaro-7.3-2011.12"
     depends on DEBUG_GDB_SHOW_LINARO
@@ -107,7 +113,7 @@ config GDB_V_7_3a
     prompt "7.3a"
     select GDB_7_2_or_later
 
-config GDB_V_linaro_7_2_2011_05_0
+config GDB_V_linaro_7_2
     bool
     prompt "linaro-7.2-2011.05-0"
     depends on DEBUG_GDB_SHOW_LINARO
@@ -168,18 +174,19 @@ config GDB_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "linaro-7.8-2014.09" if GDB_V_linaro_7_8
     default "7.8.1" if GDB_V_7_8_1
     default "7.8" if GDB_V_7_8
     default "7.7.1" if GDB_V_7_7_1
     default "7.7" if GDB_V_7_7
+    default "linaro-7.6.1-2013.10" if GDB_V_linaro_7_6
     default "7.6.1" if GDB_V_7_6_1
-    default "linaro-7.6-2013.05" if GDB_V_linaro_7_6_2013_05
+    default "linaro-7.5-2012.12-1" if GDB_V_linaro_7_5
     default "7.5.1" if GDB_V_7_5_1
-    default "linaro-7.5-2012.12-1" if GDB_V_linaro_7_5_2012_12_1
-    default "linaro-7.4-2012.06" if GDB_V_linaro_7_4_2012_06
+    default "linaro-7.4-2012.06" if GDB_V_linaro_7_4
     default "7.4.1" if GDB_V_7_4_1
     default "7.4" if GDB_V_7_4
-    default "linaro-7.3-2011.12" if GDB_V_linaro_7_3_2011_12
+    default "linaro-7.3-2011.12" if GDB_V_linaro_7_3
     default "7.3.1" if GDB_V_7_3_1
     default "7.3a" if GDB_V_7_3a
     default "linaro-7.2-2011.05-0" if GDB_V_linaro_7_2_2011_05_0
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 149a2f8..8fed3d0 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -35,15 +35,6 @@ do_debug_gdb_parts() {
 do_debug_gdb_get() {
     local linaro_version=""
     local linaro_series=""
-    local linaro_base_url="http://launchpad.net/gdb-linaro"
-
-    # Account for the Linaro versioning
-    linaro_version="$( echo "${CT_GDB_VERSION}"      \
-                       |sed -r -e 's/^linaro-//;'   \
-                     )"
-    linaro_series="$( echo "${linaro_version}"      \
-                      |sed -r -e 's/-.*//;'         \
-                    )"
 
     do_debug_gdb_parts
 
@@ -51,13 +42,24 @@ do_debug_gdb_get() {
         if [ "${CT_GDB_CUSTOM}" = "y" ]; then
             CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}"
         else
+            # Account for the Linaro versioning
+            linaro_version="$( echo "${CT_GDB_VERSION}"      \
+                               |${sed} -r -e 's/^linaro-//;'   \
+                             )"
+            linaro_series="$( echo "${linaro_version}"      \
+                              |${sed} -r -e 's/-.*//;'         \
+                            )"
+
             if [ x"${linaro_version}" = x"${CT_GDB_VERSION}" ]; then
-                CT_GetFile "gdb-${CT_GDB_VERSION}"                      \
-                    ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \
-                    {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb
+                CT_GetFile "gdb-${CT_GDB_VERSION}"                             \
+                           ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \
+                           {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb
             else
-                CT_GetFile "gdb-${CT_GDB_VERSION}"                                    \
-                    "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
+                YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'`
+                CT_GetFile "gdb-${CT_GDB_VERSION}"                                                        \
+                           "http://launchpad.net/gdb-linaro/${linaro_series}/${linaro_version}/+download" \
+                           https://releases.linaro.org/${YYMM}/components/toolchain/gdb-linaro            \
+                           http://cbuild.validation.linaro.org/snapshots
             fi
         fi
     fi
-- 
cgit v0.10.2-6-g49f6