diff --git a/config/ui/toolchain.in b/config/ui/toolchain.in index 160edf812f..2e4df47fe2 100644 --- a/config/ui/toolchain.in +++ b/config/ui/toolchain.in @@ -697,12 +697,6 @@ choice depends on FREETZ_TARGET_BINUTILS_2_36_DEFAULT \ || ( FREETZ_TARGET_UNSUPPORTED_VERSIONS && (FREETZ_BUILD_TOOLCHAIN || FREETZ_DL_TOOLCHAIN_OVERRIDE) ) - config FREETZ_TARGET_BINUTILS_2_41 - bool "binutils-2.41" - # depends on all gcc versions - # depends on any kernel version - depends on ( FREETZ_TARGET_UNSUPPORTED_VERSIONS && (FREETZ_BUILD_TOOLCHAIN || FREETZ_DL_TOOLCHAIN_OVERRIDE) ) - config FREETZ_TARGET_BINUTILS_2_43 bool "binutils-2.43.1" # depends on all gcc versions @@ -1165,7 +1159,6 @@ config FREETZ_TARGET_BINUTILS_VERSION default "2.25.1" if FREETZ_TARGET_BINUTILS_2_25 default "2.26.1" if FREETZ_TARGET_BINUTILS_2_26 default "2.31.1" if FREETZ_TARGET_BINUTILS_2_31 - default "2.41" if FREETZ_TARGET_BINUTILS_2_41 default "2.43.1" if FREETZ_TARGET_BINUTILS_2_43 config FREETZ_TARGET_GCC_VERSION diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c7d4e4c016..0e1f89b2cf 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -50,7 +50,7 @@ Latest changes - Build system: * binutils (kernel) 2.18/2.22/2.23.2/2.24/2.25.1/2.26.1/2.31.1/2.36.1 - * binutils (target) 2.22/2.23.2/2.24/2.25.1/2.26.1/2.31.1/2.36.1/2.41/2.43.1 + * binutils (target) 2.22/2.23.2/2.24/2.25.1/2.26.1/2.31.1/2.36.1/2.43.1 * ca-bundle 2024-09-24 * gcc (kernel) 3.4.6/4.6.4/4.7.4/4.8.5/5.5.0/8.3.0/8.4.0/9.3.0/9.4.0 * gcc (target) 4.6.4/4.7.4/4.8.5/4.9.4/5.5.0/8.3.0/8.4.0/9.3.0/13.3.0/13.4.0/14.2.0 diff --git a/make/toolchain/target/binutils/binutils.mk b/make/toolchain/target/binutils/binutils.mk index df66a61f79..66d8cc7d12 100644 --- a/make/toolchain/target/binutils/binutils.mk +++ b/make/toolchain/target/binutils/binutils.mk @@ -8,7 +8,6 @@ BINUTILS_HASH_2.25.1 := b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df BINUTILS_HASH_2.26.1 := 39c346c87aa4fb14b2f786560aec1d29411b6ec34dce3fe7309fe3dd56949fd8 BINUTILS_HASH_2.31.1 := ffcc382695bf947da6135e7436b8ed52d991cf270db897190f19d6f9838564d0 BINUTILS_HASH_2.36.1 := 5b4bd2e79e30ce8db0abd76dd2c2eae14a94ce212cfc59d3c37d23e24bc6d7a3 -BINUTILS_HASH_2.41 := a4c4bec052f7b8370024e60389e194377f3f48b56618418ea51067f67aaab30b BINUTILS_HASH_2.43.1 := becaac5d295e037587b63a42fad57fe3d9d7b83f478eb24b67f9eec5d0f1872f BINUTILS_HASH:=$(BINUTILS_HASH_$(BINUTILS_VERSION)) @@ -16,11 +15,6 @@ BINUTILS_DIR:=$(TARGET_TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION) BINUTILS_MAKE_DIR:=$(MAKE_DIR)/toolchain/target/binutils BINUTILS_DIR1:=$(BINUTILS_DIR)-build - - - - - BINUTILS_EXTRA_MAKE_OPTIONS := MAKEINFO=true BINUTILS_ECHO_TYPE:=TTC diff --git a/make/toolchain/target/binutils/patches/2.41/400-uClibc_obstack_interface.freetz.patch b/make/toolchain/target/binutils/patches/2.41/400-uClibc_obstack_interface.freetz.patch deleted file mode 100644 index 42406c9bca..0000000000 --- a/make/toolchain/target/binutils/patches/2.41/400-uClibc_obstack_interface.freetz.patch +++ /dev/null @@ -1,33 +0,0 @@ -Workaround the following link problem: - tc-mips.o: In function `mips_parse_arguments': - tc-mips.c:(.text+0x9af8): undefined reference to `_obstack_free' - tc-mips.o: In function `md_assemble': - tc-mips.c:(.text+0xfb5c): undefined reference to `_obstack_free' - cond.o: In function `s_endif': - cond.c:(.text+0xcb0): undefined reference to `_obstack_free' - cond.o: In function `cond_exit_macro': - cond.c:(.text+0x120c): undefined reference to `_obstack_free' - hash.o: In function `hash_die': - hash.c:(.text+0x28c): undefined reference to `_obstack_free' - hash.o:hash.c:(.text+0x65c): more undefined references to `_obstack_free' follow - -The alternative would be to backport the following uclibc/uclibc-ng commits: - 1. http://www.uclibc-ng.org/changeset/532c68d561128b390b5436f2962c2f47aa8bc5f0/uclibc-ng - 2. http://www.uclibc-ng.org/changeset/975bca165c3e10e74c05c0384fd58f45a7025a3c/uclibc-ng - 3. http://www.uclibc-ng.org/changeset/736d9eee2731ba8c442ada629b14f4887cafaae2/uclibc-ng - 4. http://www.uclibc-ng.org/changeset/06e4fe64bbd01f16ee84da161b8e1a61e73b4cdb/uclibc-ng - ---- libiberty/obstack.c -+++ libiberty/obstack.c -@@ -47,6 +47,11 @@ - # endif - #endif - -+/* uClibc(-ng) versions prior to 1.0.14 do not provide _obstack_free symbol */ -+#if defined(__UCLIBC__) && ( (__UCLIBC_MAJOR__ == 0) || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_MINOR__ == 0 && __UCLIBC_SUBLEVEL__ < 14) ) -+# undef _OBSTACK_ELIDE_CODE -+#endif -+ - #ifndef _OBSTACK_ELIDE_CODE - /* If GCC, or if an oddball (testing?) host that #defines __alignof__, - use the already-supplied __alignof__. Otherwise, this must be Gnulib