diff --git a/main/gcc/0001-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
index 34397aef53ac62578b0662c754612c0f6709e1a4..50d489dffe7b08478acb3c5acb9d7f2635086541 100644
--- a/main/gcc/0001-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
@@ -1,4 +1,4 @@
-From 00951a574e9698d8549cc5ea1793059849cab47f Mon Sep 17 00:00:00 2001
+From 0f6c64b962bb3bf75f15aec350a9d6f8997fa814 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH] posix_memalign
@@ -38,5 +38,5 @@ index 87344d9383f..ece428df487 100644
    else
      return NULL;
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0002-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
index 329cfda1e117ca7ac65c72927e48166cc9a6cbb5..44a79d25b5740a0b645cf52614180c4387f9da7a 100644
--- a/main/gcc/0002-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -1,4 +1,4 @@
-From 0cd08ecfaf79062115dd12744068970502b99c01 Mon Sep 17 00:00:00 2001
+From 2f5ca6e3850401c628c5cc18cd606134e8b29113 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 Mar 2013 08:59:00 +0400
 Subject: [PATCH] gcc: poison-system-directories
@@ -199,5 +199,5 @@ index 8a2bda00f80..9098ab044ab 100644
  
  /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
index d5bd8cac3c9279a44477dcc2db37d28a2db05713..334d17e7ee4f0b88d04e69706cc2131d97d693f8 100644
--- a/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@@ -1,4 +1,4 @@
-From f0338445838d12a82c803c1579653332e2710157 Mon Sep 17 00:00:00 2001
+From ef512b8fcf9c7628267ff2dbb127aa094f6754f3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
@@ -35,5 +35,5 @@ index b2200c5185a..625c9ab7902 100644
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
      %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
index a9fcf0383f4ad3d51236b64be602948b358a7fff..4b87403e93c1741af7d49c6f8b1d1e4478b0a192 100644
--- a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -1,4 +1,4 @@
-From 6aa52d7bf25389177c389ea77eb477e7952d1154 Mon Sep 17 00:00:00 2001
+From 3c848f2fbde81db336ec97d9be7a5a4a05015eef Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
@@ -42,5 +42,5 @@ index 17d371ef432..fe793ac08db 100644
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
index ac31d323b1091bef0df4374f2f50cee0e7fd4901..db843a44925f20be5fb8593717a77ac6d2d98083 100644
--- a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -1,4 +1,4 @@
-From 7b624ee24d9299889c35c84303811012f8b8f1d2 Mon Sep 17 00:00:00 2001
+From 3a2f4efa70110f6d11fd4c6a8e11559c6ef720f1 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -265,5 +265,5 @@ index 625c9ab7902..7aec9d3a016 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
index 39c1b414079739210cc92a2ecd84af9df572a679..aca0075a912723e7c71ff6cf2118a0cb3d334130 100644
--- a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -1,4 +1,4 @@
-From 7eed1ed7399593864a097360f778e2409deb663c Mon Sep 17 00:00:00 2001
+From 44b1a01cbe3932122112f38e06a21b1c9efad568 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
@@ -30,5 +30,5 @@ index c49da99d395..93f25319005 100644
  
  Wformat-overflow=
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
index 9fd6afbb2a2d2ae6dd9d1519af01b149c59f514a..515d5e0bad4274902789bc9ccc0c07e9ebd9c016 100644
--- a/main/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -1,4 +1,4 @@
-From 63c5bf27194fbc27c6630f325b5d976aad87c5d5 Mon Sep 17 00:00:00 2001
+From 5679adc04a200e3a1a8dd77466eb79d03da8bf8a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH] Enable -Wtrampolines by default.
@@ -21,5 +21,5 @@ index ca942863064..0a0ab6195ee 100644
  
  Wtype-limits
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
index 68395ff9c4e5057fdf996f00123ff5bf45306ce2..9530fae51ce0abb91a5d40b486893ec34cca7e7e 100644
--- a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -1,4 +1,4 @@
-From c28375576bd7ab89389c9208447a490596aa759f Mon Sep 17 00:00:00 2001
+From 0bff64690e937297abc75eee5a2916fdd314b054 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
@@ -49,5 +49,5 @@ index 4aec480798b..eaecfab37ad 100644
  
  -param=stack-clash-protection-guard-size=
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
index 40ab0bff34a23863af3508306aa90ef3ebc48264..c4cd1fe2c54ad0866d77967f0bb24e31dac5c0b9 100644
--- a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -1,4 +1,4 @@
-From 85baea39858509dacfc235396f6fbd79ac23d50d Mon Sep 17 00:00:00 2001
+From 27863679bde671cdd354cba398ef71a956873e6a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc
@@ -50,5 +50,5 @@ index a0f84b0cfa0..ab24a47a2fd 100644
  
  all-local: all-local-$(USE_NLS)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
index 30e18723468f217d62e9b69ba510ac70e0cb7ce2..4fbd367b8e6dbf328bfa62682a8431785f1a6439 100644
--- a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -1,4 +1,4 @@
-From fb7d03c7ea97fc785327fd00b302c7ac17779837 Mon Sep 17 00:00:00 2001
+From 953779008f2caa78c55f80c2d6096bf627080016 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.
@@ -24,5 +24,5 @@ index 141cb886a85..fa0e78eb62f 100644
  /* Like asprintf but allocates memory without fail. This works like
     xmalloc.  */
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
index 3d2c5d1a018436576635be4345435d6122aef926..0e8f83fe9eef9b0cf94c780275e1aaa844802239 100644
--- a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -1,4 +1,4 @@
-From 07467a2a24bd15a6a28154a33441adc1291789d6 Mon Sep 17 00:00:00 2001
+From b43185f44ed438267db101fbe41361001c4e8a94 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process
@@ -20,5 +20,5 @@ index d6b302e02fd..fd39928546f 100644
  	else true; fi
  
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0012-libitm-disable-FORTIFY.patch b/main/gcc/0012-libitm-disable-FORTIFY.patch
index b5669fbeaba95823074103fcc31db75686ab3b93..0f262f22a6f1694f585c44f341b513d6234b9a00 100644
--- a/main/gcc/0012-libitm-disable-FORTIFY.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
@@ -1,4 +1,4 @@
-From 07517ed455bf3f03b1be7a5c72d3705b22780a15 Mon Sep 17 00:00:00 2001
+From 10f38bef9af2e3d6a32253ca18d5ae0123e25e1b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:36 +0000
 Subject: [PATCH] libitm: disable FORTIFY
