Merge branch 'next'

[coffee/buildroot.git] / toolchain / toolchain-external / Config.in

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 8a8195d57e7a7120383cb2ea4c17e5e027c1d298..7aee57f8bcd9a7ec88307ec8d7254d95e4e0b989 100644 (file)
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -411,7 +411,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS
              Disable 'Use soft-float'
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
-       bool "Sourcery CodeBench Nios-II 2015.11"
+       bool "Sourcery CodeBench Nios-II 2016.05"
        depends on BR2_nios2
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on !BR2_STATIC_LIBS
@@ -420,13 +420,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
        select BR2_HOSTARCH_NEEDS_IA32_LIBS
-       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
        select BR2_TOOLCHAIN_GCC_AT_LEAST_5
        select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.25.1
        help
          Sourcery CodeBench toolchain for the Nios-II architecture,
-         from Mentor Graphics. It uses gcc 5.2, binutils 2.25.51,
-         glibc 2.22, gdb 7.10.50 and kernel headers 4.2.
+         from Mentor Graphics. It uses gcc 5.3, binutils 2.25.51,
+         glibc 2.23, gdb 7.10.50 and kernel headers 4.4.
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
        bool "Sourcery CodeBench SH 2012.09"
@@ -577,7 +577,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64
          3.16.2.
 
 config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
-       bool "Musl 1.1.12 toolchain (experimental)"
+       bool "Musl 1.1.12 toolchain"
        depends on (BR2_arm && BR2_ARM_EABI) || \
                (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4) || \
                (BR2_armeb && BR2_ARM_EABI) || BR2_i386 || \
@@ -785,6 +785,10 @@ choice
            m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
            p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_6
+       bool "4.6.x"
+       select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_5
        bool "4.5.x"
        select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
@@ -926,7 +930,7 @@ comment "(e)glibc only available with shared lib support"
        depends on BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL
-       bool "musl (experimental)"
+       bool "musl"
        select BR2_TOOLCHAIN_EXTERNAL_MUSL
        help
          Select this option if your external toolchain uses the