[tbb-commits] [tor-browser-build/master] Bug 34360: Bump binutils to 2.35.1

[sysrqb at torproject.org]

commit 815db29612e3db0b901290690d1e817ad9f8f487
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Oct 6 05:25:44 2020 +0000

    Bug 34360: Bump binutils to 2.35.1
    
    We can drop our Windows patches now as the underlying bug
    (https://sourceware.org/bugzilla/show_bug.cgi?id=17321) got fixed
    in binutils 2.34.
---
 projects/binutils/build  | 8 --------
 projects/binutils/config | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/projects/binutils/build b/projects/binutils/build
index 9161192..f1cf0b9 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -11,14 +11,6 @@ distdir=/var/tmp/dist/binutils
 [% END %]
 tar xf [% project %]-[% c("version") %].tar.xz
 cd [% project %]-[% c("version") %]
-[% IF c('var/windows') -%]
-  # Needed for the hardening... The upstream ticket is:
-  # https://sourceware.org/bugzilla/show_bug.cgi?id=17321
-  patch -p1 < ../enable-reloc-section-ld.patch
-[% END -%]
-[% IF c('var/windows-x86_64') -%]
-  patch -p1 < ../64bit-fixups.patch
-[% END -%]
 ./configure --prefix=$distdir [% c('var/configure_opt') %]
 make -j[% c("buildconf/num_procs") %]
 make install
diff --git a/projects/binutils/config b/projects/binutils/config
index 2367280..48065e1 100644
--- a/projects/binutils/config
+++ b/projects/binutils/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.31.1
+version: 2.35.1
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 var:
   configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins'
@@ -17,7 +17,3 @@ input_files:
     file_gpg_id: 1
     gpg_keyring: binutils.gpg
   - project: container-image
-  - filename: enable-reloc-section-ld.patch
-    enable: '[% c("var/windows") %]'
-  - filename: 64bit-fixups.patch
-    enable: '[% c("var/windows-x86_64") %]'