Fix the references to old config variables

Signed-off-by: Alexey Neyman <stilor@att.net>

Makefile.in

@@ -148,7 +148,7 @@ distclean: clean
 	$(call __silent_rm,Makefile kconfig/Makefile config/configure.in)
 
 mrproper: distclean
-	$(call __silent_rmdir,autom4te.cache config/gen)
+	$(call __silent_rmdir,autom4te.cache config/gen config/versions)
 	$(call __silent_rm,config.log config.status configure)
 
 uninstall: real-uninstall

TODO

@@ -1,3 +1,10 @@
+TBD
+packages todo
+[ ] mention custom glibc addons are no longer handled (even though they never fully were, ct-ng would be unable to fetch them unless they were secretly placed into the download area)
+[ ] mention incompatibility of sample options
+[ ] version-locked packages
+  [ ] make glibc-ports package for glibc <2.17 (it has its own repo)
+
 A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic language; contact me if you want to help with any of these :)
 
 -- Alexey Neyman (@stilor)
@@ -6,9 +13,11 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag
   [ ] linux
   [ ] mingw-w64
   [ ] newlib
+  [ ] gcc-linaro
 [ ] clean up GDB versions - no X.Y if X.Y.1 is present
   [ ] Check other packages, leave only the most recent on each branch
 [ ] arm_neon.h - offer as a companion "library" for the target
+[ ] gdbinit (installed if CT_GDB_INSTALL_GDBINIT is set) is not relocatable, contains absolute paths
 [ ] FreeBSD
   [ ] Use 'cc' rather than 'gcc' on the host
     [ ] Detect in configure what the default value is

config/binutils.in

@@ -33,9 +33,6 @@ config ARCH_BINFMT_FDPIC
 
 endchoice
 
-config BINUTILS
-    string
-
 source "config/gen/binutils.in"
 source "config/gen/binutils.in.2"
 

config/cc.in

@@ -2,13 +2,6 @@
 
 menu "C compiler"
 
-config CC
-    string
-    default "gcc"
-
-config CC_VERSION
-    string
-
 config CC_CORE_PASSES_NEEDED
     bool
     select CC_CORE_PASS_1_NEEDED
@@ -20,8 +13,6 @@ config CC_CORE_PASS_1_NEEDED
 config CC_CORE_PASS_2_NEEDED
     bool
 
-source "config/gen/cc.in"
-
 config CC_SUPPORT_CXX
     bool
 
@@ -43,6 +34,8 @@ config CC_SUPPORT_OBJCXX
 config CC_SUPPORT_GOLANG
     bool
 
+source "config/gen/cc.in"
+
 comment "Additional supported languages:"
 
 config CC_LANG_CXX

config/cc/gcc.in.2

@@ -7,6 +7,11 @@ config CC_GCC_ENABLE_PLUGINS
     depends on ! STATIC_TOOLCHAIN
     default y
 
+# Affects the build of musl
+config GCC_BUG_61144
+    bool
+    default y if GCC_4_9_or_later && !GCC_4_9_2_or_later
+
 # If binutils installs gold, enable support for gold in gcc
 config CC_GCC_GOLD
     bool
@@ -133,7 +138,7 @@ comment "Optimisation features"
 config CC_GCC_USE_GRAPHITE
     bool "Enable GRAPHITE loop optimisations"
     default y
-    select CLOOG_NEEDED if !CC_GCC_5_or_later
+    select CLOOG_NEEDED if !GCC_5_or_later
     select ISL_NEEDED
     help
       Enable the GRAPHITE loop optimsations.

config/kernel.in

@@ -18,12 +18,6 @@ config WINDOWS
 config KERNEL_SUPPORTS_SHARED_LIBS
     bool
 
-config KERNEL
-    string
-
-config KERNEL_VERSION
-    string
-
 source "config/gen/kernel.in"
 
 comment "Common kernel options"

config/libc.in

@@ -2,23 +2,6 @@
 
 menu "C-library"
 
-config LIBC
-    string
-
-config LIBC_VERSION
-    string
-    help
-      Enter the date of the snapshot you want to use in the form: YYYYMMDD
-      where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit
-      day in the month.
-      
-      Please note:
-      - glibc has snapshots done every monday, and only the last ten are kept.
-      - uClibc has daily snapshots, and only the last 30-or-so are kept.
-      
-      So if you want to be able to re-build your toolchain later, you will
-      have to save your C library tarball by yourself.
-
 source "config/gen/libc.in"
 
 config LIBC_SUPPORT_THREADS_ANY

