binutils: update to 2.36.1

6 files changed, 13 insertions, 55 deletions

diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index e43cb2eef..bb2e091f4 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -8,34 +8,18 @@ default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX
 default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_BINUTILS_2_28 if ADK_TARGET_CPU_SH_J2
-default ADK_TOOLCHAIN_BINUTILS_2_34 if ADK_TARGET_ARCH_BFIN
-default ADK_TOOLCHAIN_BINUTILS_2_35
+default ADK_TOOLCHAIN_BINUTILS_2_36_1
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_KVX
 	depends on !ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_BINUTILS_2_35
-	bool "2.35"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_NDS32
-
-config ADK_TOOLCHAIN_BINUTILS_2_34
-	bool "2.34"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_NDS32
-
-config ADK_TOOLCHAIN_BINUTILS_2_33
-	bool "2.33.1"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_NDS32
-
-config ADK_TOOLCHAIN_BINUTILS_2_32
-	bool "2.32"
+config ADK_TOOLCHAIN_BINUTILS_2_36_1
+	bool "2.36.1"
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_KVX
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TOOLCHAIN_BINUTILS_2_28
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index ae74a6d2a..8a4e3c378 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -21,7 +21,7 @@ choice
 prompt "GNU debugger version"
 depends on ADK_TOOLCHAIN_WITH_GDB
 default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300
-default ADK_TOOLCHAIN_GDB_9_2
+default ADK_TOOLCHAIN_GDB_10_1
 
 config ADK_TOOLCHAIN_GDB_GIT
 	bool "git"
diff --git a/target/nios2/kernel/qemu-nios2 b/target/nios2/kernel/qemu-nios2
index 8de73edf3..676c10fb7 100644
--- a/target/nios2/kernel/qemu-nios2
+++ b/target/nios2/kernel/qemu-nios2
@@ -6,6 +6,6 @@ CONFIG_CUSTOM_CACHE_SETTINGS=y
 CONFIG_NIOS2_DCACHE_SIZE=0x8000
 CONFIG_NIOS2_ICACHE_SIZE=0x8000
 CONFIG_NIOS2_DTB_SOURCE_BOOL=y
-CONFIG_NIOS2_DTB_SOURCE="arch/nios2/boot/dts/10m50_devboard.dts"
+CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_NIOS2_PASS_CMDLINE=y
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 64c75e4b5..7136cf66e 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -56,6 +56,7 @@ endif
 		--disable-nls \
 		--disable-sim \
 		--disable-gdb \
+		--enable-obsolete \
 		--disable-werror \
 		--disable-install-libiberty \
 		${CONFOPTS} \
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 1033bf4f9..b29d67f4f 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -2,31 +2,10 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		binutils
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_35),y)
-PKG_VERSION:=		2.35
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_36_1),y)
+PKG_VERSION:=		2.36.1
 PKG_RELEASE:=		1
-PKG_HASH:=		1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
-PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_34),y)
-PKG_VERSION:=		2.34
-PKG_RELEASE:=		1
-PKG_HASH:=		f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
-PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_33),y)
-PKG_VERSION:=		2.33.1
-PKG_RELEASE:=		1
-PKG_HASH:=		ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
-PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_32),y)
-PKG_VERSION:=		2.32
-PKG_RELEASE:=		1
-PKG_HASH:=		0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+PKG_HASH:=		e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 endif
diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile
index 77552fe1e..70a02a24d 100644
--- a/toolchain/elf2flt/Makefile
+++ b/toolchain/elf2flt/Makefile
@@ -9,14 +9,8 @@ include $(ADK_TOPDIR)/mk/buildhlp.mk
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y)
 BINUTILS_VERSION:=	git
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_35),y)
-BINUTILS_VERSION:=	2.35
-endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_34),y)
-BINUTILS_VERSION:=	2.34
-endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_29),y)
-BINUTILS_VERSION:=	2.29.1
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_36_1),y)
+BINUTILS_VERSION:=	2.36.1
 endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_28),y)
 BINUTILS_VERSION:=	2.28