diff mbox series

toolchain/binutils: add binutils 2.35

Message ID 20200825035505.50061-1-dengqf6@mail2.sysu.edu.cn
State Accepted
Headers show
Series toolchain/binutils: add binutils 2.35 | expand

Commit Message

DENG Qingfang Aug. 25, 2020, 3:55 a.m. UTC 
Add binutils version 2.35

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
---
 toolchain/binutils/Config.in                  |  4 ++
 toolchain/binutils/Config.version             |  4 ++
 toolchain/binutils/Makefile                   |  4 ++
 .../2.35/300-001_ld_makefile_patch.patch      | 22 +++++++++++
 .../400-mips_no_dynamic_linking_sym.patch     | 18 +++++++++
 ...e-default-emulation-for-mips64-linux.patch | 38 +++++++++++++++++++
 6 files changed, 90 insertions(+)
 create mode 100644 toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch
 create mode 100644 toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch
 create mode 100644 toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch
diff mbox series

Patch

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 9d77137f4b..2303888f12 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -13,6 +13,10 @@  choice
 	config BINUTILS_USE_VERSION_2_34
 		bool "Binutils 2.34"
 		select BINUTILS_VERSION_2_34
+
+	config BINUTILS_USE_VERSION_2_35
+		bool "Binutils 2.35"
+		select BINUTILS_VERSION_2_35
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
index 5350b546a6..9d43675f1a 100644
--- a/toolchain/binutils/Config.version
+++ b/toolchain/binutils/Config.version
@@ -5,7 +5,11 @@  config BINUTILS_VERSION_2_34
 	default y if !TOOLCHAINOPTS
 	bool
 
+config BINUTILS_VERSION_2_35
+	bool
+
 config BINUTILS_VERSION
 	string
 	default "2.32"			if BINUTILS_VERSION_2_32
 	default "2.34"			if BINUTILS_VERSION_2_34
+	default "2.35"			if BINUTILS_VERSION_2_35
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index b5e121a442..204ff3ffff 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -23,6 +23,10 @@  ifeq ($(PKG_VERSION),2.34)
   PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
 endif
 
+ifeq ($(PKG_VERSION),2.35)
+  PKG_HASH:=1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85
+endif
+
 HOST_BUILD_PARALLEL:=1
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
diff --git a/toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000000..21b2d1c280
--- /dev/null
+++ b/toolchain/binutils/patches/2.35/300-001_ld_makefile_patch.patch
@@ -0,0 +1,22 @@ 
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # 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
+@@ -555,7 +555,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # 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.35/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch
new file mode 100644
index 0000000000..9dfc01e53d
--- /dev/null
+++ b/toolchain/binutils/patches/2.35/400-mips_no_dynamic_linking_sym.patch
@@ -0,0 +1,18 @@ 
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -8075,6 +8075,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)))
+@@ -8087,6 +8088,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.35/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch
new file mode 100644
index 0000000000..5de5484fe4
--- /dev/null
+++ b/toolchain/binutils/patches/2.35/500-Change-default-emulation-for-mips64-linux.patch
@@ -0,0 +1,38 @@ 
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -894,12 +894,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
+@@ -531,12 +531,12 @@ mips*-*-vxworks*)	targ_emul=elf32ebmipvx
+ 			;;
+ 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