[tbb-commits] [tor-browser-build/master] Bug 40222: Bump GCC to 10.3.0 for Linux

[sysrqb at torproject.org]

commit a730b8dd332eacbcdbadd41fccc0d081a8bcb0b8
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Jan 31 19:27:24 2021 +0000

    Bug 40222: Bump GCC to 10.3.0 for Linux
---
 projects/firefox/abicheck.cc | 6 +++---
 projects/gcc/config          | 4 ++--
 projects/tor/build           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc
index 53d1dcc..52e87d9 100644
--- a/projects/firefox/abicheck.cc
+++ b/projects/firefox/abicheck.cc
@@ -3,9 +3,9 @@
  * This program is useful in determining if the libstdc++.so.6 installed
  * on the system is recent enough. Specifically, this program requires
  * `GLIBCXX_3.4.28` which should be provided by libstdc++.so.6 from
- * gcc >= 9.3.0. If the program executes successfully, that means we
- * should use the system version of libstdc++.so.6 and if not, that means
- * we should use the bundled version.
+ * GCC >= 9.3.0 (we are good here as well with GCC 10.2.0). If the program
+ * executes successfully, that means we should use the system version of
+ * libstdc++.so.6 and if not, that means we should use the bundled version.
  *
  * We use std::pmr::monotonic_buffer_resource in order to require
  * GLIBCXX_3.4.28:
diff --git a/projects/gcc/config b/projects/gcc/config
index c515b19..b8ab369 100644
--- a/projects/gcc/config
+++ b/projects/gcc/config
@@ -3,7 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 # Note: When updating the gcc version, if this includes a libstdc++
 # ABI change we should also update projects/firefox/abicheck.cc to
 # require the new version.
-version: 9.3.0
+version: 10.3.0
 var:
   container:
     use_container: 1
@@ -54,4 +54,4 @@ targets:
 input_files:
   - project: container-image
   - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz'
-    sha256sum: 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1
+    sha256sum: 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
diff --git a/projects/tor/build b/projects/tor/build
index 0d81087..9c46910 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -65,7 +65,7 @@ openssldir=/var/tmp/dist/openssl/openssl
   mkdir -p $libstdc_dir
   cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 $libstdc_dir/
   [% IF c("var/asan") -%]
-    cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.5 "$distdir/Tor/"
+    cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.6 "$distdir/Tor/"
     cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.1 "$distdir/Tor/"
   [% END -%]
   chmod 700 "$distdir"/Tor/*.so*