From e800d72e66372e26e41d933adda0db191736d524 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 11 Jan 2022 11:25:50 +0800 Subject: [PATCH] Revert "binutils: sync upstream" This reverts commit 5afa82e64f59d4102cdd302afe392e56135a4fa6. --- package/devel/binutils/Makefile | 8 ++++---- toolchain/binutils/Config.in | 2 +- toolchain/binutils/Config.version | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 522a97105..ca1099349 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils -PKG_VERSION:=2.37 -PKG_RELEASE:=2 +PKG_VERSION:=2.35.2 +PKG_RELEASE:=1 PKG_SOURCE_URL:=@GNU/binutils PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_VERSION:=$(PKG_VERSION) -PKG_HASH:=820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c +PKG_HASH:=dcd5b0416e7b0a9b24bed76cd8c6c132526805761863150a26d016415b8bdc7b -PKG_FIXUP:=patch-libtool +PKG_FIXUP:=autoreconf PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl PKG_REMOVE_FILES:=libtool.m4 PKG_INSTALL:=1 diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 493b6e4f5..4b9579379 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -2,7 +2,7 @@ choice prompt "Binutils Version" if TOOLCHAINOPTS - default BINUTILS_USE_VERSION_2_37 + default BINUTILS_USE_VERSION_2_34 help Select the version of binutils you wish to use. diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version index db727b78b..985e3b1b3 100644 --- a/toolchain/binutils/Config.version +++ b/toolchain/binutils/Config.version @@ -2,6 +2,7 @@ config BINUTILS_VERSION_2_32 bool config BINUTILS_VERSION_2_34 + default y if !TOOLCHAINOPTS bool config BINUTILS_VERSION_2_35_2 @@ -11,7 +12,6 @@ config BINUTILS_VERSION_2_36_1 bool config BINUTILS_VERSION_2_37 - default y if !TOOLCHAINOPTS bool config BINUTILS_VERSION