diff --git a/Config.in.legacy b/Config.in.legacy index a5f7288c4f..b851af2017 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2017.08" +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 + bool "x86 Sourcery toolchain has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench toolchain for the x86 architecture has + been removed, since it uses glibc older than 2.17 that requires + -lrt to link executables using clock_* system calls. This makes + this toolchain difficult to maintain over time. + config BR2_GCC_VERSION_4_8_X bool "gcc 4.8.x support removed" select BR2_LEGACY diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 35db582498..75229bbddf 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -36,9 +36,8 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Conf # SH4a source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in" -# x86/x86_64 (use amd64 toolchain by default for AMD64) +# x86_64 source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in" # Kept last, so it remains the non-default choice, unless there isn't # any available toolchain profile for the currently selected @@ -130,9 +129,8 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Conf # SH4a source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options" -# x86/x86_64 +# x86_64 source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options" # Custom toolchains source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in deleted file mode 100644 index bcbdd26938..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 - bool "Sourcery CodeBench x86/x86_64 2012.09" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - depends on !BR2_x86_jaguar - depends on !BR2_x86_steamroller - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Sourcery CodeBench toolchain for the x86/x86_64 - architectures, from Mentor Graphics. It uses gcc 4.7.2, - binutils 2.23.51, glibc 2.16, gdb 7.4.50 and kernel headers - 3.5.4. It has support for the following variants: - - Intel Pentium 4, glibc, 32 bits - Default for x86, nothing special to do. - - Intel Atom, glibc, 32 bits - Select an Atom core - - Intel Xeon, glibc, 64 bits - Default for x86_64, nothing special to do. - - Intel Core 2, glibc, 64 bits - Select a Core 2 core - Other architecture variants (beyond Pentium-4/Xeon) are - supported as well, but glibc is not optimised for it. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options deleted file mode 100644 index 65b62f3236..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "i686-pc-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-x86" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash deleted file mode 100644 index a003f7ab3c..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 -sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk deleted file mode 100644 index 5ee6991c0c..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-x86 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION = 2012.09-62 -TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SOURCE = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i386-linux.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_ACTUAL_SOURCE_TARBALL = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package))