From ecc091b0f69af349efe507052fcf826826e12d75 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 19 Oct 2016 12:22:45 +0200 Subject: [PATCH] binutils: remove old unused versions Signed-off-by: Felix Fietkau --- toolchain/binutils/Config.in | 10 ----- toolchain/binutils/Config.version | 8 ---- .../2.26.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 ------------------- .../linaro/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 ------------------- 10 files changed, 212 deletions(-) delete mode 100644 toolchain/binutils/patches/2.26.1/300-001_ld_makefile_patch.patch delete mode 100644 toolchain/binutils/patches/2.26.1/300-012_check_ldrunpath_length.patch delete mode 100644 toolchain/binutils/patches/2.26.1/400-mips_no_dynamic_linking_sym.patch delete mode 100644 toolchain/binutils/patches/2.26.1/500-Change-default-emulation-for-mips64-linux.patch delete mode 100644 toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch delete mode 100644 toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch delete mode 100644 toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch delete mode 100644 toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index cb546846f8cb..9e535c4b9923 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -7,21 +7,11 @@ choice help Select the version of binutils you wish to use. - config BINUTILS_USE_VERSION_2_24_LINARO - depends on !arc - bool "Linaro binutils 2.24" - select BINUTILS_VERSION_2_24_LINARO - config BINUTILS_USE_VERSION_2_25_1 depends on !arc bool "Binutils 2.25.1" select BINUTILS_VERSION_2_25_1 - config BINUTILS_USE_VERSION_2_26_1 - depends on !arc - bool "Binutils 2.26.1" - select BINUTILS_VERSION_2_26_1 - config BINUTILS_USE_VERSION_2_27 depends on !arc bool "Binutils 2.27" diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version index fbbd49f12373..5ef8df6085f9 100644 --- a/toolchain/binutils/Config.version +++ b/toolchain/binutils/Config.version @@ -1,13 +1,7 @@ -config BINUTILS_VERSION_2_24_LINARO - bool - config BINUTILS_VERSION_2_25_1 default y if (!TOOLCHAINOPTS && !arc) bool -config BINUTILS_VERSION_2_26_1 - bool - config BINUTILS_VERSION_2_27 bool @@ -17,9 +11,7 @@ config BINUTILS_VERSION_2_26_ARC config BINUTILS_VERSION string - default "2.24-linaro" if BINUTILS_VERSION_2_24_LINARO default "2.25.1" if BINUTILS_VERSION_2_25_1 - default "2.26.1" if BINUTILS_VERSION_2_26_1 default "2.27" if BINUTILS_VERSION_2_27 default "arc-2016.03" if BINUTILS_VERSION_2_26_ARC diff --git a/toolchain/binutils/patches/2.26.1/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.26.1/300-001_ld_makefile_patch.patch deleted file mode 100644 index c51fc003fd7e..000000000000 --- a/toolchain/binutils/patches/2.26.1/300-001_ld_makefile_patch.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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.26.1/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.26.1/300-012_check_ldrunpath_length.patch deleted file mode 100644 index 2e24b38cad4d..000000000000 --- a/toolchain/binutils/patches/2.26.1/300-012_check_ldrunpath_length.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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.26.1/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/2.26.1/400-mips_no_dynamic_linking_sym.patch deleted file mode 100644 index a63203d1cccd..000000000000 --- a/toolchain/binutils/patches/2.26.1/400-mips_no_dynamic_linking_sym.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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.26.1/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.26.1/500-Change-default-emulation-for-mips64-linux.patch deleted file mode 100644 index 3343a8566195..000000000000 --- a/toolchain/binutils/patches/2.26.1/500-Change-default-emulation-for-mips64-linux.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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" diff --git a/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch deleted file mode 100644 index 0efcd1838394..000000000000 --- a/toolchain/binutils/patches/linaro/300-001_ld_makefile_patch.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 -@@ -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. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch deleted file mode 100644 index 37752b75ac22..000000000000 --- a/toolchain/binutils/patches/linaro/300-012_check_ldrunpath_length.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1267,6 +1267,8 @@ fragment <link_next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch deleted file mode 100644 index 251134fb9348..000000000000 --- a/toolchain/binutils/patches/linaro/400-mips_no_dynamic_linking_sym.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/bfd/elfxx-mips.c -+++ b/bfd/elfxx-mips.c -@@ -7450,6 +7450,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))) -@@ -7462,6 +7463,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/linaro/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch deleted file mode 100644 index cd036beca937..000000000000 --- a/toolchain/binutils/patches/linaro/500-Change-default-emulation-for-mips64-linux.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/bfd/config.bfd -+++ b/bfd/config.bfd -@@ -1053,12 +1053,12 @@ case "${targ}" in - targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" - ;; - mips64*el-*-linux*) -- targ_defvec=bfd_elf32_ntradlittlemips_vec -- targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec" -+ targ_defvec=bfd_elf64_tradlittlemips_vec -+ targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec" - ;; - mips64*-*-linux*) -- targ_defvec=bfd_elf32_ntradbigmips_vec -- targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec" -+ targ_defvec=bfd_elf64_tradbigmips_vec -+ targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradlittlemips_vec" - ;; - mips*el-*-linux*) - targ_defvec=bfd_elf32_tradlittlemips_vec ---- a/ld/configure.tgt -+++ b/ld/configure.tgt -@@ -472,11 +472,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" -- 2.30.2