@@ -29,5 +29,5 @@ index d1beb5c9ec8..c2b50b95c01 100644
  # work out any special compilation flags as necessary.
  case "${target_cpu}" in
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0013-libgcc_s.patch b/main/gcc/0013-libgcc_s.patch
index 70cbbabaf68dd371e93162cf937dd528e22fe1ad..55692211b0f95fdfdcc3354337b2022c9a86e9fc 100644
--- a/main/gcc/0013-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
@@ -1,4 +1,4 @@
-From b74afde10094923279a408ff56ea99cff6c259ae Mon Sep 17 00:00:00 2001
+From 3614b3586d4a0f75e454943895977a9df1b734d5 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s
@@ -53,5 +53,5 @@ index 8506a635790..564296f788e 100644
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
  CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0014-nopie.patch b/main/gcc/0014-nopie.patch
index f4b0b4e31bc283630837cdf0ef3a2f24da0a1fd1..1ca5745697bf27a2ca251a5203480fb4c188b50a 100644
--- a/main/gcc/0014-nopie.patch
+++ b/main/gcc/0014-nopie.patch
@@ -1,4 +1,4 @@
-From e73096ae33c1ebf2833deab647ca825229c533f1 Mon Sep 17 00:00:00 2001
+From 8e58f9aa5b86dc92e5a1fa71e40e499739473894 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie
@@ -71,5 +71,5 @@ index bf64ffbe46f..9c2571de709 100644
  AC_SUBST([NO_PIE_FLAG])
  
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
index 064cb18373f7432ea869c5f4c8ecdfcebf59947f..b36fa1ea2013f65425875a13d65c5de5eb9d7c4f 100644
--- a/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
@@ -1,4 +1,4 @@
-From d56bf713ed0d248fccb445ac475ad69d9430bb96 Mon Sep 17 00:00:00 2001
+From c5ee6bb497f640877be668428292487eb026d79e Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:09 +0000
 Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
@@ -21,5 +21,5 @@ index 721ff00ea43..22a699c6340 100644
     with both write and execute permission.  Code compiled when this
     option is defined will attempt to map such pages once, but if it
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0016-dlang-update-zlib-binding.patch b/main/gcc/0016-dlang-update-zlib-binding.patch
index 4260fce6f492cd7a59adb3e0358bb08c87cb2f84..8a99d5c5482d42753b18e5e0e082cd6ecc385e94 100644
--- a/main/gcc/0016-dlang-update-zlib-binding.patch
+++ b/main/gcc/0016-dlang-update-zlib-binding.patch
@@ -1,4 +1,4 @@
-From 6175b540b25a9d899772a7354a6ac2ae77c311ae Mon Sep 17 00:00:00 2001
+From b2e1bf216169f470ced86f1f3e95c89debf606cd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:57:51 +0000
 Subject: [PATCH] dlang: update zlib binding
@@ -421,5 +421,5 @@ index e6cce240fd5..bd2fe37ebec 100644
  }
  
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
index 4621799981b0db9544ab1aa527a38cd8d3274dff..b10008fae7ec8eb4e632396459292629c7945668 100644
--- a/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/main/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@@ -1,4 +1,4 @@
-From 578f3d719c1154a38a5cf84217e3cb124da45ad8 Mon Sep 17 00:00:00 2001
+From 76c7eb27b9dfe96f2f1db4fa6f29ce28715ad2a4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:58:22 +0000
 Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
