From 5c3cb628f829c321ded658da1f0dbf74c93652a9 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Tue, 7 Jan 2014 15:03:55 +0000 Subject: [PATCH] upgrade the Linaro binutils to 2.24-2013.12 Signed-off-by: Imre Kaloz SVN-Revision: 39210 --- package/devel/binutils/Makefile | 8 ++++---- toolchain/binutils/Config.in | 2 +- toolchain/binutils/Makefile | 10 +++++----- .../patches/linaro/112-arm-uclibc-gas-needs-libm.patch | 2 +- toolchain/binutils/patches/linaro/120-sh-conf.patch | 4 ++-- toolchain/binutils/patches/linaro/200-musl.patch | 10 ---------- .../patches/linaro/300-001_ld_makefile_patch.patch | 4 ++-- .../linaro/300-012_check_ldrunpath_length.patch | 4 ++-- .../linaro/400-mips_no_dynamic_linking_sym.patch | 4 ++-- 9 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 toolchain/binutils/patches/linaro/200-musl.patch diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 9c406d9666..331578da2b 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -13,10 +13,10 @@ PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION))) PKG_RELEASE:=6 ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro) - PKG_SOURCE_URL:=https://releases.linaro.org/13.06/components/toolchain/binutils-linaro/ - PKG_REV:=2.23.2-2013.06 - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2 - BINUTILS_DIR:=$(PKG_NAME)-2.23.2 + PKG_SOURCE_URL:=https://releases.linaro.org/13.12/components/toolchain/binutils-linaro/ + PKG_REV:=2.24-2013.12 + PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz + BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) PKG_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) PKG_VERSION:=$(PKG_REV) else diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index e2d0d20be6..9ebf52ddde 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -21,7 +21,7 @@ choice config BINUTILS_VERSION_LINARO depends on !avr32 || (avr32 && BROKEN) - bool "Linaro binutils 2.23.2" + bool "Linaro binutils 2.24" endchoice diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 0eb884d1c1..466b6ac960 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -11,11 +11,11 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) BIN_VERSION:=$(PKG_VERSION) ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro) - PKG_SOURCE_URL:=https://releases.linaro.org/13.06/components/toolchain/binutils-linaro/ - PKG_REV:=2.23.2-2013.06 - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.bz2 - PKG_MD5SUM:=73ad2a91f17b7e4fd41d49db5a541d2d - BINUTILS_DIR:=$(PKG_NAME)-2.23.2 + PKG_SOURCE_URL:=https://releases.linaro.org/13.12/components/toolchain/binutils-linaro/ + PKG_REV:=2.24-2013.12 + PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz + PKG_MD5SUM:=4f0fe947895a260b8386de63b09feb18 + BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) else PKG_SOURCE_URL:=@GNU/binutils/ diff --git a/toolchain/binutils/patches/linaro/112-arm-uclibc-gas-needs-libm.patch b/toolchain/binutils/patches/linaro/112-arm-uclibc-gas-needs-libm.patch index 5d0e5ff8ef..415fe0f3f8 100644 --- a/toolchain/binutils/patches/linaro/112-arm-uclibc-gas-needs-libm.patch +++ b/toolchain/binutils/patches/linaro/112-arm-uclibc-gas-needs-libm.patch @@ -20,7 +20,7 @@ make[4]: *** [as-new] Error 1 --- a/gas/configure.tgt +++ b/gas/configure.tgt -@@ -450,6 +450,12 @@ case ${generic_target} in +@@ -468,6 +468,12 @@ case ${generic_target} in *-*-netware) fmt=elf em=netware ;; esac diff --git a/toolchain/binutils/patches/linaro/120-sh-conf.patch b/toolchain/binutils/patches/linaro/120-sh-conf.patch index ce0ec81b89..6e01d6e41d 100644 --- a/toolchain/binutils/patches/linaro/120-sh-conf.patch +++ b/toolchain/binutils/patches/linaro/120-sh-conf.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -3595,7 +3595,7 @@ case "${target}" in +@@ -3793,7 +3793,7 @@ case "${target}" in mips*-*-*) noconfigdirs="$noconfigdirs gprof" ;; @@ -11,7 +11,7 @@ ;; --- a/configure.ac +++ b/configure.ac -@@ -1021,7 +1021,7 @@ case "${target}" in +@@ -1129,7 +1129,7 @@ case "${target}" in mips*-*-*) noconfigdirs="$noconfigdirs gprof" ;; diff --git a/toolchain/binutils/patches/linaro/200-musl.patch b/toolchain/binutils/patches/linaro/200-musl.patch deleted file mode 100644 index 40fe76d34d..0000000000 --- a/toolchain/binutils/patches/linaro/200-musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/config.sub -+++ b/config.sub -@@ -125,6 +125,7 @@ esac - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ diff --git a/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch index 323655a01c..0efcd18383 100644 --- a/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch +++ b/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch @@ -1,6 +1,6 @@ --- a/ld/Makefile.am +++ b/ld/Makefile.am -@@ -37,7 +37,7 @@ endif +@@ -54,7 +54,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. @@ -11,7 +11,7 @@ EMULATION_OFILES = @EMULATION_OFILES@ --- a/ld/Makefile.in +++ b/ld/Makefile.in -@@ -367,7 +367,7 @@ AM_CFLAGS = $(WARN_CFLAGS) +@@ -386,7 +386,7 @@ AM_CFLAGS = $(WARN_CFLAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers. diff --git a/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch index 61324d1119..37752b75ac 100644 --- a/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch +++ b/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch @@ -1,6 +1,6 @@ --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em -@@ -1278,6 +1278,8 @@ fragment <collect, &bh))) -@@ -7343,6 +7344,7 @@ _bfd_mips_elf_create_dynamic_sections (b +@@ -7462,6 +7463,7 @@ _bfd_mips_elf_create_dynamic_sections (b if (! bfd_elf_link_record_dynamic_symbol (info, h)) return FALSE; -- 2.30.2