From fa992b41918a1dbf05f6830ba659f4ea6ffc5ffa Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Tue, 21 Sep 2021 19:46:06 +1200
Subject: binutils: Remove obsolete versions

The following versions were marked obsolete in crosstool-ng-1.24.0,
remove them.
- binutils-linaro-2.23.2-2013.10-4
- binutils-linaro-2.24.0-2014.11-2
- binutils-linaro-2.25.0-2015.01-2
- binutils-2.23.2
- binutils-2.24
- binutils-2.25.1

Adjust the milestones now that the old versions have been removed.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 scripts/build/binutils/binutils.sh | 46 +++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'scripts/build/binutils/binutils.sh')

diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 05df34ae..4a27e227 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -131,24 +131,22 @@ do_binutils_backend() {
 
     CT_DoLog EXTRA "Configuring binutils"
 
-    if [ "${CT_BINUTILS_HAS_GOLD}" = "y" ]; then
-        case "${CT_BINUTILS_LINKERS_LIST}" in
-            ld)
-                extra_config+=( --enable-ld=yes --enable-gold=no )
-                ;;
-            gold)
-                extra_config+=( --enable-ld=no --enable-gold=yes )
-                ;;
-            ld,gold)
-                extra_config+=( --enable-ld=default --enable-gold=yes )
-                ;;
-            gold,ld)
-                extra_config+=( --enable-ld=yes --enable-gold=default )
-                ;;
-        esac
-        if [ "${CT_BINUTILS_GOLD_THREADS}" = "y" ]; then
-            extra_config+=( --enable-threads )
-        fi
+    case "${CT_BINUTILS_LINKERS_LIST}" in
+        ld)
+            extra_config+=( --enable-ld=yes --enable-gold=no )
+            ;;
+        gold)
+            extra_config+=( --enable-ld=no --enable-gold=yes )
+            ;;
+        ld,gold)
+            extra_config+=( --enable-ld=default --enable-gold=yes )
+            ;;
+        gold,ld)
+            extra_config+=( --enable-ld=yes --enable-gold=default )
+            ;;
+    esac
+    if [ "${CT_BINUTILS_GOLD_THREADS}" = "y" ]; then
+        extra_config+=( --enable-threads )
     fi
     if [ "${CT_BINUTILS_PLUGINS}" = "y" ]; then
         extra_config+=( --enable-plugins )
@@ -161,10 +159,8 @@ do_binutils_backend() {
     if [ "${CT_BINUTILS_DETERMINISTIC_ARCHIVES}" = "y" ]; then
         extra_config+=( --enable-deterministic-archives )
     fi
-    if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
-        [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
-        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
-    fi
+    [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+    [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
     if [ "${CT_MULTILIB}" = "y" ]; then
         extra_config+=("--enable-multilib")
     else
@@ -325,10 +321,8 @@ do_binutils_for_target() {
 
         CT_DoLog EXTRA "Configuring binutils for target"
 
-        if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then
-            [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
-            [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
-        fi
+        [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}")
+        [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}")
         if [ "${CT_MULTILIB}" = "y" ]; then
             extra_config+=("--enable-multilib")
         else
-- 
cgit v1.2.3