@@ -47,5 +47,5 @@ index 9febcff849b..cb34e2108bd 100644
          static assert(0, "Platform not supported");
  
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0018-ada-fix-shared-linking.patch b/main/gcc/0018-ada-fix-shared-linking.patch
index cac5918502be09f9f368a66182aca7b11eadd141..83cd1d573ffc5c44586155179f98ac58db48bc5e 100644
--- a/main/gcc/0018-ada-fix-shared-linking.patch
+++ b/main/gcc/0018-ada-fix-shared-linking.patch
@@ -1,4 +1,4 @@
-From b3bcc4fc43170f9914772c543778560c5e473fae Mon Sep 17 00:00:00 2001
+From 95fee2cfb1a6a32b7e671861b58ee93978ba16b8 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking
@@ -38,5 +38,5 @@ index 02c413a412f..f0e52a87d6e 100644
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
index 11aec7c3697f6c26aa1c9ae3eb2774d291e2bb32..34c2da12d710290ec447faa983c565b0be1b3cd7 100644
--- a/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/main/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -1,4 +1,4 @@
-From e85513f5bb1884b60d0e261e23366c3291b50d67 Mon Sep 17 00:00:00 2001
+From aa0311c59892d7fbc4ffa9e2f0520391521cc4dd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
@@ -20,5 +20,5 @@ index 36e369df6e7..63627db68cf 100644
  
  # This is the list of directories to built for the host system.
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0020-add-fortify-headers-paths.patch b/main/gcc/0020-add-fortify-headers-paths.patch
index 1954992c355793b0b1b6ab65b0a18b113c52a930..f4454017405d243c3b371e6ede4866a7f2d6532d 100644
--- a/main/gcc/0020-add-fortify-headers-paths.patch
+++ b/main/gcc/0020-add-fortify-headers-paths.patch
@@ -1,4 +1,4 @@
-From ba67e2205fb47afeb91c7c2ee575e426c0629845 Mon Sep 17 00:00:00 2001
+From 39e86416709d3d34f46da7cd7b8a3e5a8f0ff7cd Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH] add fortify-headers paths
@@ -21,5 +21,5 @@ index 95654bcdb5a..d88df8f154a 100644
      { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
  #else
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
index c27639489f72ae3cd6d37bfcdda63dc0338e27e1..073d56f5ebc1d1e2fc16d88a4414a8645459d47b 100644
--- a/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/main/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -1,4 +1,4 @@
-From 76a7d4998303fe4229c814ea87621af94cb26f08 Mon Sep 17 00:00:00 2001
+From c6b54651688cf062ae48ca3402d6d2e08b70ceed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
 Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
@@ -27,5 +27,5 @@ index daeb4d0c8ea..6920bec0fa0 100644
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
  		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
index a94f460c98d1b06e16f15a9bda63c165b234c1b8..684041c55d0826cc7bf1e293d529c5a6e6844876 100644
--- a/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/main/gcc/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -1,4 +1,4 @@
-From 81735c7800b3369361c40103d6d479239fa779d7 Mon Sep 17 00:00:00 2001
+From 4841bee243517cd52504f97ea934f44bc0c1fd5c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
@@ -65,5 +65,5 @@ index 6920bec0fa0..40e07354b3d 100644
  #else
  #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0023-Pure-64-bit-MIPS.patch b/main/gcc/0023-Pure-64-bit-MIPS.patch
index 0b5251750aec708d348c6d1ed19cbc1408eb3d44..c8f9c98afcec0f9a336978b656ddc51eb66c1093 100644
--- a/main/gcc/0023-Pure-64-bit-MIPS.patch
+++ b/main/gcc/0023-Pure-64-bit-MIPS.patch
@@ -1,4 +1,4 @@
-From bd3e178619a7d45b2b22141a2b83f67bc27b229a Mon Sep 17 00:00:00 2001
+From 720c0d7094d27b6cbfe9669c4f65e2021debcb07 Mon Sep 17 00:00:00 2001
 From: Nils Andreas Svee <me@lochnair.net>
 Date: Thu, 21 Dec 2017 03:14:33 +0100
 Subject: [PATCH] Pure 64-bit MIPS
@@ -43,5 +43,5 @@ index ceb58d3b5f3..8116e23ebba 100644
 +        ../lib32 \
 +        ../lib
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
index fa29a93336c20a57b9f89ae8ff02330dd6612459..eb592dc90a9af2677d4055320f75162111f055d0 100644
--- a/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/main/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch
@@ -1,4 +1,4 @@
-From d5e2025be98fd345549d41067eac3fd3fe201a4e Mon Sep 17 00:00:00 2001
+From c60bb23972769f687dcac689ddf00f88e46b8bb7 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:04:40 +0000
 Subject: [PATCH] use pure 64-bit configuration where appropriate
@@ -117,5 +117,5 @@ index cc6ab367072..7f498ee1cdc 100644
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0025-always-build-libgcc_eh.a.patch b/main/gcc/0025-always-build-libgcc_eh.a.patch
index 125deef925922ca5d71b5016bbc1af5d1c93b8bf..65324abd5f77a7bf2ef9eda3ce74cdf7f6fa88ad 100644
--- a/main/gcc/0025-always-build-libgcc_eh.a.patch
+++ b/main/gcc/0025-always-build-libgcc_eh.a.patch
@@ -1,4 +1,4 @@
-From 6a51ad76380daed31a4eadcee844647452ce6dfd Mon Sep 17 00:00:00 2001
+From 00917df4274ea2fb33b08c963a97cf1b28f59dd3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
 Subject: [PATCH] always build libgcc_eh.a
@@ -47,5 +47,5 @@ index 851e7657d07..99ec513a1a6 100644
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
index 2150473d3a946a221c133fd5ff4e88d4a37d923e..fa1a70cc81f250a7801290cc51ee8096c1f808d5 100644
--- a/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/main/gcc/0026-ada-libgnarl-compatibility-for-musl.patch
@@ -1,4 +1,4 @@
-From 4ce9b92262575e2484836fb9bffca08be99b9a4b Mon Sep 17 00:00:00 2001
+From 03cdaf39fa80b75c731b9d226c52a7ae04707d46 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:06:30 +0000
 Subject: [PATCH] ada: libgnarl compatibility for musl
@@ -131,5 +131,5 @@ index c45559e5ba0..0b0f173e7d4 100644
  
              pragma Assert (Result in 0 | ENOMEM);
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0027-ada-musl-support-fixes.patch b/main/gcc/0027-ada-musl-support-fixes.patch
index e213959fe1871cef5a489fdc1f338adf5cf659fd..0f4ef64922699f7bdaedecdf29266d28592bd070 100644
--- a/main/gcc/0027-ada-musl-support-fixes.patch
+++ b/main/gcc/0027-ada-musl-support-fixes.patch
@@ -1,4 +1,4 @@
-From 61c266f5703b9032fc2afaa98756f89cfe62d897 Mon Sep 17 00:00:00 2001
+From 21692d89e7876dcaecea3e3c961c6504be4a83e9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:07:48 +0000
 Subject: [PATCH] ada: musl support fixes
@@ -219,5 +219,5 @@ index af4417fab90..bab6bf3ca87 100644
    status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
  #elif defined (USE_CLONE_DEVICE)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
index 5752caa93d1b04ac6263d6b67026d596624b0466..2932ce7cbbfc509f9cf64a79a4722f48ce5cbebf 100644
--- a/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ b/main/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
@@ -1,4 +1,4 @@
-From e4d804bdeb899b4a1d6539a3ad1404ad417f6abc Mon Sep 17 00:00:00 2001
+From 1852ae06e733180f090b58c267bde8fb9501a41e Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:58:08 +0200
 Subject: [PATCH] gcc-go: Use _off_t type instead of _loff_t
@@ -44,5 +44,5 @@ index 88286c07b6e..f8f5cfb5011 100644
  	}
  	n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch b/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
