diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in | 25 | ||||
| -rw-r--r-- | toolchain/toolchain-common.in | 5 | ||||
| -rw-r--r-- | toolchain/toolchain-external/Config.in | 16 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external.hash | 4 | ||||
| -rw-r--r-- | toolchain/toolchain-external/toolchain-external.mk | 2 |
5 files changed, 19 insertions, 33 deletions
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 0c4080111a..2b0ebc170b 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -42,26 +42,6 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC http://uclibc.org -config BR2_TOOLCHAIN_BUILDROOT_EGLIBC - bool "eglibc" - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_aarch64_be || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh || BR2_sh64 || \ - BR2_sparc || BR2_x86_64 || BR2_microblaze || \ - BR2_powerpc64 - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_DEPRECATED_SINCE_2015_08 - select BR2_TOOLCHAIN_USES_GLIBC - # our eglibc.mk enables RPC support - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - This option selects eglibc as the C library for the - cross-compilation toolchain. - - http://eglibc.org - config BR2_TOOLCHAIN_BUILDROOT_GLIBC bool "glibc" depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ @@ -87,7 +67,7 @@ comment "(e)glibc only available with shared lib support" depends on BR2_STATIC_LIBS config BR2_TOOLCHAIN_BUILDROOT_MUSL - bool "musl (experimental)" + bool "musl" depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_microblaze || BR2_mips || BR2_mipsel || BR2_powerpc || \ BR2_sh || BR2_x86_64 @@ -107,9 +87,6 @@ endchoice config BR2_TOOLCHAIN_BUILDROOT_LIBC string default "uclibc" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC - # Both glibc and eglibc are handled by the package called - # 'glibc' - default "glibc" if BR2_TOOLCHAIN_BUILDROOT_EGLIBC default "glibc" if BR2_TOOLCHAIN_BUILDROOT_GLIBC default "musl" if BR2_TOOLCHAIN_BUILDROOT_MUSL diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index be02484a76..1fe28a9e55 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -241,10 +241,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 default "4.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 default "4.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 default "4.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 8a8195d57e..7aee57f8bc 100644 --- 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 diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 9be3c7a071..fe45f19f75 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -10,8 +10,8 @@ sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfi sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 # NiosII -sha256 e43899fd950e5d06e90c2eb01527c626240b6b4a603cbbeb532fad9fb8ea58c3 sourceryg++-2015.11-130-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 c412375ba3f93bafc9225de22366fa5b3f4d073ef856cf19595237ddb0815e6d sourceryg++-2015.11-130-nios2-linux-gnu.src.tar.bz2 +sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 3dc1c2685c0472059547dd7becb5dc991541b8176af39fa7aa5f601d38b9879a sourceryg++-2016.05-10-nios2-linux-gnu.src.tar.bz2 # SuperH sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802 renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 e2e58c10e52395d5d35157e35f85233f713c6f9223a652dfc56194cfd2eed004 renesas-2012.09-61-sh-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 47b951dfa7..f3443a2392 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -338,7 +338,7 @@ TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-l TOOLCHAIN_EXTERNAL_SOURCE = mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2015.11-130-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 |
