toolchain: binutils: add support for version 2.42

Release Notes:
https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00016.html

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 3ec4fe47a8f3a9512c2b3090f3b95d06b5146ea5..6ba3c5248723bda434d85fa0839bb46c9ce9e0a5 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -25,6 +25,10 @@ choice
        config BINUTILS_USE_VERSION_2_41
                bool "Binutils 2.41"
                select BINUTILS_VERSION_2_41
+
+       config BINUTILS_USE_VERSION_2_42
+               bool "Binutils 2.42"
+               select BINUTILS_VERSION_2_42
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS

diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
index acb764bb6a741b62b113881e072da6ad14dd052d..e7a5abcd7e067b7bae92246d6896d17f6ac97335 100644 (file)
--- a/toolchain/binutils/Config.version
+++ b/toolchain/binutils/Config.version
@@ -15,6 +15,9 @@ config BINUTILS_VERSION_2_40
 config BINUTILS_VERSION_2_41
        bool
 
+config BINUTILS_VERSION_2_42
+       bool
+
 config BINUTILS_VERSION
        string
        default "2.37"                  if BINUTILS_VERSION_2_37
@@ -22,3 +25,4 @@ config BINUTILS_VERSION
        default "2.39"                  if BINUTILS_VERSION_2_39
        default "2.40"                  if BINUTILS_VERSION_2_40
        default "2.41"                  if BINUTILS_VERSION_2_41
+       default "2.42"                  if BINUTILS_VERSION_2_42

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 1a7b877e6381f43a704a2b365d91d8a504361294..8635e9710ac64e4124844a4f938aec89dca32324 100644 (file)
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -36,6 +36,10 @@ ifeq ($(PKG_VERSION),2.41)
   PKG_HASH:=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
 endif
 
+ifeq ($(PKG_VERSION),2.42)
+  PKG_HASH:=f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
+endif
+
 HOST_BUILD_PARALLEL:=1
 
 PATCH_DIR:=./patches/$(PKG_VERSION)

diff --git a/toolchain/binutils/patches/2.42/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.42/300-001_ld_makefile_patch.patch
new file mode 100644 (file)
index 0000000..64dae55
--- /dev/null
+++ b/toolchain/binutils/patches/2.42/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_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)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -583,7 +583,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_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.42/400-mips_no_dynamic_linking_sym.patch b/toolchain/binutils/patches/2.42/400-mips_no_dynamic_linking_sym.patch
new file mode 100644 (file)
index 0000000..30f70c2
--- /dev/null
+++ b/toolchain/binutils/patches/2.42/400-mips_no_dynamic_linking_sym.patch
@@ -0,0 +1,18 @@
+--- a/bfd/elfxx-mips.c
++++ b/bfd/elfxx-mips.c
+@@ -8149,6 +8149,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)))
+@@ -8161,6 +8162,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.42/500-Change-default-emulation-for-mips64-linux.patch b/toolchain/binutils/patches/2.42/500-Change-default-emulation-for-mips64-linux.patch
new file mode 100644 (file)
index 0000000..df38fca
--- /dev/null
+++ b/toolchain/binutils/patches/2.42/500-Change-default-emulation-for-mips64-linux.patch
@@ -0,0 +1,48 @@
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -962,8 +962,8 @@ case "${targ}" in
+     want64=true
+     ;;
+   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*-gnuabi64)
+     targ_defvec=mips_elf64_trad_be_vec
+@@ -971,8 +971,8 @@ case "${targ}" in
+     want64=true
+     ;;
+   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
+@@ -597,8 +597,8 @@ mips64*el-*-linux-gnuabi64)
+                       targ_extra_emuls="elf64btsmip elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip"
+                       targ_extra_libpath=$targ_extra_emuls
+                       ;;
+-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-gnuabi64)
+@@ -606,8 +606,8 @@ mips64*-*-linux-gnuabi64)
+                       targ_extra_emuls="elf64ltsmip elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip"
+                       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