index 2a7181fd675dd9edec9b113e7b0bc00c90946d13..5f2cb2d712fba8ca084871f98510332ce5bf3df0 100644
--- a/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ b/main/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch
@@ -1,4 +1,4 @@
-From e04850ade73b4e9de9e95438f80bb4c0325168d8 Mon Sep 17 00:00:00 2001
+From 40322de36043aaa3cbb98d7f01037f53fc1b5a98 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:58:21 +0200
 Subject: [PATCH] gcc-go: Don't include sys/user.h
@@ -26,5 +26,5 @@ index 0692fd41eb7..c8d987358d9 100644
  #include <sys/utsname.h>
  #endif
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
index 3308afa36a981df7e097bd16d804d52918a03c4c..37fa5225fe53cc676c602d980a87d633cf9f1783 100644
--- a/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/main/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
@@ -1,4 +1,4 @@
-From dee0f4faec19854beee5e258e91e40544fead83d Mon Sep 17 00:00:00 2001
+From f1503cf97b5a5c6f9466145f5eb1ed3b5f200119 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:59:22 +0200
 Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64
@@ -25,5 +25,5 @@ index b429fdb2403..fd1c885f043 100644
  	ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar;
  #elif defined(__aarch64__) && defined(__linux__)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
index 8531ba0f19bef61e5b0fd56b9ebedc39e973b722..dca704348bccf0208119cb6a1b184961eb15e595 100644
--- a/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/main/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@@ -1,4 +1,4 @@
-From 7c91fa8d1061a7dfe29081449cab03b8a3eae27f Mon Sep 17 00:00:00 2001
+From fc950e32b9ebc2bae09604ebe630df6df454151d Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 17:59:45 +0200
 Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
@@ -39,5 +39,5 @@ index 11e4ec436bd..fe866eacb27 100644
  
  if test "${GOOS}" = "aix"; then
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
index 5c1892cf763a30428fda775a27cfb5dbb8fff4ae..918d6b074482d25fd907e03b64119c42e98423c7 100644
--- a/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/main/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@@ -1,4 +1,4 @@
-From 2b990c08be4548705261e067233f798520a6ace0 Mon Sep 17 00:00:00 2001
+From 3be2284d92c560204e9eddb20db56d57fe584360 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:01:03 +0200
 Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
@@ -34,5 +34,5 @@ index ba38ebaa9ab..3c9e5ce9461 100644
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch b/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
index 485a41825d6dc06b3107a5d25eee71e721d14060..a21113b5470fcd6f52dd2094054feb10a26202a4 100644
--- a/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+++ b/main/gcc/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
@@ -1,4 +1,4 @@
-From d42dbc871f149f658b6c3379bbc531efe427253b Mon Sep 17 00:00:00 2001
+From a2b54c20297bb92212bf86b492e9a62d9f23e0b0 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:02:28 +0200
 Subject: [PATCH] gcc-go: Fix st_{a,m,c}tim fields in generated sysinfo.go
@@ -33,5 +33,5 @@ index bd2ba32cba1..972e2c379bc 100755
           -e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
           -e 's/\([^a-zA-Z0-9_]\)_st_timespec_t\([^a-zA-Z0-9_]\)/\1StTimespec\2/g' \
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch b/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
index b085e03ae98b8c94942845e1be4f5cd5fbb631f8..921bf3f6ccc245da1dbaf7d399711eaf058f6f4a 100644
--- a/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/main/gcc/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
@@ -1,4 +1,4 @@
-From aecc0619fab1b89a88bda30080417c0ddbb5d2aa Mon Sep 17 00:00:00 2001
+From dd1465b56f76ada5c7383ebd98ef02311a3b907c Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Sun, 30 Aug 2020 18:03:03 +0200
 Subject: [PATCH] gcc-go: signal 34 is special on musl libc
@@ -25,5 +25,5 @@ index c555712a03c..9e228580d37 100644
  		}
  		throw("sigaction read failure")
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
index 1859b886e3a2f183669db4e4260f79bf7c19cf16..abb3f3f9a489ce2f587f4fd8e8e708eb29de16b7 100644
--- a/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ b/main/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
@@ -1,4 +1,4 @@
-From c988692ec6b151541088b1b48a29d6a54269f55c Mon Sep 17 00:00:00 2001
+From 382d4516db8a7c183e9d7b5ec16a9bc175523ac9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 30 Aug 2020 19:26:53 +0200
 Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t
@@ -26,5 +26,5 @@ index 972e2c379bc..8d6da15f983 100755
  echo "type Pid_t _pid_t" >> ${OUT}
  echo "type Uid_t _uid_t" >> ${OUT}
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
index a2c0c036617c33f4e8a2876591cab1c3be3903c9..0e17708b7676b653bb2e854f04701bb906e7d37e 100644
--- a/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/main/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@@ -1,4 +1,4 @@
-From f634ef3142f759c8220830b77487fe9686ee0f61 Mon Sep 17 00:00:00 2001
+From 79d8ab42aefb1d3c5f794f51df643ab040c30e30 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 30 Aug 2020 19:27:51 +0200
 Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
@@ -23,5 +23,5 @@ index 6f7d2e27996..5afd7902497 100644
  
  static inline void
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0037-gcc-go-link-to-libucontext.patch b/main/gcc/0037-gcc-go-link-to-libucontext.patch
index a9befb16f1fecb156932e2929f32430e1d49c22c..b81d8bf98a4e2ff2e86175417b52a5850ebac126 100644
--- a/main/gcc/0037-gcc-go-link-to-libucontext.patch
+++ b/main/gcc/0037-gcc-go-link-to-libucontext.patch
@@ -1,4 +1,4 @@
-From 13f05ade4843b355a96d72cf3464694e5eca641e Mon Sep 17 00:00:00 2001
+From d42de24395e4f07cf6412896d4cd8c7f83a9b875 Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Mon, 31 Aug 2020 08:59:40 +0200
 Subject: [PATCH] gcc-go: link to libucontext