config/libc/bionic.in

@@ -3,7 +3,7 @@
 ## depends on ! WINDOWS && ! BARE_METAL
 ## depends on ARCH_arm || ARCH_mips || ARCH_x86
 ## depends on EXPERIMENTAL
-## depends on CC_GCC_6_or_later
+## depends on GCC_6_or_later
 ##
 ## select LIBC_SUPPORT_THREADS_POSIX
 ##

config/libc/glibc.in

@@ -1,9 +1,13 @@
 # glibc options
 
+# TBD move all the remaining parts into glibc.in.2 and move the sourcing of versions
+# into the auto-generated choice/menus?
+
 ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
 ##
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASSES_NEEDED
+# TBD: select GETTEXT for build only, not for host
 ## select GETTEXT_NEEDED
 ## select BINUTILS_FORCE_LD_BFD_DEFAULT
 ##
@@ -16,39 +20,6 @@
 # are still using quite ancient versions. Please do not retire versions
 # (including versions in between) until the EOL dates indicated in version.desc.
 source "config/versions/glibc.in"
-
-config THREADS
-    default "nptl"
-
-# SPARCv8 support retired in 2.23
-config GLIBC_NO_SPARC_V8
-    def_bool y
-    depends on GLIBC_2_23_or_later
-
-# With 2.20, NPTL is in default glibc
-config GLIBC_HAS_NPTL_ADDON
-    def_bool y
-    depends on !GLIBC_2_20_or_later
-
-# With 2.20, all architectures are in main tree
-config GLIBC_HAS_PORTS_ADDON
-    def_bool y
-    depends on !GLIBC_2_20_or_later
-
-# With 2.17 and later, 'ports' addon is shipped in glibc tarball
-config GLIBC_PORTS_EXTERNAL
-    def_bool y
-    depends on !GLIBC_2_17_or_later
-
-# Some architectures require the ports addon. List them one by one here:
-# This list must be carefully in sync with the architectures names
-# we can find in config/arch/*
-config GLIBC_NEEDS_PORTS
-    def_bool y
-    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
-
-# Ports are no longer an add-on starting with 2.20
-config GLIBC_USE_PORTS
-    def_bool y
-    depends on GLIBC_NEEDS_PORTS && GLIBC_HAS_PORTS_ADDON
-
+if GLIBC_USE_PORTS_EXTERNAL
+source "config/versions/glibc-ports.in"
+endif

config/libc/glibc.in.2

@@ -1,6 +1,70 @@
 # This file contains the common configuration options
 # that apply to both glibc.
 
+config THREADS
+    default "nptl"
+
+# Known add-ons and when they exist(ed)
+#   crypt           external in 2.1, no longer an add-on since 2.2
+#   libidn          external in 2.3.4 .. 2.10, still an add-on
+#   linuxthreads    external in 2.0.1 .. 2.5,  no longer available since 2.6 [*]
+#   localedata      external in 2.0.1 .. 2.0.6, no longer an add-on since 2.1 [*]
+#   ports           external in 2.3.4 .. 2.16, no longer an add-on since 2.20
+#   nptl            never external, no longer an add-on since 2.20
+#
+# Given the list of currently supported glibc releases, we only need to worry about
+# 'libidn', 'ports' and 'nptl' add-ons. Of these, only 'ports' can be an external
+# tarball; and only 'libidn' is user-selectable ('ports' & 'nptl' are selected
+# by crosstool-NG, as dictated by the architecture and thread model).
+#
+# I had trouble locating the sources in the repository for some of the released
+# versions. E.g., there is a 2.5 version of linuxthreads, but the tag for 2.5 in Git
+# does not have the linuxthreads directory at all. Similarly, 2.0.6 tag did not have
+# localedata. Since these releases are no longer supported by crosstool-NG, this is
+# of pure historical interest now, however.
+
+config GLIBC_HAS_NPTL_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+config GLIBC_HAS_PORTS_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+config GLIBC_HAS_PORTS_ADDON_EXTERNAL
+    def_bool y
+    depends on !GLIBC_2_17_or_later
+
+# In case it folds into main distribution in some future release, too
+config GLIBC_HAS_LIBIDN_ADDON
+    def_bool y
+
+# Some architectures require the ports addon. List them one by one here:
+# This list must be carefully in sync with the architectures names
+# we can find in config/arch/*
+config GLIBC_USE_PORTS_ADDON
+    def_bool y
+    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
+    depends on GLIBC_HAS_PORTS_ADDON
+
+config GLIBC_USE_PORTS_EXTERNAL
+    def_bool y
+    depends on GLIBC_USE_PORTS_ADDON && GLIBC_HAS_PORTS_ADDON_EXTERNAL
+
+config GLIBC_USE_NPTL_ADDON
+    def_bool y
+    depends on THREADS_NATIVE && GLIBC_HAS_NPTL_ADDON
+
+config GLIBC_USE_LIBIDN_ADDON
+    bool "Build libidn add-on"
+    help
+      Enables the libidn add-on in GNU libc.
+
+# SPARCv8 support retired in 2.23
+config GLIBC_NO_SPARC_V8
+    def_bool y
+    depends on GLIBC_2_23_or_later
+
 config GLIBC_EXTRA_CONFIG_ARRAY
     string
     prompt "extra config"
