From 98e00f8fdd92174aad58612107fd2cee06fbe036 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 11 Sep 2015 17:58:39 +0000 Subject: [PATCH] binutils: add binutils 2.25.1 This adds binutils 2.25.1 as an option to OpenWrt. Signed-off-by: Hauke Mehrtens SVN-Revision: 46874 --- toolchain/binutils/Config.in | 4 ++ toolchain/binutils/Makefile | 21 ++++++++--- .../2.25.1/300-001_ld_makefile_patch.patch | 22 +++++++++++ .../300-012_check_ldrunpath_length.patch | 20 ++++++++++ .../400-mips_no_dynamic_linking_sym.patch | 18 +++++++++ ...e-default-emulation-for-mips64-linux.patch | 37 +++++++++++++++++++ 6 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch create mode 100644 toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch create mode 100644 toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch create mode 100644 toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 8d912231f8..31b043f185 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -9,6 +9,9 @@ choice config BINUTILS_VERSION_LINARO bool "Linaro binutils 2.24" + config BINUTILS_VERSION_2_25_1 + bool "Linaro binutils 2.25.1" + endchoice config EXTRA_BINUTILS_CONFIG_OPTIONS @@ -22,4 +25,5 @@ config BINUTILS_VERSION string prompt "Binutils Version" if (TOOLCHAINOPTS && NULL) default "linaro" if BINUTILS_VERSION_LINARO + default "2.25.1" if BINUTILS_VERSION_2_25_1 default "linaro" diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 02765126e9..0028a02d68 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -10,12 +10,21 @@ PKG_NAME:=binutils PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) BIN_VERSION:=$(PKG_VERSION) -PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/ -PKG_REV:=2.24.0-2014.09 -PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz -PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353 -BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) -HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) +ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro) + PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/ + PKG_REV:=2.24.0-2014.09 + PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz + PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353 + BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) + HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) +else + PKG_SOURCE_URL:=@GNU/binutils/ + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 + + ifeq ($(PKG_VERSION),2.25.1) + PKG_MD5SUM:=ac493a78de4fee895961d025b7905be4 + endif +endif HOST_BUILD_PARALLEL:=1 diff --git a/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..c51fc003fd --- /dev/null +++ b/toolchain/binutils/patches/2.25.1/300-001_ld_makefile_patch.patch @@ -0,0 +1,22 @@ +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -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. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -388,7 +388,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. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..2e24b38cad --- /dev/null +++ b/toolchain/binutils/patches/2.25.1/300-012_check_ldrunpath_length.patch @@ -0,0 +1,20 @@ +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1198,6 +1198,8 @@ fragment <link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch new file mode 100644 index 0000000000..a63203d1cc --- /dev/null +++ b/toolchain/binutils/patches/2.25.1/400-mips_no_dynamic_linking_sym.patch @@ -0,0 +1,18 @@ +--- a/bfd/elfxx-mips.c ++++ b/bfd/elfxx-mips.c +@@ -7689,6 +7689,7 @@ _bfd_mips_elf_create_dynamic_sections (b + + name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING"; + bh = NULL; ++ if (0) { + if (!(_bfd_generic_link_add_one_symbol + (info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0, + NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh))) +@@ -7701,6 +7702,7 @@ _bfd_mips_elf_create_dynamic_sections (b + + if (! bfd_elf_link_record_dynamic_symbol (info, h)) + return FALSE; ++ } + + if (! mips_elf_hash_table (info)->use_rld_obj_head) + { diff --git a/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch new file mode 100644 index 0000000000..3343a85661 --- /dev/null +++ b/toolchain/binutils/patches/2.25.1/500-Change-default-emulation-for-mips64-linux.patch @@ -0,0 +1,37 @@ +--- a/bfd/config.bfd ++++ b/bfd/config.bfd +@@ -1062,12 +1062,12 @@ case "${targ}" in + targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec" + ;; + mips64*el-*-linux*) +- targ_defvec=mips_elf32_ntrad_le_vec +- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec" ++ targ_defvec=mips_elf64_trad_le_vec ++ targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec" + ;; + mips64*-*-linux*) +- targ_defvec=mips_elf32_ntrad_be_vec +- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec" ++ targ_defvec=mips_elf64_trad_be_vec ++ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec" + ;; + mips*el-*-linux*) + targ_defvec=mips_elf32_trad_le_vec +--- a/ld/configure.tgt ++++ b/ld/configure.tgt +@@ -476,11 +476,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip + mips*-*-vxworks*) targ_emul=elf32ebmipvxworks + targ_extra_emuls="elf32elmipvxworks" ;; + mips*-*-windiss) targ_emul=elf32mipswindiss ;; +-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32 +- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip" ++mips64*el-*-linux-*) targ_emul=elf64ltsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip" + targ_extra_libpath=$targ_extra_emuls ;; +-mips64*-*-linux-*) targ_emul=elf32btsmipn32 +- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip" ++mips64*-*-linux-*) targ_emul=elf64btsmip ++ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip" + targ_extra_libpath=$targ_extra_emuls ;; + mips*el-*-linux-*) targ_emul=elf32ltsmip + targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"