@@ -21,5 +21,5 @@ index 63627db68cf..c7f1f84d683 100644
  	  --srcdir=$${topdir}/$$module_srcdir \
  	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
index 86793d86561a446b0ece6b702e88ff363889cb14..15acfdb4a84de6915616b28d7c4347e1946205f1 100644
--- a/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/main/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@@ -1,4 +1,4 @@
-From 6fb1014e9a20deb8c634fc12dd9a146a800e6b70 Mon Sep 17 00:00:00 2001
+From 570cd2b596daf12e8dfe1a444fe405a7c26fc2bc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 31 Aug 2020 20:26:56 +0200
 Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members
@@ -22,5 +22,5 @@ index fd1c885f043..e845e453332 100644
  		mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext;
  		int i;
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch b/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
index bd5d628d755a624b06eb409bd640c3b3dd21c6f2..80ff192a20700368534d75fea29805f2fc975e62 100644
--- a/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ b/main/gcc/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
@@ -1,4 +1,4 @@
-From ae168d35da22feaa01f9f77f7b578aa05cd50c96 Mon Sep 17 00:00:00 2001
+From 10b79a025a54354368c6f349c17682b1e8487907 Mon Sep 17 00:00:00 2001
 From: Geod24 <pro.mathias.lang@gmail.com>
 Date: Mon, 16 Nov 2020 18:40:46 +0100
 Subject: [PATCH] CRuntime_Musl: Support v1.2.0 for 32 bits
@@ -49,5 +49,5 @@ index 451c8b4fccc..ca654fbe424 100644
      alias c_ulong    pthread_t;
      version (D_LP64)
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
index 1ba58286a8a849190a28a0ca6c94a8ffbe093e8d..4727c37ebef0b23530e7131ed97cf76a9ef3cd0e 100644
--- a/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/main/gcc/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -1,4 +1,4 @@
-From bfb6df1638635136c4fd8960575331476fb68d04 Mon Sep 17 00:00:00 2001
+From 8ac36878ba8714afeac6f439632de8bacb2e72e3 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 16:07:26 +0000
 Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
@@ -265,5 +265,5 @@ index 40e07354b3d..81bd50b4d7c 100644
  
  #ifdef ENABLE_DEFAULT_SSP
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch b/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
index 1561a7c058c5fd3e017526ef89a639054f6cfaeb..222513d656e7038e57ec3e38348ded172b3b8b2a 100644
--- a/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/main/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch
@@ -1,4 +1,4 @@
-From 3bc47945dab0108423dbaa211332817c4784b3db Mon Sep 17 00:00:00 2001
+From 70d70a1106b31ab840dbf5361312af221a2d5f04 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 19 Apr 2021 07:21:41 +0200
 Subject: [PATCH] Use generic errstr.go implementation on musl
@@ -44,5 +44,5 @@ index 5b19e6f202d..8dc60172186 100644
  package syscall
  
 -- 
-2.31.0
+2.31.1
 
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 413264cd6df98e6df2e242162adf185c0f442b8f..8c382fb7b6d12e78eb02f4a9f242b29875f9e1c3 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=gcc
 _pkgbase=10.3.1
-pkgver=10.3.1_git20210424
+pkgver=10.3.1_git20210625
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="$pkgname$_target"
-pkgrel=2
+pkgrel=0
 pkgdesc="The GNU Compiler Collection"
 url="https://gcc.gnu.org"
 arch="all"
@@ -660,45 +660,47 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }
 