@@ -88,22 +152,6 @@ config GLIBC_FORCE_UNWIND
       of glibc on some architectures
       (seen on s390, s390x and x86_64).
 
-config GLIBC_ADDONS_LIST
-    string
-    prompt "Extra addons"
-    default ""
-    help
-      Extra addons to include. Space separated list.
-
-      You need to specify neither linuxthreads nor nptl, as they are added
-      automagically for you depending on the threading model you chose
-      earlier and on libc version selected.
-
-      Also, do not specify ports even if applicable to the selected libc
-      version/architecture; it is selected automatically.
-
-      Eg.: libidn
-
 config GLIBC_LOCALES
     bool
     prompt "Build and install locales"
@@ -111,7 +159,7 @@ config GLIBC_LOCALES
       Whether to build and install the libc locale files for the target,
       which is required in order to support internationalization.
 
-if LIBC_glibc && LIBC_LOCALES
+if LIBC_glibc && GLIBC_LOCALES
 comment "WARNING!                                                      "
 comment "|  The built locales will be usable if and only if the build  "
 comment "|  machine and the target:                                    "
@@ -121,7 +169,7 @@ comment "|  You will have to check by yourself (for now).              "
 comment "WARNING!                                                      "
 comment "|  Building GLIBC locales requires that GLIBC supports        "
 comment "|  the build machine as the target.                           "
-endif # LIBC_glibc && LIBC_LOCALES
+endif # LIBC_glibc && GLIBC_LOCALES
 
 if KERNEL_linux
 
@@ -215,7 +263,7 @@ endchoice
 config GLIBC_MIN_KERNEL
     string
     default ""                            if GLIBC_KERNEL_VERSION_NONE
-    default KERNEL_VERSION                if GLIBC_KERNEL_VERSION_AS_HEADERS
+    default LINUX_VERSION                 if GLIBC_KERNEL_VERSION_AS_HEADERS
     default GLIBC_MIN_KERNEL_VERSION      if GLIBC_KERNEL_VERSION_CHOSEN
 
 endif # KERNEL_linux

config/libc/newlib.in

@@ -21,3 +21,11 @@ config NEWLIB_CXA_ATEXIT
     def_bool y
     depends on NEWLIB_2_0_or_later
     select LIBC_PROVIDES_CXA_ATEXIT
+
+config NEWLIB_HAS_NANO_MALLOC
+    def_bool y
+    depends on NEWLIB_2_1_or_later
+
+config NEWLIB_HAS_NANO_FORMATTED_IO
+    def_bool y
+    depends on NEWLIB_2_2_or_later

config/libc/newlib.in.2

@@ -164,7 +164,7 @@ config LIBC_NEWLIB_LTO
 config LIBC_NEWLIB_NANO_MALLOC
     bool
     prompt "Enable Nano Malloc"
-    depends on LIBC_NEWLIB_2_1_or_later
+    depends on NEWLIB_HAS_NANO_MALLOC
     help
       NEWLIB has two implementations of malloc family's functions, one in
       `mallocr.c' and the other one in `nano-mallocr.c'.  This options
@@ -175,7 +175,7 @@ config LIBC_NEWLIB_NANO_MALLOC
 config LIBC_NEWLIB_NANO_FORMATTED_IO
     bool
     prompt "Enable Nano Formatted I/O"