-sha512sums="0ef281e6633b8bef7ce24d1448ec7b96aef66e414f90821a9a021dcd98eca8895d217d9d95b70fd9c96113689cd026aec951edc356462e439a9350edb4009df6  gcc-10.3.1_git20210424.tar.xz
-d1e10db83a04c02d99f9f6ce03f949b83ccd013674773dcb08992c604048df6a08bf9bd16f74e3c60ea85fd861fb08c1fa9fe17c304af9bfc9a032b81f1ac9eb  0001-posix_memalign.patch
-a77c7ebd994b5780cc5209f33ace24fc4d04353638dcdb14af192b0be5b0e5be397218ddba40e577af889a267af1aa69c1def474207a6661a37c3f5c15002bcb  0002-gcc-poison-system-directories.patch
-108ad63f61e61f627a75613605962021c08bbde584f3c0507d6a07c6112487847ce89699d1d80efb9201c4eab3440ba66f2eeb781bd259fdfc9c87b3baee1e27  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-dc28895223fe7ce531648225da3cd15e20c26a9be0248fdd66f11efb153647776bdbe8109097d87a087c4443e809a0d425848bdeae1442135c52a13bdd06ef75  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-ce7a5f243072284e767510083c57250dd5f1dcdcae102cf1ecbb06f36ea286b00b1f84dc32e5fdb76bac77b52ef3e4e650cff7cc0d14d94487a40ca9d5605bbd  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-f5458adfd23f51fa54fb690ec322552d7cadc3afa5773e13e73832c56832854ff14a73ff480c9990731ce929c5a4df35bc20247239268221b9af40ba37331228  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-2601b0de5fe402cdd9a3d87c2a3e959154c2ee413989db21fbc232f169b20d94807a1f89ff5ebb650a143d59b4b48187b338832d8de577fa47bfdd1b76313114  0007-Enable-Wtrampolines-by-default.patch
-3eedfe70c85d963845a658444d8692792a34af8b5e0fa800991bf1e0e2c9ff3196c50f11a284cfaca5d48b4c78b614febf38339918c7fa7a7f4723a1f6bdad16  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-6a4b6843cb27b560ac4327b17718806bac4b602903f696222617148a52e9918144648cc45642293beb7c8fd48eba325c115e1dcaa4adec85e1caff0ea33d2a8a  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-af174250b4fbcc3664bed51d919695511b538f2f3b65532383591f511bede3d13a1ade29aea66598d6df17f2e931a2d171f01c4e7008b4f468cfb13dc5f2b4cf  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-aabac76659e3fa96fa7b4ee2571672c840c3dd37314f16516038d3934333a42b20442a967afce5a35a326685c3c8ef384fc97dc8f4dae57479038f5431e33c19  0011-libiberty-copy-PIC-objects-during-build-process.patch
-36702acf0c9b34adb0b23b74167e5358c706246cc88ce569d4462555bb48288d5d633298aa447ef023c6f75de86dfa7d4ebbf3c43593e1279837ebd47061be0f  0012-libitm-disable-FORTIFY.patch
-79912633ee707c60c66abf6ee16159db3357e4e75d4254f7f38cbc0119c2adfcfa2b8c6b1df3885526d68e49f88e2a0c87969a784ed8a1025a680a4f18acd06c  0013-libgcc_s.patch
-c8c6f4e967afb5d4a9eccd917f6338a61547cc2fabbf56b25e27220b4f3c85f5002477bf2f9d05a911185cee8dcba3a12d3ad24c0d7b1d3b67a3a53bfea702c6  0014-nopie.patch
-d8d8556a6192d7695e1aeb1e64bf98a02b068c427442dd9c23d2b9a863c504e577f35e0890b5f0a184c687ce9315cecff3d2e0bb82f19531a493efb72b54cfe7  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-b3fb29187561fef84b6eb0b35a582c79833203f689e5bf884146cd9a71ec407e0e3b27b0bd4953143d00879ce32331e92741e1c7229ca291ebf13dfd8f5d409c  0016-dlang-update-zlib-binding.patch
-2a03683d5e00cc65f8ebc83638953dff89981069943169874df03f4f3a22348b960780250d9240505acf5b1bfbe154d57d14f310f29a94b76404f50611da9000  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-3df60839e5337fccdd228ebf753fb0dbf672aefca5f3f16329b99c813b907f44e1ce4948ce7f692dca316eb307b83ae9f5028cf1875eb3c9fee85b2dee7bfe83  0018-ada-fix-shared-linking.patch
-bd60be22341b508b4b5cb66eb48723d0f48770745352c60cfe146efa4d18ec58cccbb37f85b98dc0432e52bb5dc8dc1f28b3a3ca50d1ca6db68eb38df970e5aa  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-333f9c7a1935dc4f29783fa31c254bda6339c30ee770eb30d585ac422cd0f69701b5d988f9493471e4c83cf20937050f33320852a83ed6dfb2e739ee3539ca0e  0020-add-fortify-headers-paths.patch
-053b0339936cc0469e8708ccc086fa1dabe8572199530e1e78a93551340dd35467a07273e19d2cbc7fe915b7a5bdf95c128718ba0518b67b9668ef0316b7aa06  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-7b3d849cdbdee5855918db4114de8f989ec5d612cddc7551eb63ca2878e69e3566353bbfafa9205a161ffd51c5aedd367de6ad82cd5ebf6cb28c716a8d447bb5  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-6b3c0fa81cebaf32948657bddaac99024f45c2fc19ac8bc504f3773b6458099b9907e310e162952973bdd41c9fc011e7a50bc8fa86cc0ebec9dd4c69830a012b  0023-Pure-64-bit-MIPS.patch
-da634721fa9cba18e4f527b2cdbe6896c0251ce43865c6fbf29a7281d766c3a8f98e2ddd345b801c25b7ceb85880150ae9cc422aa8891b1fc28a3dc40bcd3114  0024-use-pure-64-bit-configuration-where-appropriate.patch
-64b58a273993224f93c68cddfacc1b3da6b0900b2983f27f8db39b4375afa97cce564739c8fc320666821f6de526e54acbc4920c7e16612303b3d25aed34d5f1  0025-always-build-libgcc_eh.a.patch
-6004be7d683993c175f819e1d62767b6ca2b80643917bb584ffffe2aee9fd5ad9745f91651ad5d1d00aed390e7346262b5c28bec356efd9ff1c85e4b54bcfe2e  0026-ada-libgnarl-compatibility-for-musl.patch
-7a3ce107cc55356ac46f3a217eea1cf9cdddd43fd3fede048a26e5da2280f0af9f806392942d2896a0f841ca0b0b0eaceb4e20f09edee7a743b515d3553fc8b3  0027-ada-musl-support-fixes.patch
-0cd8303456ec5479942970679352fe8bcd259b8b04bffba458545abdfac87163a8fb8e55c3aa505c516af8fd0a1bfb5f2ee4c6027ec9bcb0b0d3564469a18e23  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-6cc82829bb8bf8ffb473e4f2f9c2f657a4078290fc7c3208d199c0b07c2c3a7575a0c423e52fc02fd96c81158ab2e7ad33ccb651523ba80e00dee9e503d19c6d  0029-gcc-go-Don-t-include-sys-user.h.patch
-868e0cf5d32412c557d7835e03eb23621745179e77c87d69b810f8ec968cf80606cb5cb8085e5e125f08e809d5e3ff50c4de869d94caca5f4257669237a29b92  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-257814e2dc39bf01dedc3efe9f50029bdc230e112a0e739d0547896212b87bcdb9d40d4632a237137c91e2d9605b2256ebd45ee005920a5c4e401e699ce69f46  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0e33205e6ef0b58d12eb80d3fd6ce7361e9e3a86ba2ae781745133be1f0fea6a1e95fd58331765f6bb599f4ad355224c954db4fbaf804b9e4c0ea01dbaae1638  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-bb1e3bbea65644435134910e04b8d4de27642026371b19f4faf51b90e32af08e7181b3198e936b3626cba2126f8f9182ce39f6b8c8849b6b27f56a1c45e4f8c5  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-0758417ab682ee6d4b75f1ba2d0c1f568e115a16625eb664066c1862178a43ae717396c5d61a355a08fc01929041abebbf33bc58176a0b78ab384aba7d2ed8ba  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-d0b132d1bb9a455af23829a9da4ff89c27eff3f642e2280712667753d552fc214424470cad4cecd0ae39052553b6a22d7dc7a20eebfd1cb976d98552b00b9dcd  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-a21844975ff13317ed7985b5f5b257a0bc1dd961360b6a6f36bf52151b8edf5ecf38fbdd47cb2c28c13ed3dfbf4ca112d91d81373fd3e2c5992aba35296645af  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-0217263fc1fcfbde92fcebfc626b2cf0ba30e704b4fbe5a11f55d9ca5b579cceac3ba9ec45e7f53cd8805678b69fb6e5ab1295e67938b9c83f82e44ddebd0a85  0037-gcc-go-link-to-libucontext.patch
-8a90ce84d493bfcdcad4cb1a02a320dca18e8178e717451087501b059ca00ab8f6b73d628bcb3f49c5c6702b7222b063d3c0803d093e2c6f58820b6aa578969e  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-a3e7362fa95d5ffa56b0d8ea73f6f8e867409ae3b85d041aa0591dba093c5bb1d30f3294151c5142e8d1df91f4d138e9f4484009b8a675c8fc3b754a34c7648e  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-dc7a8f6dc885dc34229128a716531b375ec4e8247a8522adb623c5a6b39db60ff471436b360a25f0310ee16fe1a6ec85ff64398cbae2677534626972ac01db22  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-046bfe95d6de9df148e6c410b5d23a49c488ab41d95e599fc381a2b7d190e6d7d99de59fa8cd8c3a711ee2310426f3cdcd323cf887c8d11543e119d205659b6a  0041-Use-generic-errstr.go-implementation-on-musl.patch"
+sha512sums="
+e3381e4511fff63f388b0898669f83eae82334c7833dac3a0d4e3a3241d4154400681b7c934253b2e773922cb91b33d586888ff6c1e00c8be96bf708c9247178  gcc-10.3.1_git20210625.tar.xz
+1d5788a2bede9ecdf2597a836fecaadd78ce4f5742838edbf5ef1091bc6fa73d2e43d862a5ccdcb45d404c49fc943a8110ba470608b2b4da165dbdcae00818ca  0001-posix_memalign.patch
+997b75b108cb95c47eecce8aabb60490bd07d4a0c4bd90d449dcef9f85319ab529fbb19b381fa984e7c73232cbe4e33d0e45a1677ff620dbaa14590518f4ce4b  0002-gcc-poison-system-directories.patch
+01623bd69b69bb4690511e0c8b00afddf816eb0040647de7140a588b75cd5ca8f4a087a52793092a8d8e9a95fee546562bc2ebf80141dafc9754ec3a0bde2cd1  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+bbf01f6f857d981d6d82859268c1c7392e277b3943332f47650ff758b791c5711b9d7cfe1c11ed2770dda77a42105433f0da9e974638aad1e263b29c0ee2cbf2  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+b9e03d6f18861269d356a686438b848fa294cc1c9ac6ad972b89c64e92cb99a25cf8a0513344d18ee41698825b5d8ea9a23cac6f96c933e03f8e20afdd285516  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+d9389c82d7075debade8d1b43ab6bd4a087a8bcdc6d1a812923ca80eefe6e45498e552b7a088780e74fd08d679cb83cf94973157ed78d78090594ca4c41eb816  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+2a9727a9b6ec7dd05ade8be3e686d82b5702ab9b6185812f72afce627179b8438505b37b5dd3705a751ba600a5a246de69e23e81bf09faeb7680496f2e5803ab  0007-Enable-Wtrampolines-by-default.patch
+c8828ef94d4be1ee8979f41ad2fb5d956fd17e7509c0d3df6f88e75d6faf253b9bea8eaa2cf00ee925e0fafabb4823fbfc125d018dd1b19911ee982a3d073002  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+c150051ffb049ffd6a92b85265dbd9d763044468259220332f196f234031dcbada00bf9fea4be77bac712c0fd554d58ba5bdaa61e437f4678edeb7bdc30bf0db  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+68d59c2f2714ab41a90e3ea512187f3da8d5d7bd05d07c1fafb2d78681ec772698a5ff4303e98302230a69a3fc1f56bb5d32d58d1ae95dd33e20850d9e02dd79  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+5059d3207f4abbab13b7b4aa1a9aa40b3fe519dd4a378e049553c13582787faada4f9e79cfee51e291c5ad88947d763217b15356730fecb8eebdde6fd4f285c1  0011-libiberty-copy-PIC-objects-during-build-process.patch
+18d6d84b08f4949f510c5c3899451fba08a68e0b1fde381a7df6d117e7493e9093839e660a1293ae4f1a5194b3200b65e89dbb61d6f60e09b292f4452e9f1411  0012-libitm-disable-FORTIFY.patch
+55165e4955ce7a881b80701a543d61253252011c21dfc86ab7fa8a49a105b708d2452b588bc631423cdb5dd0f454d877283635a40485684762ec2ad3a103c911  0013-libgcc_s.patch
+2e7af3e31f46a44cedeed949730a3c10f573b0d5071e3d6606444a40c9d1ebc5331d46d5e9955473d12bc84de118e3a84c15d0f70019e3a71c671d016dd7203c  0014-nopie.patch
+ae86e9dba038e1fcf536bf35fbb0b7f0f113cc5ced4d4507d3c4b8a9f1b59a7e039b4162df7dedf19730ffa7c4e546aa5704c160879cda005123b45a505c0993  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+f4002aecd5a53547479c2869c0cf9b7b281d9c1f96f41c6959e81fc3af590a00530389647c0acc2e6f0df2f8bb4d185c9cdcd740487b124e0676b74cc9a3e6be  0016-dlang-update-zlib-binding.patch
+d280ac5c6675c063ca671e267c8789181e4b13de65c4248bdac702e0c1daa40089df277858f8740d8e182ee7773ac0518777e1625f20dcb96dbf3d9975ddd571  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+53ae0411ae86da64953b0e26bce171a222205697644428248cb2becd394e463a40496d4d06af587bfedcbeb8b323ecae4284d5f91a7c7b30b9053adad0b78a86  0018-ada-fix-shared-linking.patch
+37cf7167c1e7e387abaf91acc46d0c751d07f4d427a937d0efac3a479dd5f6a88f632c183462fb1ff4e0145474228960a98721f711c2176c9425a5f33649634d  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+48e38d2d86843bbfaffc51288bb33d25478d32ab9832684da4066a487a92a6ef24ad6381feac2fb8a7905c5f3000709c3b10cf37f9be70685e1f9c70c63c4363  0020-add-fortify-headers-paths.patch
+fcee4fb2d8317490144404b6d6c632607e57a01591b69cb90d9119fc7b5446b59027e403cd65e6bf18dccee127dc5fda96c5a7b43adc14671b85ecd4303da2dd  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+cedd53c2dd61c4ead859242ecbdac4ac674424ad68eda3326741187d187ff90d6b6e3e88f9b65ceb2e97d914eb38ae62670ac4b08cbaa3728129739fa8fa7f27  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+fc7684b25163a43a2d97df0614b2d1c8da81a5a80169cbe853aefd442d8413d5d0717772bad1c87ca6e8eff6e26f8aa5f340cebf635ef44192227227e167f08c  0023-Pure-64-bit-MIPS.patch
+cdd42fe4a48cee11a23086aaaf9f9c8b55de69987cee88a39a3316878e064066511b5e9e9b98267a27af5042c1fdfcfaadeb5a3ac81fab4102c9b9e261b17410  0024-use-pure-64-bit-configuration-where-appropriate.patch
+79f1ab0e29bd3fc7e72d8c59cd380a2b50b6e4b872d5101d4f1ed1ac00368716e3b12b2d54bcbfa60a89104418811034c5a560ffb1de5712bbe590f16f74d2b5  0025-always-build-libgcc_eh.a.patch
+073eda8d12299723b2f4d190cfcbe467b529936d580240b1180d0c37286c9b5ab26d8aa99f8b59ce2e195ac46da708d84ad8b9a2f0946398b91448b590e9cae4  0026-ada-libgnarl-compatibility-for-musl.patch
+3cb3f153f67d10171b3bc9cb8f7acafb611f2f221dec2a6129cab63f9cb97bd3b9c0e512e9d70f985cc139859d64b266fe71504eb0ca2ce5ab59ca82445e4b14  0027-ada-musl-support-fixes.patch
+e8d8e7b2f39d706c7aed4b9e6b5f166482e317b2b68e9250880cd864932e0e69d9b595eaa9e10e573f88207697489cf89aa968d2e0a9aa3d92c44717c9f6e9f8  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+674a0599e9e0f450bbb924513a4a6ee1dfde0848d47110ce1415782b6f848335197bb86798063aae5626d01ee892c993762dec83c729052c536d97d6b86999f0  0029-gcc-go-Don-t-include-sys-user.h.patch
+8714dde37beda68d901ad6c50c208c3fd3dab81951898535a964348c6b45bd2896b1386302061fedeccf29228ba9d5e788657e550d3680c6562c024b6b135ea3  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+e5c9bc4825f5adefe1eeee80dc24a05cc6224b20c5a4e36e1d3b74255ab1d2b1dda0f90915a208ce7d09a22853e1782aedb3c57729a4e650eb13a2c1f9bc0482  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+578d2adbdf036a1764143340fb63055b0f23cdfc75c79a91813194c0dd346900d36c5db334ea341ea29c51dd62e94618ce49db422603284bb565260d0ee2d4c6  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+3e06a22fcda856bdde6d77d2ef11b0a60b5a99b3c8dc4a7919a4c4f3fc01b86f94f141b58df8129d739f9cc1b116ebf8b4e6d82d58e6c5c38eccb677c5f4c0aa  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+5c4edc35d40b759d08dc3b536be5a20be727e5a37ea2755f0416de932d2c641661d4e197f24c3128f9fe79daa08f80528d925676920ff03ca0f8127ff13a9ea6  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+41ccc997352859f0c023c4b49f8a8f3d505727163db8ba9795d26c0ba89a004b232ea685da7cd6f210272641e107a09c398578ae3e0e6e065982912555f0d2bb  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+c70b599de8698ea2b6ed865f5ca503a55ce1590c4d30af5af4c36d4fce1d42f19d347f44d6e62fbe84bebeeaac9c90d74bb9e17e2b7bc66d8e8988e98f81cac3  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+19ccab17f5ba7c02643a1ea85f3690554d3142e3bdd7a68d663a74381336f74007d1ef053fe4e78acc3154ee6f59606de5fbe54dac9efa72291ace76902b2856  0037-gcc-go-link-to-libucontext.patch
+b92ea62f8ffc7471dabbc8a6f770fc141702d4900f6eb4808a8b0c46042434617185366d93b491220e4f079827239b3849d078acd4389a360f6ef7fddf2ab249  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+1f54ea2ed780964da3238bd98b63719d68585ac97bd312211797dabec3fc7c54b60af9f7ffc490355c898ed42c0a2745e6486bfc0577b9adee88ee1fb35bf2d1  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+7e02eaf9e0261a2942cbc4db626cc6d67955bdfdc9036d505f1e3a4b3fa03993de403b58173137ca98db3365df28db234bf70ae76a74a463c39887a40780c2a7  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+99ecfd0beeb8dfcd95ef84b3ad8fb43402edb87ac6b0591c7a8bd986b9e163e1b8ce2c5773ee3cbf1264dc40912b7312f450e6dde4ab8a6cf28b02541de7ce84  0041-Use-generic-errstr.go-implementation-on-musl.patch
+"