-    depends on LIBC_NEWLIB_2_2_or_later
+    depends on NEWLIB_HAS_NANO_FORMATTED_IO
     help
       This builds NEWLIB with a special implementation of formatted I/O
       functions, designed to lower the size of application on small systems

config/target.in

@@ -2,9 +2,6 @@
 
 menu "Target options"
 
-config ARCH
-    string
-
 source "config/gen/arch.in"
 
 config ARCH_SUFFIX

maintainer/gen-kconfig.sh

@@ -81,6 +81,7 @@ gen_choice() {
 
     printf '\n'
     printf 'config %s\n' "${cfg_prefix}"
+    printf '    string\n'
     for entry in `get_components ${base_dir}`; do
         file="${base_dir}/${entry}.in"
         _entry=$(printf '%s\n' "${entry}" |"${sed}" -r -s -e 's/[-.+]/_/g;')

maintainer/gen-versions.sh

@@ -1,7 +1,21 @@
 #!/bin/bash
 
 ########################################
-# Common meta-language implementation
+# Common meta-language implementation. Syntax:
+#
+# The template file is processed line by line, with @@VAR@@ placeholders
+# being replaced with a value of the VAR variable.
+# Special lines start with '#!' and a keyword:
+#
+# #!//
+#     Comment, the rest of the line is ignored
+# #!if COND
+#     Conditional: the lines until the matching #!end-if are processed
+#     only if the conditional COND evaluates to true.
+# #!foreach NAME
+#     Iterate over NAME entities (the iterator must be set up first
+#     using the set_iter function), processing the lines until the matching
+#     #!end-foreach line.
 
 declare -A info
 
@@ -12,7 +26,7 @@ debug()
     fi
 }
 
-info()
+msg()
 {
     if [ -z "${QUIET}" ]; then
         echo "INFO  :: $@" >&2
@@ -125,7 +139,7 @@ run_lines()
     while [ "${l}" -le "${end}" ]; do
         lnext=$[l+1]
         s="${tlines[${l}]}"
-        # Expand @@foo@@ to ${info[foo]}. First escape quotes/backslashes.
+        # Expand @@foo@@ to ${info[foo]}. First escape variables/backslashes for evals below.
         s="${s//\\/\\\\}"
         s="${s//\$/\\\$}"
         while [ -n "${s}" ]; do
@@ -352,13 +366,28 @@ sort_versions()
 
 read_file()
 {
-    local l
+    local l p
 
     while read l; do
+        l="${p}${l}"
+        p=
         case "${l}" in
-            "#"*) continue;;
-            *=*) echo "info[${l%%=*}]=${l#*=}";;
-            *) error "syntax error in '${1}': '${l}'"
+            "")
+                continue
+                ;;
+            *\\)
+                p="${l%\\}"
+                continue
+                ;;
+            "#"*)
+                continue
+                ;;
+            *=*)
+                echo "info[${l%%=*}]=${l#*=}"
+                ;;
+            *)
+                error "syntax error in '${1}': '${l}'"
+                ;;
         esac
     done < "${1}"
 }
@@ -410,6 +439,7 @@ enter_fork()
     info[repository_cset]=HEAD
     info[fork]=${fork}
     info[name]=${fork}
+    info[mirrors]=
 
     eval `read_package_desc ${fork}`
 
@@ -426,6 +456,7 @@ enter_fork()
         info[repository_url]=${info[repository]##* }
         info[repository_dflt_branch]=${dflt_branch[${info[vcs]}]}
     fi
+    info[versionlocked]=`kconfigize "${info[versionlocked]}"`
 
     versions=`cd packages/${fork} && \
         for f in */version.desc; do [ -r "${f}" ] && echo "${f%/version.desc}"; done`
@@ -449,13 +480,6 @@ enter_fork()
     fi
 }
 
-set_latest_milestone()
-{
-    if [ `cmp_versions ${info[ms]} ${info[ver]}` -le 0 -a -z "${milestone}" ]; then
-        milestone=${info[ms_kcfg]}
-    fi
-}
-
 enter_version()
 {
     local -A ver_postfix=( \
@@ -463,35 +487,23 @@ enter_version()
         [,,yes,]=" (EXPERIMENTAL)" \
         [,yes,yes,]=" (OBSOLETE,EXPERIMENTAL)" )
     local version="${1}"
-    local tmp milestone
 
     eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
     info[kcfg]=`kconfigize ${version}`
     info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
-
-    # TBD do we need "prev" version?
-    tmp=" ${info[all_versions]} "
-    tmp=${tmp##* ${version} }
-    info[prev]=`kconfigize ${tmp%% *}`
-
-    # Find the latest milestone preceding this version
-    milestone=
-    do_foreach milestone set_latest_milestone
-    info[milestone]=${milestone}
 }
 
 enter_milestone()
 {
     local ms="${1}"
-    local tmp
+    local cmp
 
     info[ms]=${ms}
     info[ms_kcfg]=`kconfigize ${ms}`
-
-    tmp=" ${info[all_milestones]} "
-    tmp=${tmp##* ${ms} }
-    info[ms_prev]=`kconfigize ${tmp%% *}`
+    if [ -n "${info[ver]}" ]; then
+        info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}`
+    fi
 }
 
 rm -rf "${config_dir}"
@@ -502,7 +514,7 @@ pkg_all=( `cd packages && \
     while read f; do [ -r "${f}" ] && echo "${f%/package.desc}"; done | \
     xargs echo` )
 
-info "Generating package version descriptions"
+msg "Generating package version descriptions"
 debug "Packages: ${pkg_all[@]}"
 
 # We need to group forks of the same package into the same
@@ -511,12 +523,12 @@ debug "Packages: ${pkg_all[@]}"
 for p in "${pkg_all[@]}"; do
     find_forks "${p}"
 done
-info "Master packages: ${pkg_masters[@]}"
+msg "Master packages: ${pkg_masters[@]}"
 
 # Now for each master, create its kconfig file with version
 # definitions.
 for p in "${pkg_masters[@]}"; do
-    info "Generating '${config_dir}/${p}.in'"
+    msg "Generating '${config_dir}/${p}.in'"
     exec >"${config_dir}/${p}.in"
     # Base definitions for the whole config file
     info=( \
@@ -532,4 +544,4 @@ for p in "${pkg_masters[@]}"; do
     # TBD get rid of the "origin" completely and use just the fork name?
     run_template "${template}"
 done
-info "Done!"
+msg "Done!"

maintainer/kconfig-versions.template

@@ -58,19 +58,6 @@ config @@pfx@@_SRC_DEVEL
 	  Check out from vendor repository at:
 	  @@repository_url@@
 
-#!end-if
-config @@pfx@@_SRC_CUSTOM
-	bool "Custom location"
-	depends on EXPERIMENTAL
-	help
-	  Custom directory or tarball.
-
-endchoice
-#!if [ -n "@@all_versions@@" ]
-endif
-#!end-if
-
-#!if [ -n "@@repository@@" ]
 if @@pfx@@_SRC_DEVEL
 
 config @@pfx@@_DEVEL_VCS
@@ -95,7 +82,13 @@ config @@pfx@@_DEVEL_REVISION
 	  Commit ID or revision ID to check out.
 
 endif
+
 #!end-if
+config @@pfx@@_SRC_CUSTOM
+	bool "Custom location"
+	depends on EXPERIMENTAL
+	help
+	  Custom directory or tarball.
 
 if @@pfx@@_SRC_CUSTOM
 
@@ -106,9 +99,40 @@ config @@pfx@@_CUSTOM_LOCATION
 
 endif
 
+endchoice
 #!if [ -n "@@all_versions@@" ]
+endif
+
+config @@pfx@@_MIRRORS_ARRAY
+    string
+    default "@@mirrors@@"
+#!end-if
+
+#!// Below, we explicitly select all milestones to which a given version
+#!// compares greater-or-equal. We don't select just the latest applicable
+#!// (and letting milestones chain-select each other, with FOO_6_or_later
+#!// selecting FOO_5_or_later and so on) so that we can handle the cases
+#!// where we need to identify a range of releases on a branch, for example,
+#!// "all FOO releases after 4.9.1 but before 4.9.3".
+#!//
+#!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ]
 choice
 	bool "Version of @@name@@"
+    help
+      For a released version, select the version of @@name@@ to download
+      and build. For sources out of the vendor repository or from a custom
+      location, select the version that describes those custom sources.
+      Based on this version, crosstool-NG may apply some version-specific
+      quirks while building @@name@@.
+
+config @@pfx@@_VERY_NEW
+    bool "newer than anything below"
+    depends on EXPERIMENTAL
+    depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM
+#!foreach milestone
+    select @@masterpfx@@_@@ms_kcfg@@_or_later
+    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+#!end-foreach
 
 #!foreach version
 config @@pfx@@_V_@@kcfg@@
@@ -119,14 +143,39 @@ config @@pfx@@_V_@@kcfg@@
 #!if [ "@@experimental@@" = "yes" ]
 	depends on EXPERIMENTAL
 #!end-if
-#!if [ -n "@@milestone@@" ]
-	select @@masterpfx@@_@@milestone@@_or_later
+#!foreach milestone
+#!if [ "@@version_cmp_milestone@@" -ge 0 ]
+	select @@masterpfx@@_@@ms_kcfg@@_or_later
 #!end-if
+#!if [ "@@version_cmp_milestone@@" -gt 0 ]
+    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+#!end-if
+#!if [ "@@version_cmp_milestone@@" -lt 0 ]
+    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+#!end-if
+#!end-foreach
 
 #!end-foreach
+config @@pfx@@_VERY_OLD
+    bool "older than anything above"
+    depends on OBSOLETE && EXPERIMENTAL
+    depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM
+#!foreach milestone
+    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+#!end-foreach
+
 endchoice
 #!end-if
 
+#!if [ -n "@@versionlocked@@" ]
+#!foreach version
+config @@pfx@@_V_@@kcfg@@
+    def_bool y
+    depends on @@versionlocked@@_V_@@kcfg@@
+
+#!end-foreach
+#!end-if
+
 #!if [ "@@nforks@@" -ge 2 ]
 endif
 #!end-if
@@ -141,10 +190,16 @@ config @@pfx@@_VERSION
 #!end-foreach
 
 #!foreach milestone
+#!// Milestones selected by a chosen version of this package
 config @@masterpfx@@_@@ms_kcfg@@_or_later
 	bool
-#!if [ -n "@@ms_prev@@" ]
-	select @@masterpfx@@_@@ms_prev@@_or_later
-#!end-if
+
+#!// Milestone requirements selected by other packages that restrict
+#!// the choices in this package
+config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+    bool
+
+config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+    bool
 
 #!end-foreach

packages/autoconf/package.desc

@@ -1 +1,2 @@
-repository="git git://git.sv.gnu.org/autoconf"
+repository='git git://git.sv.gnu.org/autoconf'
+mirrors='$(CT_Mirrors GNU autoconf)'

packages/autoconf/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/automake/1.11.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/automake/1.11.6/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/automake/1.14/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/automake/package.desc

@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/automake.git"
+repository='git https://git.savannah.gnu.org/git/automake.git'
+mirrors='$(CT_Mirrors GNU automake)'

packages/avr-libc/1.8.0/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/avr-libc/package.desc

@@ -1 +1,2 @@
-repository="svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc"
+repository='svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc'
+mirrors='http://download.savannah.gnu.org/releases/avr-libc'

packages/binutils-linaro/2.23.2-2013.10-4/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils-linaro/2.24.0-2014.11-2/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils-linaro/2.25.0-2015.01-2/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils-linaro/package.desc

@@ -1,5 +1,5 @@
-master="binutils"
-repository="git https://git.linaro.org/toolchain/binutils-gdb.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='binutils'
+repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
+mirrors='$(CT_Mirrors Linaro binutils ${CT_BINUTILS_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'

packages/binutils/2.23.2/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils/2.24/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils/2.25.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/binutils/package.desc

@@ -1,4 +1,4 @@
-repository="git git://sourceware.org/git/binutils-gdb.git"
-download_url="TBD other mirrors https://ftp.gnu.org/gnu/binutils/binutils-${version}.${format}"
-origin="GNU"
-milestones="2.23"
+repository='git git://sourceware.org/git/binutils-gdb.git'
+mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors GCC_GNU binutils) $(CT_Mirrors sourceware)'
+origin='GNU'
+milestones='2.23'

packages/bionic/10e/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/bionic/11c/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/bionic/12b/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/bionic/13b/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/bionic/15-beta2/version.desc

@@ -1 +1 @@
-experimental="yes"
+experimental='yes'

packages/bionic/package.desc

@@ -1 +1,2 @@
 # We don't support building bionic (yet) so no official repository
+mirrors='https://dl.google.com/android/repository'

packages/cloog/0.18.0/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/cloog/0.18.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/cloog/package.desc

@@ -1,3 +1,4 @@
-name="CLooG"
-repository="git git://repo.or.cz/cloog.git"
-milestones="0.18"
+name='CLooG'
+repository='git git://repo.or.cz/cloog.git'
+mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure'
+milestones='0.18'

packages/duma/package.desc

@@ -1 +1,2 @@
-repository="cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma"
+repository='cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma'
+mirrors='http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION}'

packages/elf2flt/package.desc

@@ -1,2 +1,2 @@
-repository="git https://github.com/uclinux-dev/elf2flt.git"
-repository_cset="6d80ab6c93409e796f85da404bde84b841231531"
+repository='git https://github.com/uclinux-dev/elf2flt.git'
+repository_cset='6d80ab6c93409e796f85da404bde84b841231531'

packages/expat/2.1.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/expat/package.desc

@@ -1 +1,2 @@
-repository="git https://github.com/libexpat/libexpat.git"
+repository='git https://github.com/libexpat/libexpat.git'
+mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}'

packages/gcc-linaro/4.8-2015.06/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch

@@ -0,0 +1,28 @@
+From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
+From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 3 Sep 2016 10:57:05 +0000
+Subject: [PATCH] gcc/ 	* ubsan.c (ubsan_use_new_style_p): Fix check for empty
+ string.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Upstream-Status: Backport
+Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
+
+---
+ gcc/ubsan.c   | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+Index: gcc-6.3.0/gcc/ubsan.c
+===================================================================
+--- gcc-6.3.0.orig/gcc/ubsan.c
++++ gcc-6.3.0/gcc/ubsan.c
+@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
+ 
+   expanded_location xloc = expand_location (loc);
+   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
+-      || xloc.file == '\0' || xloc.file[0] == '\xff'
++      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
+       || xloc.file[1] == '\xff')
+     return false;
+ 

packages/gcc-linaro/package.desc

@@ -1,5 +1,5 @@
-master="gcc"
-repository="git https://git.linaro.org/toolchain/gcc.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='gcc'
+repository='git https://git.linaro.org/toolchain/gcc.git'
+mirrors='$(CT_Mirrors Linaro gcc ${CT_GCC_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'

packages/gcc/4.8.5/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gcc/package.desc

@@ -1,4 +1,4 @@
-repository="svn svn://gcc.gnu.org/svn/gcc"
-download_url="TBD other mirrors ftp://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.${format}"
-origin="GNU"
-milestones="4.8 4.9 5 6 7"
+repository='svn svn://gcc.gnu.org/svn/gcc'
+mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc gcc-${CT_GCC_VERSION})'
+origin='GNU'
+milestones='4.8 4.9 4.9.2 5 6 7'

packages/gdb-linaro/7.3-2011.12/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.4-2012.06/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.5-2012.12/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.6.1-2013.10/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.7-2014.05/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.7.1-2014.06-1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/7.8-2014.09/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb-linaro/package.desc

@@ -1,5 +1,5 @@
-master="gdb"
-repository="git https://git.linaro.org/toolchain/binutils-gdb.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='gdb'
+repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
+mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'

packages/gdb/6.8a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.0.1a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.0a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.10.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.10/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.1a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.2a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.3.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.3a/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.4.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.4/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.5.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.6.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.7.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.7/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.8.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.8/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.9.1/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/7.9/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gdb/package.desc

@@ -1,3 +1,4 @@
-origin="GNU"
-repository="git ssh://sourceware.org/git/binutils-gdb.git"
-milestones="7.0 7.2"
+origin='GNU'
+repository='git ssh://sourceware.org/git/binutils-gdb.git'
+mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb)'
+milestones='7.0 7.2'

packages/gettext/0.19.7/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/gettext/package.desc

@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/gettext.git"
+repository='git https://git.savannah.gnu.org/git/gettext.git'
+mirrors='$(CT_Mirrors GNU gettext)'

packages/glibc-linaro/2.20-2014.11/version.desc

@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'

packages/glibc-linaro/package.desc

@@ -1,4 +1,5 @@
-master="glibc"
-origin="Linaro"
-repository="git https://git.linaro.org/toolchain/glibc.git"
-experimental="yes"
+master='glibc'
+origin='Linaro'
+repository='git https://git.linaro.org/toolchain/glibc.git'
+mirrors='$(CT_Mirrors Linaro glibc ${CT_GLIBC_LINARO_VERSION})'
+experimental='yes'