cross/gcc-*: upgrade to 11.2.1_git20211125 (MR 2706)

Upstream commit: c29fc97653 [ci:skip-build]: already built successfully in CI
2021-11-25 10:09:10 +01:00 · 2021-11-25 10:09:10 +01:00 · 5024719ca9
commit 5024719ca9
parent 91d95e4251
132 changed files with 915 additions and 1080 deletions
--- a/cross/gcc-aarch64/0001-posix_memalign.patch
+++ b/cross/gcc-aarch64/0001-posix_memalign.patch
@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From 135cfe09a582b4076324a5f350f775c18164aa1f 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
@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
 1 file changed, 5 insertions(+), 4 deletions(-)

 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 87344d9383f..ece428df487 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
--- a/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-aarch64/0002-gcc-poison-system-directories.patch
@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From b0d26972848280c3035668a6caccf0ca5475f062 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
@ -26,10 +26,10 @@ Upstream-Status: Pending
 7 files changed, 68 insertions(+)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 100644
+index a75b44ee47e..d15105a73f3 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -682,6 +682,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
 Common Var(warn_return_local_addr) Init(1) Warning
 Warn about returning a pointer/reference to a local or temporary variable.
 
@ -41,10 +41,10 @@ index ec5235c3a41..ca942863064 100644
 Common Var(warn_shadow) Warning
 Warn when one variable shadows another.  Same as -Wshadow=global.
 diff --git a/gcc/config.in b/gcc/config.in
-index 364eba47737..9551c0dfdf9 100644
+index 2de5a463315..059c818c895 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -224,6 +224,12 @@
+@@ -218,6 +218,12 @@
 #endif
 
 
@ -58,18 +58,18 @@ index 364eba47737..9551c0dfdf9 100644
    optimizer and back end) to be checked for dynamic type safety at runtime.
    This is quite expensive. */
 diff --git a/gcc/configure b/gcc/configure
-index 84e0ea21054..3bb7b5b318a 100755
+index 708328e1670..4b977e313b5 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1010,6 +1010,7 @@ with_system_zlib
- enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
 enable_link_mutex
+ enable_link_serialization
 enable_version_specific_runtime_libs
 +enable_poison_system_directories
 enable_plugin
 enable_host_shared
 enable_libquadmath_support
-@@ -1766,6 +1767,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 100755
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@ -99,10 +99,10 @@ index 84e0ea21054..3bb7b5b318a 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 100644
+index df1c9cc3200..5461bab88a9 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 
@ -120,10 +120,10 @@ index d068618bd8f..44ea4725620 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 5a4b3c6c234..9d1126e9751 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
 -Wparentheses  -Wno-pedantic-ms-format @gol
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
 -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -7727,6 +7728,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@ -147,10 +147,10 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..b2200c5185a 100644
+index 8ba410c9e17..a83ba34ac4b 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1041,6 +1041,8 @@ proper position among the other output files.  */
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@ -160,7 +160,7 @@ index 9f790db0daf..b2200c5185a 100644
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 8a2bda00f80..9098ab044ab 100644
+index 446d280321d..fbfc0ce03b8 100644
 --- a/gcc/incpath.c
 +++ b/gcc/incpath.c
@@ -26,6 +26,7 @@
@ -171,7 +171,7 @@ index 8a2bda00f80..9098ab044ab 100644
 
 /* Microsoft Windows does not natively support inodes.
    VMS has non-numeric inodes.  */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
 	}
       fprintf (stderr, _("End of search list.\n"));
     }
--- a/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-aarch64/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@ -1,4 +1,4 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af 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.
@ -9,10 +9,10 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d9a4b78ffd..129dc5b11f3 100644
+index 9d1126e9751..46e45274859 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@ -23,10 +23,10 @@ index 9d9a4b78ffd..129dc5b11f3 100644
 @opindex u
 Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index b2200c5185a..625c9ab7902 100644
+index a83ba34ac4b..8c15de433ee 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1039,6 +1039,7 @@ proper position among the other output files.  */
+@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
    "%{flto|flto=*:%<fcompare-debug*} \
     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
--- a/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-aarch64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 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,
@ -10,10 +10,10 @@ Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
 2 files changed, 10 insertions(+)

 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index db91a36794a..ed976c71404 100644
+index 9f993c4aff2..7db314195ff 100644
 --- a/gcc/c-family/c-cppbuiltin.c
 +++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1385,6 +1385,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1421,6 +1421,10 @@ c_cpp_builtins (cpp_reader *pfile)
   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
 
@ -25,10 +25,10 @@ index db91a36794a..ed976c71404 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 129dc5b11f3..1b7ef0c68c6 100644
+index 46e45274859..1b4a698a191 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
--- a/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-aarch64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 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,
@ -22,7 +22,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
 14 files changed, 36 insertions(+), 19 deletions(-)

 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index e587e2e9ad6..1d1017aa523 100644
+index 7f2529a2a1d..b097e1688aa 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@ -34,7 +34,7 @@ index e587e2e9ad6..1d1017aa523 100644
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index e25fcac3c59..22b2f7b0d14 100644
+index c1dae8ca2cf..a87dc740171 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@ -47,7 +47,7 @@ index e25fcac3c59..22b2f7b0d14 100644
   %{shared:-shared}						\
   %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0ec3aa53189..f8bda84de2a 100644
+index 0c1c4e70b6b..8b581afacdd 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@ -59,16 +59,19 @@ index 0ec3aa53189..f8bda84de2a 100644
    SUBTARGET_EXTRA_LINK_SPEC
 
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index ff2e880b1fa..7f30c363e4a 100644
+index 5ebbf42a13d..902378e1bad 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
   "%{static-libasan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
 -  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
+ #undef LIBHWASAN_EARLY_SPEC
+ #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
+@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
   "%{static-libtsan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
@ -84,10 +87,10 @@ index ff2e880b1fa..7f30c363e4a 100644
 
 #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index ae4aa844f02..54b91c0492a 100644
+index a23e7ab3eb7..12ac8cb93a9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
   { "link_emulation", GNU_USER_LINK_EMULATION },\
   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
 
@ -97,7 +100,7 @@ index ae4aa844f02..54b91c0492a 100644
     %{!static: \
       %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 785c68220b8..21dd66b412a 100644
+index f3e25b1412a..712b0f1c30e 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@ -109,7 +112,7 @@ index 785c68220b8..21dd66b412a 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ee38e218aec..0325971d818 100644
+index ac40c3dfd3f..6e19e25c35a 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
@ -122,7 +125,7 @@ index ee38e218aec..0325971d818 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 5d0782100bb..4be5fbb2191 100644
+index a390bcece83..be0ee289367 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@ -134,7 +137,7 @@ index 5d0782100bb..4be5fbb2191 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 4afef7c228c..ba1a6e60e05 100644
+index fce5b896e6e..ee29979dd34 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
@ -142,14 +145,14 @@ index 4afef7c228c..ba1a6e60e05 100644
 
 #define LINK_SPEC "\
 +-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+ -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
- %{shared} \
+ %{mbig-endian:-EB} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 2ded3301282..a1e44ddcc0d 100644
+index e3f2cd254f6..43499ed29cf 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -457,13 +457,13 @@ extern int dot_symbols;
+@@ -374,13 +374,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 
@ -166,7 +169,7 @@ index 2ded3301282..a1e44ddcc0d 100644
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..9490b84a153 100644
+index 510abe169c5..3c1f3a8ec5d 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
@ -179,7 +182,7 @@ index 9ade72114e9..9490b84a153 100644
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 6919b468f06..56d52d41b31 100644
+index daa48fdfc2b..2fcfc5d770f 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@ -192,7 +195,7 @@ index 6919b468f06..56d52d41b31 100644
    %{!shared: \
       %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 63853e60c03..de6d8675456 100644
+index 2550d7ee8f0..7596d0b2757 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@ -205,10 +208,10 @@ index 63853e60c03..de6d8675456 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 625c9ab7902..7aec9d3a016 100644
+index 8c15de433ee..be1508e5abe 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -695,8 +695,11 @@ proper position among the other output files.  */
+@@ -737,8 +737,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -222,7 +225,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -713,8 +716,11 @@ proper position among the other output files.  */
+@@ -773,8 +776,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -236,7 +239,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -731,8 +737,11 @@ proper position among the other output files.  */
+@@ -791,8 +797,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -250,7 +253,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -747,8 +756,11 @@ proper position among the other output files.  */
+@@ -807,8 +816,11 @@ proper position among the other output files.  */
 #define STATIC_LIBUBSAN_LIBS \
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
--- a/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-aarch64/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From a2c4ea1f97c358486316d0e8536b021faa4581a5 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index c49da99d395..93f25319005 100644
+index 2005b783c68..c5c6af427cc 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
+@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
 of the destination region.  Same as -Wformat-overflow=1.
 
 Wformat-security
@ -20,7 +20,7 @@ index c49da99d395..93f25319005 100644
 Warn about possible security problems with format functions.
 
 Wformat-signedness
-@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 
 Wformat=
--- a/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-aarch64/0007-Enable-Wtrampolines-by-default.patch
@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 100644
+index d15105a73f3..29f9504cb68 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
+@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 
 Wtrampolines
--- a/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-aarch64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From 02c1d7932c3c3b9813431937dd82971a3ca86088 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
@ -10,10 +10,10 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
 2 files changed, 8 insertions(+), 2 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7aec9d3a016..daeb4d0c8ea 100644
+index be1508e5abe..e495b222095 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -886,6 +886,12 @@ proper position among the other output files.  */
+@@ -989,6 +989,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 
@ -26,20 +26,20 @@ index 7aec9d3a016..daeb4d0c8ea 100644
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1170,7 +1176,7 @@ static const char *cc1_options =
+@@ -1288,7 +1294,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
 diff --git a/gcc/params.opt b/gcc/params.opt
-index 4aec480798b..eaecfab37ad 100644
+index 8ba281b4cfa..bab39cdf8a2 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -946,7 +946,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
 The maximum number of SSA_NAME assignments to follow in determining a value.
 
 -param=ssp-buffer-size=
--- a/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-aarch64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From a91c942466bed1046461500c00e0ee1c9a68481d 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
@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
 2 files changed, 2 insertions(+)

 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index a9391d8d167..f7eee24dc8c 100644
+index ab716ff04ea..e595268d9fc 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
@ -38,10 +38,10 @@ index a9391d8d167..f7eee24dc8c 100644
 
 all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index a0f84b0cfa0..ab24a47a2fd 100644
+index 8edd2e05639..63f61fcf96f 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
-@@ -548,6 +548,7 @@ uninstall-am:
+@@ -553,6 +553,7 @@ uninstall-am:
 
 
 .po.mo:
--- a/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-aarch64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
 1 file changed, 3 insertions(+)

 diff --git a/include/libiberty.h b/include/libiberty.h
-index 141cb886a85..fa0e78eb62f 100644
+index f4c0fe11d6f..cf4b1043e4d 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
-@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
+@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.  */
 
--- a/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-aarch64/0011-libiberty-copy-PIC-objects-during-build-process.patch
@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 5fe2309817ce1cdad4183921faf890886ea34493 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
@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
 1 file changed, 1 insertion(+)

 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d6b302e02fd..fd39928546f 100644
+index 4f1213b983b..d0224649d30 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
 	  $(RANLIB) $(TARGETLIB); \
--- a/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch
@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 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
@ -8,7 +8,7 @@ Subject: [PATCH] libitm: disable FORTIFY
 1 file changed, 10 insertions(+)

 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index a3d84896cc5..ecb281d5919 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
--- a/cross/gcc-aarch64/0013-libgcc_s.patch
+++ b/cross/gcc-aarch64/0013-libgcc_s.patch
@ -1,4 +1,4 @@
-From 75c269d1783e1b83d9bc4f6c826f10f63a0f51a5 Mon Sep 17 00:00:00 2001
+From f2ff82d829d3d905a48fb877230ef5a096605cd4 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
@ -10,10 +10,10 @@ Subject: [PATCH] libgcc_s
 3 files changed, 6 insertions(+), 6 deletions(-)

 diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index 47d52550e5e..9cb8cc7950e 100644
+index 16765718cc3..4a855b791b9 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
-@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -11063,10 +11063,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@ -27,11 +27,11 @@ index 47d52550e5e..9cb8cc7950e 100644
 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
       }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 83301a1445f..89fdc7eb587 100644
+index ef463848f9d..1a3de052c80 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
-   return 0;
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+ 			     __cpu_features2);
 }
 
 -#if defined SHARED && defined USE_ELF_SYMVER
--- a/cross/gcc-aarch64/0014-nopie.patch
+++ b/cross/gcc-aarch64/0014-nopie.patch
@ -1,4 +1,4 @@
-From 94df93e5a0241488343d6002912dfbd680df8aba Mon Sep 17 00:00:00 2001
+From ca92d7dea9d05e515e52048c74408652e12787a8 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
@ -9,10 +9,10 @@ Subject: [PATCH] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 3bb7b5b318a..1632337439c 100755
+index 4b977e313b5..592e81e40f6 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -30784,6 +30784,33 @@ fi
+@@ -32300,6 +32300,33 @@ fi
 $as_echo "$gcc_cv_no_pie" >&6; }
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
@ -47,10 +47,10 @@ index 3bb7b5b318a..1632337439c 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 44ea4725620..6e4d4092af7 100644
+index 5461bab88a9..1577529ffb7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -7571,6 +7571,19 @@ AC_CACHE_CHECK([for -no-pie option],
    LDFLAGS="$saved_LDFLAGS"])
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
--- a/cross/gcc-aarch64/0015-libffi-use-linux-instead-of-__gnu_linux__-for-mu.patch
+++ b/cross/gcc-aarch64/0015-libffi-use-linux-instead-of-__gnu_linux__-for-mu.patch
@ -1,4 +1,4 @@
-From ac79c17450c4e3a84ad884583ae80f5949f7ffc0 Mon Sep 17 00:00:00 2001
+From 96f17362cdc323db0d556cc13f2ac712ec03db62 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
--- a/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
+++ b/cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch
@ -1,4 +1,4 @@
-From ebd9bb4708ce923785eec4d3760536cdd4051e0a Mon Sep 17 00:00:00 2001
+From 20de5d928fc0b3738d62eb2ef0a697cd733a8bdd 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
--- a/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-aarch64/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@ -1,4 +1,4 @@
-From 3e29fbd28d442a79b56610c515e9b45933244ae8 Mon Sep 17 00:00:00 2001
+From 1c64f83b19fce8cf0bacff9e1ee3232513d2ef9e 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
@ -9,10 +9,10 @@ Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
 2 files changed, 16 insertions(+)

 diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 94e42bf5509..73f2e4b7f01 100644
+index 88c027d0c28..48ef12aaa5e 100644
 --- a/libphobos/configure.tgt
 +++ b/libphobos/configure.tgt
-@@ -35,6 +35,7 @@ case "${target}" in
+@@ -38,6 +38,7 @@ case "${target}" in
 	;;
   mips*-*-linux*)
 	LIBPHOBOS_SUPPORTED=yes
@ -21,10 +21,10 @@ index 94e42bf5509..73f2e4b7f01 100644
   power*-*-linux*)
 	LIBPHOBOS_SUPPORTED=yes
 diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 9febcff849b..cb34e2108bd 100644
+index 59df921ba41..9ee9f943948 100644
 --- a/libphobos/libdruntime/core/sys/posix/fcntl.d
 +++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,21 @@ else version (CRuntime_Musl)
+@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
             F_SETLKW       = 7,
         }
     }
--- a/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-aarch64/0018-ada-fix-shared-linking.patch
@ -1,4 +1,4 @@
-From 61ee4e71b7c6495afb6b5d71a3c3c3aef7e30bb7 Mon Sep 17 00:00:00 2001
+From 35c96f4e7ae99786e8f519bd7c1c6a3511dd18d1 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
@ -8,7 +8,7 @@ Subject: [PATCH] ada: fix shared linking
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 02c413a412f..f0e52a87d6e 100644
+index 5cd5ef64f56..1c611a82cab 100644
 --- a/gcc/ada/link.c
 +++ b/gcc/ada/link.c
@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
--- a/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-aarch64/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@ -1,4 +1,4 @@
-From 891ef65973d5e72ccad2c55834c0d0371e7427a7 Mon Sep 17 00:00:00 2001
+From e9d428d711843b1ff735da53f81efaca5ed1e962 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
@ -8,7 +8,7 @@ Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
 1 file changed, 1 insertion(+)

 diff --git a/Makefile.in b/Makefile.in
-index 36e369df6e7..63627db68cf 100644
+index 047be0255e2..426949aa91c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
--- a/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-aarch64/0020-add-fortify-headers-paths.patch
@ -1,4 +1,4 @@
-From 17174b70ba34434fe93901d8a97f0890ece0fa5f Mon Sep 17 00:00:00 2001
+From 131337e43b77d251e6e0128fd95cf11ed1fa2c7d 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
@ -8,7 +8,7 @@ Subject: [PATCH] add fortify-headers paths
 1 file changed, 2 insertions(+)

 diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 95654bcdb5a..d88df8f154a 100644
+index 4e1db60fced..7fcf402b416 100644
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
--- a/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-aarch64/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@ -1,4 +1,4 @@
-From 4c063fda21dc47d87d000995c8fbce46031eb5db Mon Sep 17 00:00:00 2001
+From 803acb891329bc74ac5c7ae99904dd0a0d04759a 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
@ -13,10 +13,10 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index daeb4d0c8ea..6920bec0fa0 100644
+index e495b222095..ab8866f409f 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -894,8 +894,7 @@ proper position among the other output files.  */
+@@ -997,8 +997,7 @@ proper position among the other output files.  */
 
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
--- a/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-aarch64/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@ -1,4 +1,4 @@
-From 613210b82caaafb36d7fe39514fa0c5adb363df8 Mon Sep 17 00:00:00 2001
+From 41201c14bee1ece2c15435bc76cc07e5460e566b 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
@ -9,10 +9,10 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 6920bec0fa0..40e07354b3d 100644
+index ab8866f409f..5093e8bbfd2 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -696,10 +696,10 @@ proper position among the other output files.  */
+@@ -738,10 +738,10 @@ proper position among the other output files.  */
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@ -25,7 +25,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -717,10 +717,10 @@ proper position among the other output files.  */
+@@ -777,10 +777,10 @@ proper position among the other output files.  */
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@ -38,7 +38,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -738,10 +738,10 @@ proper position among the other output files.  */
+@@ -798,10 +798,10 @@ proper position among the other output files.  */
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@ -51,7 +51,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -757,10 +757,10 @@ proper position among the other output files.  */
+@@ -817,10 +817,10 @@ proper position among the other output files.  */
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
 #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--- a/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-aarch64/0023-Pure-64-bit-MIPS.patch
@ -1,4 +1,4 @@
-From ca9cae44a1a3b74a48d1370d077e1aea6d36d37f Mon Sep 17 00:00:00 2001
+From 71e4e4a671201d777eda4607ce380ba429bd307b 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
@ -9,10 +9,10 @@ Subject: [PATCH] Pure 64-bit MIPS
 2 files changed, 7 insertions(+), 7 deletions(-)

 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 3ce0c19a29a..b9920b49167 100644
+index 47aac9d3d61..4ad81059a86 100644
 --- a/gcc/config/mips/mips.h
 +++ b/gcc/config/mips/mips.h
-@@ -3424,11 +3424,11 @@ struct GTY(())  machine_function {
+@@ -3425,11 +3425,11 @@ struct GTY(())  machine_function {
 /* If we are *not* using multilibs and the default ABI is not ABI_32 we
    need to change these from /lib and /usr/lib.  */
 #if MIPS_ABI_DEFAULT == ABI_N32
@ -29,7 +29,7 @@ index 3ce0c19a29a..b9920b49167 100644
 
 /* Load store bonding is not supported by micromips and fix_24k.  The
 diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index ceb58d3b5f3..8116e23ebba 100644
+index 130e1f04707..a64ac2bbb5b 100644
 --- a/gcc/config/mips/t-linux64
 +++ b/gcc/config/mips/t-linux64
@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
--- a/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-aarch64/0024-use-pure-64-bit-configuration-where-appropriate.patch
@ -1,4 +1,4 @@
-From bc154c0c49b06871a9d206dc7010f14d8aeaf1f9 Mon Sep 17 00:00:00 2001
+From 43a75f797d0f0217665889830e061dbe74ac69d0 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
@ -14,7 +14,7 @@ Subject: [PATCH] use pure 64-bit configuration where appropriate
 7 files changed, 15 insertions(+), 13 deletions(-)

 diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 83e59e33b85..6ec56fdf6a8 100644
+index 241b0ef20b6..18e63b34d8b 100644
 --- a/gcc/config/aarch64/t-aarch64-linux
 +++ b/gcc/config/aarch64/t-aarch64-linux
@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
@ -27,7 +27,7 @@ index 83e59e33b85..6ec56fdf6a8 100644
 
 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index 1171e218578..256f8c079ba 100644
+index d288b093522..2949033aa04 100644
 --- a/gcc/config/i386/t-linux64
 +++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@
@ -64,7 +64,7 @@ index aeb7440c492..ab14c455d8d 100644
 endif
 
 diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index 264a7e27524..d1e460811cc 100644
+index e11a118cb5f..df81dc04a32 100644
 --- a/gcc/config/rs6000/t-linux64
 +++ b/gcc/config/rs6000/t-linux64
@@ -28,8 +28,8 @@
--- a/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch
@ -1,4 +1,4 @@
-From fd531b1754dfa64791342c8e76001a509b3646ca Mon Sep 17 00:00:00 2001
+From e8fa599cbaa9e0fe6ae8aaded7c0443807d695cb 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
@ -10,10 +10,10 @@ highly inspired by:
 1 file changed, 6 insertions(+), 5 deletions(-)

 diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
-index 851e7657d07..99ec513a1a6 100644
+index 2c8be561eb5..c557750b1b3 100644
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
-@@ -956,8 +956,9 @@ ifneq ($(LIBUNWIND),)
+@@ -957,8 +957,9 @@ ifneq ($(LIBUNWIND),)
 all: libunwind.a
 endif
 
@ -24,7 +24,7 @@ index 851e7657d07..99ec513a1a6 100644
 ifneq ($(LIBUNWIND),)
 all: libunwind$(SHLIB_EXT)
 libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1159,10 +1160,6 @@ install-libunwind:
+@@ -1160,10 +1161,6 @@ install-libunwind:
 install-shared:
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
 
@ -35,7 +35,7 @@ index 851e7657d07..99ec513a1a6 100644
 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
 		@shlib_base_name@,libgcc_s,$(subst \
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1179,6 +1176,10 @@ ifeq ($(enable_gcov),yes)
+@@ -1180,6 +1177,10 @@ ifeq ($(enable_gcov),yes)
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
 endif
 
--- a/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-aarch64/0026-ada-libgnarl-compatibility-for-musl.patch
@ -1,4 +1,4 @@
-From 53958c5c47d20094e2d5b5d1376b45058241d3b4 Mon Sep 17 00:00:00 2001
+From eeb35a7b61205438613b344ab393b23bd54b14b5 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
@ -9,10 +9,10 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
 2 files changed, 3 insertions(+), 61 deletions(-)

 diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index ef449af33d1..bd7312e6686 100644
+index 2272f83d68d..1d78456544a 100644
 --- a/gcc/ada/libgnarl/s-osinte__linux.ads
 +++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -399,12 +399,6 @@ package System.OS_Interface is
+@@ -401,12 +401,6 @@ package System.OS_Interface is
    PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
 
@ -25,7 +25,7 @@ index ef449af33d1..bd7312e6686 100644
    function pthread_rwlock_init
      (mutex : access pthread_rwlock_t;
       attr  : access pthread_rwlockattr_t) return int;
-@@ -466,11 +460,6 @@ package System.OS_Interface is
+@@ -468,11 +462,6 @@ package System.OS_Interface is
       protocol : int) return int;
    pragma Import (C, pthread_mutexattr_setprotocol);
 
@ -38,10 +38,10 @@ index ef449af33d1..bd7312e6686 100644
       sched_priority : int;  --  scheduling priority
    end record;
 diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
-index c45559e5ba0..0b0f173e7d4 100644
+index 757a6cdfdad..82df94f6a00 100644
 --- a/gcc/ada/libgnarl/s-taprop__linux.adb
 +++ b/gcc/ada/libgnarl/s-taprop__linux.adb
-@@ -202,9 +202,6 @@ package body System.Task_Primitives.Operations is
+@@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
    pragma Import
      (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
 
@ -51,7 +51,7 @@ index c45559e5ba0..0b0f173e7d4 100644
    --  We do not have pragma Linker_Options ("-lcap"); here, because this
    --  library is not present on many Linux systems. 'libcap' is the Linux
    --  "capabilities" library, called by __gnat_has_cap_sys_nice.
-@@ -214,38 +211,6 @@ package body System.Task_Primitives.Operations is
+@@ -210,38 +207,6 @@ package body System.Task_Primitives.Operations is
    --  Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
    --  GNU/Linux, so we map 0 .. 98 to 1 .. 99.
 
@ -84,13 +84,13 @@ index c45559e5ba0..0b0f173e7d4 100644
 -      return Ceiling_Support;
 -   end Get_Ceiling_Support;
 -
-   pragma Warnings (Off, "non-static call not allowed in preelaborated unit");
+-   pragma Warnings (Off, "non-preelaborable call not allowed*");
 -   Ceiling_Support : constant Boolean := Get_Ceiling_Support;
-   pragma Warnings (On, "non-static call not allowed in preelaborated unit");
+-   pragma Warnings (On, "non-preelaborable call not allowed*");
    --  True if the locking policy is Ceiling_Locking, and the current process
    --  has permission to use this policy. The process has permission if it is
    --  running as 'root', or if the capability was set by the setcap command,
-@@ -348,7 +313,9 @@ package body System.Task_Primitives.Operations is
+@@ -344,7 +309,9 @@ package body System.Task_Primitives.Operations is
    -- Init_Mutex --
    ----------------
 
@ -100,7 +100,7 @@ index c45559e5ba0..0b0f173e7d4 100644
       Mutex_Attr : aliased pthread_mutexattr_t;
       Result, Result_2 : C.int;
 
-@@ -360,16 +327,7 @@ package body System.Task_Primitives.Operations is
+@@ -356,16 +323,7 @@ package body System.Task_Primitives.Operations is
          return Result;
       end if;
 
@ -118,7 +118,7 @@ index c45559e5ba0..0b0f173e7d4 100644
          Result := pthread_mutexattr_setprotocol
            (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
          pragma Assert (Result = 0);
-@@ -409,11 +367,6 @@ package body System.Task_Primitives.Operations is
+@@ -405,11 +363,6 @@ package body System.Task_Primitives.Operations is
             Result := pthread_rwlockattr_init (RWlock_Attr'Access);
             pragma Assert (Result = 0);
 
--- a/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-aarch64/0027-ada-musl-support-fixes.patch
@ -1,4 +1,4 @@
-From f55ddf45b97fc7f827349c3ffe0375353ae6bf59 Mon Sep 17 00:00:00 2001
+From 7448ade62ac32dfe9802eb1d7a7a93b2f3702797 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
@ -11,10 +11,10 @@ Subject: [PATCH] ada: musl support fixes
 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 55ff9b0f3d5..0fadf4e4b79 100644
+index 987eff0abba..03c8bc6f496 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1533,7 +1533,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1748,7 +1748,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -23,16 +23,16 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2083,7 +2083,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
-   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+@@ -2355,7 +2355,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
+   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2112,7 +2112,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2386,7 +2386,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@ -41,7 +41,7 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2305,7 +2305,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2597,7 +2597,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -49,8 +49,8 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-ia64.ads
-@@ -2401,7 +2401,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+   $(GNATRTL_128BIT_PAIRS) \
+@@ -2699,7 +2699,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -58,24 +58,24 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-x86.ads
+   $(GNATRTL_128BIT_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 595abf87d65..00858c24f53 100644
+index 2e54e69643a..e7e6507e2e0 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -90,6 +90,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
 + 
-+#if defined (linux)
+#if defined (linux) || defined(__linux__)
 +#define _GNU_SOURCE 1
 +#include <sched.h>
 +#endif
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3308,7 +3313,6 @@ __gnat_lwp_self (void)
+@@ -3442,7 +3447,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@ -83,7 +83,7 @@ index 595abf87d65..00858c24f53 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3318,7 +3322,7 @@ __gnat_lwp_self (void)
+@@ -3452,7 +3456,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@ -92,7 +92,7 @@ index 595abf87d65..00858c24f53 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3331,33 +3335,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3465,33 +3469,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@ -134,7 +134,7 @@ index 595abf87d65..00858c24f53 100644
 }
 
 size_t
-@@ -3367,23 +3371,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3501,23 +3505,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@ -164,10 +164,10 @@ index 595abf87d65..00858c24f53 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 311e240dfcc..1c4d0050103 100644
+index 85997b9ba68..fd10e5b5589 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
-@@ -316,13 +316,11 @@ extern void   *__gnat_lwp_self			   (void);
+@@ -325,13 +325,11 @@ extern void   *__gnat_lwp_self			   (void);
 
 /* Routines for interface to required CPU set primitives */
 
@ -186,10 +186,10 @@ index 311e240dfcc..1c4d0050103 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index af4417fab90..bab6bf3ca87 100644
+index ec9db3a6a4c..6f92e50dd67 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1145,7 +1145,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1132,7 +1132,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@ -198,7 +198,7 @@ index af4417fab90..bab6bf3ca87 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1159,7 +1159,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1146,7 +1146,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@ -207,7 +207,7 @@ index af4417fab90..bab6bf3ca87 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1208,8 +1208,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1195,8 +1195,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
--- a/cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ b/cross/gcc-aarch64/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
@ -1,4 +1,4 @@
-From 546f3c4e5efed3ed0054d7639763a373dce62139 Mon Sep 17 00:00:00 2001
+From 703545905411e5b597e4f462da93fa82c964f4d1 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
@ -12,10 +12,10 @@ Taken from Adélie Linux.
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 88286c07b6e..f8f5cfb5011 100644
+index 96974bd3269..ead47c0c39e 100644
 --- a/libgo/go/syscall/libcall_linux.go
 +++ b/libgo/go/syscall/libcall_linux.go
-@@ -206,19 +206,19 @@ func Gettid() (tid int) {
+@@ -209,19 +209,19 @@ func Gettid() (tid int) {
 //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
 //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
 
--- a/cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ b/cross/gcc-aarch64/0029-gcc-go-Don-t-include-sys-user.h.patch
@ -1,4 +1,4 @@
-From 739b3a500ab6c7926364767c9d6125d8a83e5a10 Mon Sep 17 00:00:00 2001
+From 0cdfd9c48470d12a448e99f4fa7ce73f206bd42a 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
@ -12,10 +12,10 @@ Taken from Adélie Linux.
 1 file changed, 3 deletions(-)

 diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 0692fd41eb7..c8d987358d9 100644
+index 8ce061e2f5f..4d5907a2da5 100644
 --- a/libgo/sysinfo.c
 +++ b/libgo/sysinfo.c
-@@ -73,9 +73,6 @@
+@@ -78,9 +78,6 @@
 #include <sys/times.h>
 #include <sys/wait.h>
 #include <sys/un.h>
--- a/cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/cross/gcc-aarch64/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
@ -1,4 +1,4 @@
-From b61aaf8df1ea8a6cb3f0ff2954c8580806bf43f4 Mon Sep 17 00:00:00 2001
+From fe1480783664c5b3b9e073b2eb470b32438d392a 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index b429fdb2403..fd1c885f043 100644
+index d30d1603adc..57f6824eb9e 100644
 --- a/libgo/runtime/go-signal.c
 +++ b/libgo/runtime/go-signal.c
@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
--- a/cross/gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-aarch64/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@ -1,4 +1,4 @@
-From 9bda07868553de7c877f504b9abce312abce4e92 Mon Sep 17 00:00:00 2001
+From f1bd71f7dbac1570c8fd9990e0ff632e33972584 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
--- a/cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/cross/gcc-aarch64/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@ -1,4 +1,4 @@
-From 38af7ff7a56fb1b917e7432341614b2604e6721c Mon Sep 17 00:00:00 2001
+From c4fd6db3bd96974a726c41e08e42c242d442f689 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index ba38ebaa9ab..3c9e5ce9461 100644
+index fa3389d857e..57bed97c710 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
@@ -15,7 +15,7 @@ import (
--- a/cross/gcc-aarch64/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-aarch64/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@ -0,0 +1,27 @@
+From 6412458c90450577dbead578cb38da0a0cb64024 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 25 Nov 2021 01:47:03 +0000
+Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
+ on time64 machines.
+
+Run the Go-isation on all of them.
+---
+ libgo/mksysinfo.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
+index 0c52ea5d71a..6fef104cc1c 100755
+--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
+@@ -510,7 +510,7 @@ fi
+ 
+ # For historical reasons Go uses the suffix "timespec" instead of "tim" for
+ # stat_t's time fields on NetBSD.
+-st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
+st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
+ if test "${GOOS}" = "netbsd"; then
+     st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
+ fi
+-- 
+2.33.1
+
--- a/cross/gcc-aarch64/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+++ b/cross/gcc-aarch64/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
@ -1,37 +0,0 @@
-From e937f85b212f2e44101042489d387a249df3ba8e 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are more than one st_{a,m,c}tim fields in struct stat on time64 machines.
-
-Run the Go-isation on all of them.
-
-Taken from Adélie Linux.
---
- libgo/mksysinfo.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index bd2ba32cba1..972e2c379bc 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -510,9 +510,9 @@ fi | sed -e 's/type _stat64/type Stat_t/' \
-          -e 's/st_size/Size/' \
-          -e 's/st_blksize/Blksize/' \
-          -e 's/st_blocks/Blocks/' \
-         -e 's/st_atim/Atim/' \
-         -e 's/st_mtim/Mtim/' \
-         -e 's/st_ctim/Ctim/' \
-+         -e 's/st_atim/Atim/g' \
-+         -e 's/st_mtim/Mtim/g' \
-+         -e 's/st_ctim/Ctim/g' \
-          -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \
-          -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.33.1
-
--- a/cross/gcc-aarch64/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-aarch64/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
@ -1,4 +1,4 @@
-From e01c6f439a22f683f953ddeaec4f02fb190d152e Mon Sep 17 00:00:00 2001
+From 0d93aefad5acf36c4f5ef60f95683f106c21f38b 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
-index c555712a03c..9e228580d37 100644
+index 2eece687e35..e86490ce203 100644
 --- a/libgo/go/runtime/signal_gccgo.go
 +++ b/libgo/go/runtime/signal_gccgo.go
@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
--- a/cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ b/cross/gcc-aarch64/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
@ -1,4 +1,4 @@
-From d8e7e867a98058cfdd1f03ddfb18786687f85c88 Mon Sep 17 00:00:00 2001
+From da6a868da00dd1a302c91181e6af2daf57aeb609 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
@ -9,10 +9,10 @@ musl does not seem to have _off64_t.
 1 file changed, 1 insertion(+), 5 deletions(-)

 diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 972e2c379bc..8d6da15f983 100755
+index 6fef104cc1c..5b8cb86eb9c 100755
 --- a/libgo/mksysinfo.sh
 +++ b/libgo/mksysinfo.sh
-@@ -379,11 +379,7 @@ fi
+@@ -403,11 +403,7 @@ fi
 # Some basic types.
 echo 'type Size_t _size_t' >> ${OUT}
 echo "type Ssize_t _ssize_t" >> ${OUT}
--- a/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-aarch64/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@ -1,4 +1,4 @@
-From e4b21cb1e140c22a5183ebf0158bff2b655b15d6 Mon Sep 17 00:00:00 2001
+From b15fa407296fc03ad7549852a13aff790406f61d 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
@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
 1 file changed, 4 insertions(+)

 diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 6f7d2e27996..5afd7902497 100644
+index 38bf7a6b255..e50403b5a75 100644
 --- a/libgo/runtime/proc.c
 +++ b/libgo/runtime/proc.c
@@ -66,6 +66,10 @@ static void gscanstack(G*);
--- a/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-aarch64/0037-gcc-go-link-to-libucontext.patch
@ -1,4 +1,4 @@
-From a69b517d61fccb5698fcdb3261386ce85ac84b5f Mon Sep 17 00:00:00 2001
+From 566b272d5d7017e8ba72b5c52d06d7c5ed3165e8 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
@ -8,10 +8,10 @@ Subject: [PATCH] gcc-go: link to libucontext
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Makefile.in b/Makefile.in
-index 63627db68cf..c7f1f84d683 100644
+index 426949aa91c..f97db1ef569 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -48823,7 +48823,7 @@ configure-target-libgo:
+@@ -50331,7 +50331,7 @@ configure-target-libgo:
 	esac; \
 	module_srcdir=libgo; \
 	rm -f no-such-file || : ; \
--- a/cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/cross/gcc-aarch64/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@ -1,4 +1,4 @@
-From a68edec2c2adcd43c04f06acaa70b7c23fcbc124 Mon Sep 17 00:00:00 2001
+From 846b94beac2d176f6b22bbe73657657e31cc142c 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
@ -9,10 +9,10 @@ These struct members do not seem to exist on musl.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index fd1c885f043..e845e453332 100644
+index 57f6824eb9e..fd03db420d4 100644
 --- a/libgo/runtime/go-signal.c
 +++ b/libgo/runtime/go-signal.c
-@@ -333,7 +333,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
+@@ -335,7 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
 		runtime_printf("sp  %X\n", m->sc_regs[30]);
 		runtime_printf("pc  %X\n", m->sc_pc);
 	  }
--- a/cross/gcc-aarch64/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ b/cross/gcc-aarch64/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
@ -1,53 +0,0 @@
-From fae37346b1fc708e9e54f960c8532deab3afec7d 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
-
-As explained in the comment, `time_t` on Musl is now always 64 bits,
-but used to be 32 bits on 32 bits systems.
---
- .../libdruntime/core/sys/posix/sys/types.d    | 25 ++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
-index 451c8b4fccc..ca654fbe424 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/types.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d
-@@ -139,10 +139,33 @@ else version (CRuntime_Musl)
-     alias int        pid_t;
-     alias uint       uid_t;
-     alias uint       gid_t;
-+
-+    /**
-+     * Musl versions before v1.2.0 (up to v1.1.24) had different
-+     * definitions for `time_t` for 32 bits.
-+     * This was changed to always be 64 bits in v1.2.0:
-+     * https://musl.libc.org/time64.html
-+     * This change was only for 32 bits system and
-+     * didn't affect 64 bits systems
-+     *
-+     * To check previous definitions, `grep` for `time_t` in `arch/`,
-+     * and the result should be (in v1.1.24):
-+     * ---
-+     * // arch/riscv64/bits/alltypes.h.in:20:TYPEDEF long time_t;
-+     * // arch/s390x/bits/alltypes.h.in:17:TYPEDEF long time_t;
-+     * // arch/sh/bits/alltypes.h.in:21:TYPEDEF long time_t;
-+     * ---
-+     *
-+     * In order to be compatible with old versions of Musl,
-+     * one can recompile druntime with `CRuntime_Musl_Pre_Time64`.
-+     */
-     version (D_X32)
-         alias long   time_t;
-    else
-+    else version (CRuntime_Musl_Pre_Time64)
-         alias c_long time_t;
-+    else
-+        alias long   time_t;
-+
-     alias c_long     clock_t;
-     alias c_ulong    pthread_t;
-     version (D_LP64)
-- 
-2.33.1
-
--- a/cross/gcc-aarch64/0039-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-aarch64/0039-Use-generic-errstr.go-implementation-on-musl.patch
@ -1,4 +1,4 @@
-From c96c9ead4baed0a69f7e4843e199958610c5deba Mon Sep 17 00:00:00 2001
+From 45a69ebecc825636a069a34e9ee7f99075c383ec 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
--- a/cross/gcc-aarch64/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-aarch64/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@ -1,4 +1,4 @@
-From 4785de483dcba1896da1014ddb1a8505ac559a15 Mon Sep 17 00:00:00 2001
+From 8703cb765874411a83d568fde5c3b195c89c3de9 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
@ -9,16 +9,16 @@ This fixes issues with RISC-V.
 Makefile.in           |  1 +
 gcc/config.in         |  6 ++++++
 gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure         | 34 ++++++++++++++++++++++++++++++++--
- gcc/configure.ac      | 23 ++++++++++++++++++++++-
+ gcc/configure         | 34 +++++++++++++++++++++++++++++++---
+ gcc/configure.ac      | 22 +++++++++++++++++++++-
 gcc/doc/install.texi  |  8 ++++++++
 gcc/doc/tm.texi       |  8 +++++++-
 gcc/doc/tm.texi.in    |  8 +++++++-
 gcc/gcc.c             | 12 +++++++++++-
- 9 files changed, 105 insertions(+), 7 deletions(-)
+ 9 files changed, 103 insertions(+), 8 deletions(-)

 diff --git a/Makefile.in b/Makefile.in
-index c7f1f84d683..cb3983ca547 100644
+index f97db1ef569..7e577ed3dbb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -222,6 +222,7 @@ HOST_EXPORTS = \
@ -30,7 +30,7 @@ index c7f1f84d683..cb3983ca547 100644
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 diff --git a/gcc/config.in b/gcc/config.in
-index 9551c0dfdf9..c8ca910df8a 100644
+index 059c818c895..2a560417440 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
@@ -106,6 +106,12 @@
@ -47,7 +47,7 @@ index 9551c0dfdf9..c8ca910df8a 100644
    format instead of DPD */
 #ifndef USED_FOR_TARGET
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 7f30c363e4a..246698bfea5 100644
+index 902378e1bad..daf7727a01a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@ -71,18 +71,18 @@ index 7f30c363e4a..246698bfea5 100644
 
 #undef LINK_GCC_C_SEQUENCE_SPEC
 diff --git a/gcc/configure b/gcc/configure
-index 1632337439c..77de20dcc23 100755
+index 592e81e40f6..8672298f23f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -969,6 +969,7 @@ with_documentation_root_url
- with_changes_root_url
+@@ -978,6 +978,7 @@ with_changes_root_url
 enable_languages
 with_multilib_list
+ with_multilib_generator
 +enable_autolink_libatomic
 with_zstd
 with_zstd_include
 with_zstd_lib
-@@ -1695,6 +1696,9 @@ Optional Features:
+@@ -1707,6 +1708,9 @@ Optional Features:
   --disable-shared        don't provide a shared libgcc
   --disable-gcov          don't provide libgcov and related host tools
   --enable-languages=LIST specify which front-ends to build
@ -92,10 +92,18 @@ index 1632337439c..77de20dcc23 100755
   --disable-rpath         do not hardcode runtime library paths
   --enable-sjlj-exceptions
                           arrange to use setjmp/longjmp exception handling
-@@ -8009,6 +8013,33 @@ else
+@@ -8070,7 +8074,6 @@ else
 fi
 
 
+-
+ # Check whether --with-multilib-generator was given.
+ if test "${with_multilib_generator+set}" = set; then :
+   withval=$with_multilib_generator; :
+@@ -8078,6 +8081,32 @@ else
+   with_multilib_generator=default
+ fi
+ 
 +# If libatomic is available, whether it should be linked automatically
 +# Check whether --enable-autolink-libatomic was given.
 +if test "${enable_autolink_libatomic+set}" = set; then :
@ -122,31 +130,30 @@ index 1632337439c..77de20dcc23 100755
 +  fi
 +fi
 +
-+
+ 
 # -------------------------
 # Checks for other programs
- # -------------------------
-@@ -19131,7 +19162,7 @@ else
+@@ -19501,7 +19530,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19131 "configure"
+-#line 19501 "configure"
 +#line 19158 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
-@@ -32267,4 +32298,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+@@ -34068,4 +34097,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 -
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6e4d4092af7..205f7d5e137 100644
+index 1577529ffb7..e96691f69ba 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1110,6 +1110,28 @@ AC_ARG_WITH(multilib-list,
+@@ -1149,6 +1149,27 @@ AC_ARG_WITH(multilib-generator,
 :,
- with_multilib_list=default)
+ with_multilib_generator=default)
 
 +# If libatomic is available, whether it should be linked automatically
 +AC_ARG_ENABLE(autolink-libatomic,
@ -168,21 +175,20 @@ index 6e4d4092af7..205f7d5e137 100644
 +    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
 +  fi
 +fi
-+
 +
 # -------------------------
 # Checks for other programs
 # -------------------------
-@@ -6945,4 +6967,3 @@ done
+@@ -7729,4 +7750,3 @@ done
 ], 
 [subdirs='$subdirs'])
 AC_OUTPUT
 -
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 7d98ec4190a..a58d5a05be2 100644
+index 4c38244ae58..4a544e6a4ee 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2169,6 +2169,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2213,6 +2213,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@ -198,7 +204,7 @@ index 7d98ec4190a..a58d5a05be2 100644
 Tell GCC that when the GNU C Library (glibc) is used on the target it
 will be version @var{major}.@var{minor} or later.  Normally this can
 diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index fcb7245e95c..67b485e8d0c 100644
+index b370bc76b25..acc78273983 100644
 --- a/gcc/doc/tm.texi
 +++ b/gcc/doc/tm.texi
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@ -217,7 +223,7 @@ index fcb7245e95c..67b485e8d0c 100644
 
 @defmac POST_LINK_SPEC
 diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index c17209daa51..3ec63f6d091 100644
+index 2974dae2701..80e003a38ce 100644
 --- a/gcc/doc/tm.texi.in
 +++ b/gcc/doc/tm.texi.in
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@ -236,11 +242,11 @@ index c17209daa51..3ec63f6d091 100644
 
 @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 40e07354b3d..81bd50b4d7c 100644
+index 5093e8bbfd2..1871b5ab6eb 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -877,13 +877,23 @@ proper position among the other output files.  */
- # define ASM_DEBUG_SPEC ""
+@@ -980,13 +980,23 @@ proper position among the other output files.  */
+ # define ASM_DEBUG_OPTION_SPEC ""
 #endif
 
 +#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
--- a/cross/gcc-aarch64/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-aarch64/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
@ -1,4 +1,4 @@
-From df182f44e2e25e6c7ad70f7e90f246e2c8a1006b Mon Sep 17 00:00:00 2001
+From abe5e7af0cb74a10adad65122f8a0c75c3f15615 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 29 Aug 2021 09:45:27 +0200
 Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
@ -22,7 +22,7 @@ See:
 1 file changed, 20 insertions(+)

 diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 5dd0926d207..0b57a801e23 100644
+index 670b0d72cfe..38c2cd9345f 100644
 --- a/libatomic/configure.tgt
 +++ b/libatomic/configure.tgt
@@ -30,6 +30,26 @@
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@ -24,8 +24,8 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-aarch64
-_pkgbase=10.3.1
-pkgver=10.3.1_git20211027
+_pkgbase=11.2.1
+pkgver=11.2.1_git20211125
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
@ -47,7 +47,8 @@ replaces="libstdc++ binutils"
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
 : "${LANG_OBJC:=true}"
-: "${LANG_GO:=true}"
+# Go frontend presently fails to build due to missing _size_t type in sysinfo.go.
+: "${LANG_GO:=false}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"

@ -226,16 +227,15 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
 	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
 	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+	0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
 	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
 	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
 	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0037-gcc-go-link-to-libucontext.patch
 	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+	0039-Use-generic-errstr.go-implementation-on-musl.patch
 	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-Use-generic-errstr.go-implementation-on-musl.patch
-	0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
 	"

 # we build out-of-tree
@ -681,47 +681,46 @@ gnat() {
 }

 sha512sums="
-2cba43a26debf22fde6442fcc446b7a84ca18bc4281cee1f1f1b50c254eee2615360982d0502df63ed39d7e739e4715373bae75f1c9f226378c7d617478062d9  gcc-10.3.1_git20211027.tar.xz
-a098a33a9d5a0360341c41aec036bce9463a5b67046b19fb2f5bcecfb5fe2aeb58dbd087ec4f8831c503ce57445a7ecd45e500f11476f24d2f441b46cbb99d9c  0001-posix_memalign.patch
-a8da4611f43c0a1641b6f01c230aa706bd8e65ad367acea35051ab7ea821fb4622647c2ceadb6ec7c67388c9af70d06f3c134caa1af47c8542309898e9cd96ba  0002-gcc-poison-system-directories.patch
-e1b5858902dc719bef17d4d6704d66a9662173af57948240282a43b138633932216fa549ea73c54b377aeee4b2658650e756766493a2f2f30e26756b8f9b43da  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-ef6bcc83e17253f403029f23eae7f0075e41fbe8ec6d391545e32b77b0f5c0cb100a2d56be592ef14cb396a48c7c4a195ad211fd761bdd84d95db7f53e7f5e51  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-93023be3c1ce4a2b19f5d1ed0a074a5a93daf74329fb59d8e01cfafe69018053e48f842ecdcd61f58526ba213fac99c6cc6cde30b603897a74972f1c51347596  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4f6f1f3aef017841dd42a131b686b55c777769aa23d4483660f6c852ab441b6d8eac2ee41c9f83cb62a31988851a57a303fe00a96c9e9f47017e67d2eb73c714  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-5cf49b9be154e3f7f077ccb0737606018af5a660a35041ba0d6192082f7db423e7621874cf66af16e525670a75e7d555e0ddb44d2e5b664635267928497b9d09  0007-Enable-Wtrampolines-by-default.patch
-3af183d717288f8aa0b5206bae906b553448f723380932d2da1dc41d56db730c192ef4ec424cd4eba2052acf1b2c5f35f1a7b608fc17fb8100c4c0e1d27d5e1f  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-e92cd9e054601bcb6a16966ae378cb3d3ce0b584c0a179996faa3921fb60668298d200d923dc7ca419bd39c4077c55d57d9703252a0728410dc04d427c0206e8  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-8d094d1e8f90cf44f307ef1e8257138ff61b47aabf58b9ec78080e3ad202de31319436b04f6eff33af5bbf983a0814bb2b9d8b1c8dfdcfaafd48eef414f07b1a  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-dd06807fb9d02c6de37cb44f17ffea2c86d4f22aabf441ab015e8613f9f37068113d52cd00d57365d53b145799f6affdc008b6d8d0a7daebf500e82debc4f53f  0011-libiberty-copy-PIC-objects-during-build-process.patch
-6d9fe75cbb488e0ac6d85bddb4f6f06fa3424889d225d4c25352555dbd5aed7db0be6d276b6214380f3c8bff37e31a1a56da40066a090a46d727a5f68b9f92a8  0012-libitm-disable-FORTIFY.patch
-ccdacf75756dda9af59a7355a87645d39231e9bf6e9a2f1fa8b6351ca0466dccecaa97a263e67c7a95d71176b31ad6d991f665ef5b855d7134e28ba7a8d30c5f  0013-libgcc_s.patch
-5304f689f1016f0df3bfa580c2a8c72ac936faaaf4edd614eebbc9f1ffad40fe2e306cd46c079f4acb407b56335a4414a462001dcc9ef111afc034f1de4b956b  0014-nopie.patch
-3dec2f23a0b6e4ef183cb9ec8550ac2f59873dad3758dd25eac82c9bd10573c83cf429333b584613e272bd6b20825f164ae015902d93cd996d604d0af6e59220  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-51c6ac1b3788a4a925873109e243b5cfbf081825b1890a05d1106ab1d73aead60863d80707b52dcfe75ccfe2ece7ae29a68338bb6a4142bc47d2678a10f60fb8  0016-dlang-update-zlib-binding.patch
-c2d32cd3b4765924d30e96216d5482b006fb9a56a281cc10177d09d04b545c77e81f201cc0218cec5345a2672aa69452236576f57ffdedea37d942db3eca7b33  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-64836685eeb4c87a6f014f20eabe98e212b8082100827a0a3c25d8f0c8e8aa69594bbce0229d7b73fce06ab899030068f64388fa999ecd2914209c4ce7deb902  0018-ada-fix-shared-linking.patch
-e85463e664371e19ac49c4f603c18e2676b395c847fe1fc9969339533d6f9f929e54038a64636ad594f5b3ff53b8fe513b504e06644f5647581aa6b301c3a27e  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-c7e0eb5f426c613f025fe26af82dd16c7be06b944a4eea642440e2b010d3e8455658ec453ca82333823dc7a52c9bf039b2edcf0f3be6e141bf69618c449b0792  0020-add-fortify-headers-paths.patch
-fa2489368639203189f2ac5fd433cc4fb25c356dd21f560043aa7e2e3a94cbf13df3bd48cc9b2eb472876236f0bb807efa6b06506c2f5b51f71567e54004b430  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-bf693daf2fcf497c8a804eed2d039d42b2e95725f584d87bc3d9d5fc057693fbfb9b76fb4818399664014497b6dd9055df32e2e7ea29182eb0078cc76dc14839  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-3c339f40bf3d9059fb5ab14ddde239996d4aebe36e5eb10feecd2ba93ef3e88d56c78f719308458cac74175fd604d7125956568d68c49dbe011c6f8cb6c98c33  0023-Pure-64-bit-MIPS.patch
-43fb576d041698ecaa2f640d6dda8511408d0967d4dd26d597400aa307d0bf9f9a224d8d4d841703453be21c6a321485b84ba0200ae69e260ea043e71a57c0d2  0024-use-pure-64-bit-configuration-where-appropriate.patch
-4aab3f2319a926e25af6f4219001f2f0c250da7ff66bfc7a70c26c6489fffbd52232ec8104e79fb64dfe97e50c8914d333f44eb493629aa0014aa392e3585382  0025-always-build-libgcc_eh.a.patch
-2af7eaf89af20ba945fa8b64592f310632e75afef09f417d6c6efd49f3b9e4624f6659512dcdc077ebc2c38684fcf979a9b4a501e3a414902db2c44bc105eb4c  0026-ada-libgnarl-compatibility-for-musl.patch
-5ef42aa075b048592c6e22417dab5d07f78a7c13914fa1aa9e9c47f53b71bbbf27d3982201a74816b1347cd123048dd669b7c8da4ad4e481d915f67a3ae0f754  0027-ada-musl-support-fixes.patch
-9fbcb2addffa042e4791b715e156402d03b8f3703356d0b9570526df7b5b311595c1b772e5295328f56e05efc7f99e22f5e5b48c5ffb9bf71ebc56afe5321d11  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-88aa25ead0706b775a4ab4d31a2319cfdbb094490798f87f8272a74228683d6a295b42f9af7c57a646ea17b8d393e8b2e52bb57d10e0527c3fbfcad6e1c5e159  0029-gcc-go-Don-t-include-sys-user.h.patch
-9f38276188ae56d037b99df4a068fc71c94b5d17341d4131ef1252c42352a5029768ffdb4a8d12ef92bfd30b5d5f7a3c440ed91d334c85dc66b837d6d23897a9  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-de6fac26c37ee3d5e55129620f6793d80e74db1d922e545591d3d2a1eabb0cd9a6f2f918800a1177a79a9aaea49263ee7b126ccd1a05ecab3f90304f1ce4db68  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0c48d1acca7f33e796de0bd520f727ccc498530c86aa56e1bb1ceb68f2b751f2b265a5cd86ce142213906a4fbc4667e3d5bad07fb8613989ed6a77a7aaa11a29  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-bebd27d21d8b64011b3752fdc9ca03ebcda52ba452aae074a484ed204eac6056ac8ea46cb4413de810e0c3df05a4ccfbb2033582497426447f9c06bd784fbc56  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-dfec489d78a0921cdd9a6a1b35a14566f565413e2f4f0467db37f0650e28be9482111bdfe93274280594ddac9c5ef7f50a9d0443c4f9393f71ef7195d1dd8166  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-89ac788b3a49ce46cf852e5396c9bac99155059700a07736794773291e43dd07c3693999e115e683fc6df110b2081c6d93226b31cced0eff905b58855ff986ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-1473f977f2fc259a8d7abc29d554b0b44fb7d65b5e5cdddf1601505ba2cb3aa2f86e13691e8bdbe2f93c7ae866a6702ef7764adff8c535ccf2f6abf6f2e377dc  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-89c40e32ec0f02d294f4bc576c652b976d63ff8ab4dca9f3a7533bca40e3c267e8a4b02ff5099bf7534174d68e21044c38a9141cc7a9399573bab6fc4fb7ac8d  0037-gcc-go-link-to-libucontext.patch
-2742b50a629835577de5f3ac4a764770fd7a6f42e0e0da5d35673cecf4d24a2d1d4227f3f03745001947c5b69dae72fe0584941257333f916c4db3d240bcbbfa  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-70987dea8cbee832660d8a27e3ebf7b072974e6e8f5112c1365a6a4c84830bdff8342c7a4933486f5f4becabb81a89c46e3c3cde5602e172206c59965cdd5f3f  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-3963bac9cd0f8c442599a5e983f033798266e20e9f7ba72c023724e0917a0ae750856d15e0e9a527f6f60e735ddfa66f8f3e300de47e54cad6c440ddc0403081  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-9f82ce02f355ae38952d17512fc962886f485e06d9ae2ef57f13ccc3f7b298d7e9921f8867b86d7d1fee442df887ba4ee3983521bfa91248872110a1b6c070aa  0041-Use-generic-errstr.go-implementation-on-musl.patch
-40168210e381c329a7ff3e332dedadfa0c60e9da3251c29e660aeeae478da5c5988dc9144a9e6be178202d1d15e2dfa273f5034a861054786ef7cfd4f56c2745  0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+2a682823f9b114c4288a3428dc658ce21679f48a5b901d4792fc4ea09f75e9c9516f8cdc7c70697e1be335d925f99eac01eaf20c117cd5ee685181d37fcc7290  gcc-11.2.1_git20211125.tar.xz
+14ef1a0b284c85859f4db03cb0750c4dcadb8821dd0ec1b04e6872ffd2fa55ae125a99fee986a160bce9448226d08daf05e1a7feda5220e746aaa5f338d78d69  0001-posix_memalign.patch
+950b04c8bf96810dfe4bd4c2ea5218dfacfae0f0b1be9e64cbb1f09bbf67d29565b59094aa4d5cca095355db8cce99c80c99f0463ef296a96faf6b13e38230e0  0002-gcc-poison-system-directories.patch
+1d9c1b028b07644da9182288a26762f294d1ef25804c0227bfd3419a2a8ba579bec7590aaac9a241242bb14e3e371eff81ad26a07d0183be821af59bd6abe4d4  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+5a705aa5ffdc5ab3fb417ddb494486156db4af3b7f9a1d29e1b3ac2e7095f924b2a3f73a73b4d7d20f6ba3c77b062f1b47e7b46c0a8e1992f349abe3cf7f6542  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+87573db27fd83fe9d7c40cefb5bd264e36500280ab2dd39c1763f87f4cfaef3e0d3115f4aadd3b3d65c93a13db17df469e038931335685dfad4adf6b48e96c66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+4055d8b934c8a017bbba74b224c8da105668ea16fc9f244b0dacc9511a89088701b491daec09d95041f640b7f0e994feb17a0803d389818f104578bfaf433623  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+0ffb348414468ea166d5875e0f20f77a813473a6823e26189b010eebb835c91e14b04f360b139fffbc50b30622476a625a5f567d26b6c18ddcbfc88e6d28e54f  0007-Enable-Wtrampolines-by-default.patch
+799117fc233f3172457024a71d4d964c6a367b7ae7246e208ba16192a533bdf484dc72b79eb7ee3629c0eb7fe202d32658a64219c03c9098120c899d9f832309  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+eb47d678ff9a14ad54833b1fdc2d04976e31db741cdf9ac6b213d56df3df3ea61514bdfa5bbe2577b82135517e184de53028663b7aad565613e90c0bafd6513f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+e3d2241e3bb8e67bece8a322cdc707542586f7a1b5da9412eb38dbfa40508e618b8827e3574b21c86b9d263e8ed31941d8885618707c1947d07f86d18d34a9a8  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+e8976a1f1618e94d519852dee346bb787589637905451a6f02b4f8a1ffc5a6fa797a697b8c0964a72830aad32ba412986d45e9f88ae86e3d7c8007d3b1400692  0011-libiberty-copy-PIC-objects-during-build-process.patch
+2cc03796789b6680f43533d41a1966283b6e913b19080a00c4ec6653614f1af66754db7ffca05103bb398e389316c9fca525d2fe00965e1105b210d1d940d507  0012-libitm-disable-FORTIFY.patch
+8fe44a88f66f1d282c5c6db80642ac8ef52f89ccc8287f73eecd1c8d78ee3e5ac890065d173fc3ff00172b8b3984ca484debbf84b9ba649dc5939afdfc4a220a  0013-libgcc_s.patch
+1323a512d063f9a0679c68c9856ede8a6d48ae0c9c52ef14e63d34e6a2b6486fa02301d75554b2d623a369967c71ca35e7c93530c093f334f0cf666c7d1b4911  0014-nopie.patch
+1fb9fb420335d5e87245eb781960bc876a1d60bc69af2a8febad8ddd23cc064e28227a7b9f8389b4f2bb0211259102feaa6e2a7f64457fac06d60a59fdc1c2bb  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+226e68c4561524ece4340107736f5f7f5a31fb725373a5ad472147f443a5fc037d0e0d93562c3e6d333ed43ceef7a2c6a2adad1ad10a464235d168a2dd4ed65e  0016-dlang-update-zlib-binding.patch
+9615d8844f4ffaab6dc61ad452ec9502acfe41029f2225b4b9fa10b034659447fb92b037918d52c615cae30acbb778b8a3d2197c705c90698221ae9e7bb30a32  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+3008df8b4e4f582ced4976e640cb3329904bdefe9d454b13c8e61f3393fee21ec4e49cefc90e6049f85bacced500886681520b46b5063c948b7f5506c050b8cc  0018-ada-fix-shared-linking.patch
+3df7c1285a370e9741f649b26e31074177826b11da5172e5571c982ff1127ba83c6baf6b0666433ab7cd937217550ed2f083460d8ef8ed62531a98e63cbcc4c9  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+5235fbd6bb39c98f9ef702112d5bda05dcba03e897106ef864be606568e0c51e2fb5cadc5df93d162ceb8bf38a544adf9487ddd995ed0b936e86e3fbbc10512e  0020-add-fortify-headers-paths.patch
+9405ea49a6832ae7e2c81c00a9c0c7eeb03b2b4cb887ff2f6352b0f0a5de2c002208a12a6a61ec0e287b114c30090197e867be1a5ed8f462e6f74a63b87fd6f5  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+aa46e49551ff84654166927f62fc81a118dcec1934cf0a95bdbcfe0ed08fac21d6c4b123965d9e718936411e2935c6cd6b60dbba2853c01169fea8d0fa401464  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+62a743dea9f0b644876138f5d336726a32ad62ad1b49c308daf3a11c7122cef292e93fe580fc71aa1ec9c73bb234e485a3d447135f2d169b98af1900d304368e  0023-Pure-64-bit-MIPS.patch
+6959cf80dcceeee5d89eff1337bdf35d7a1d42fe3861a56bebd10ccfba1e5046837b63923a2f1b23109c8494d39a18a400f08342686271d539964ad85c83d2f1  0024-use-pure-64-bit-configuration-where-appropriate.patch
+1f160b42a88f1d6cdf2cf140323d5fb96233f82b5fbeb8efdb861820b25c1b0354e55202655bfb5f571e21fdb18e66a532b7278a014aab828e03b04e9345fe19  0025-always-build-libgcc_eh.a.patch
+fec758a6cbee1d468b966b90e35fe83742b2ebb2cc873634115ab4db599bd84a8c00f687ff18a2f37360126a75f4b8d85d9de3127d44b9076d931479cdd65ab1  0026-ada-libgnarl-compatibility-for-musl.patch
+e49720b5d78fca91bdc0dbc431b70e9e75bbd6a95ba2e856dce6764dd9759fc830bb445ce8aa8fc9aa6ace80c474e9c2a947c6b23a1178b2cb6bd8780447350a  0027-ada-musl-support-fixes.patch
+199b87e0844c361fc176755cd5846ea48f4a18382609633d0f4d1fb3e11a41ad93168f9b4f44ed993dca977354c0072637779658941cebe6adebfea28b28531c  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+17642cb9f179007b898f62cb4d6c9b436876cf667606c8003e02a782f09d29e17a301225efb94102094cc7f2b3efb413dd5ea2581e7e421e2b814f29f1b7e776  0029-gcc-go-Don-t-include-sys-user.h.patch
+08268c1ec6b6f0097ea15230f45f2a7231b8c5f9e6f90fcb102f86fe8e83c81a1755482a88415ab11a3de62e82769e4f0e3e029b812e477fcb6ddccb5f086734  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+1345b99c20a9f7335c8af5e619c769f0555e46c18ba0f084d2655bce1581d11353f278dd9c94874edaceed1bf9d11a4a720b5263197c0cc9ce288f664e26eb01  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ff8fb2cd67dd4723b271c2d1b6bca80e062d2fe31fe9f71aa1b83bab1c131decff4b4ddf8da9ce188cd28eee0fa1cf04d8ffc863033c5ce0096a6dd7b748e3b5  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+ce677dad505e56c67c79f7836888b6c28feaa4172d41c8c7573b931e6baff56ca0e5b9e6902b576d784735c5d278bc8a23e08a83597e3f41d11be9e14cf1dc59  0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+19743886041ed1fc8e3afebc48b5c196c032f4bd8d20a8deb99ba83ec7ffb3a5e18f1686a705a0578ce120f702493e444c599c9228f2b466abbcb8820f313d7a  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+150dba551824d99a3b58ea531c939237ce3aa642d04e5a2f774fe96bb27f1aa498d2b95d74369dd893da6142f9a8e5fe8966c72f38e21fc14ff614f90e7374ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+2e09c90e5b9ba295949d5a9986ca4e13774981fb918d35098ab560139d34703b15924767bb54ffadf38b061b2b395c50f53c367c96959e5e9d1e7c65224171f4  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+01b3010bdfcec65d68f851ed425fa22c744e6744aaf4b0fe7699c7a678e970e11bc7b907188fbacababacadf520b515883944480e91262259e0a03a0966d7540  0037-gcc-go-link-to-libucontext.patch
+f7eefa7ae1f31fc7bc1721578d4c1642f2ef5feda37dec03264dde53717474437722ee646ab9a837d888eedbee4ea3c407f20cc4c7cb36d34a81e56b3ea02c79  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+83deca7a68c6e1ce934f79b5d1e1a4b8b8a25c7bc24c3ef934307c232e168d9b17048a00a040fe81ac0cf6d4a23beefb292369c35d9896dab440dda228c90b0a  0039-Use-generic-errstr.go-implementation-on-musl.patch
+4074c62c2ee0ed555f01bf0cc69e32ef275bc3ac74de1d428ba1a2ac59fae973fe6f9aab8b3796df4bda7ab7cf220e5e1cbfdf103f41e4cbea175067a947d08f  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+1fe1b1e9ec288f65cd0d80a74b0a060b29c40e501f666b01e2825b61949be4568aeaf7cf473142889a7fd5e011b096837a651582d64fce67500fcb2ba39e16ce  0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
 "
--- a/cross/gcc-armhf/0001-posix_memalign.patch
+++ b/cross/gcc-armhf/0001-posix_memalign.patch
@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From 135cfe09a582b4076324a5f350f775c18164aa1f 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
@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
 1 file changed, 5 insertions(+), 4 deletions(-)

 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 87344d9383f..ece428df487 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
--- a/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-armhf/0002-gcc-poison-system-directories.patch
@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From b0d26972848280c3035668a6caccf0ca5475f062 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
@ -26,10 +26,10 @@ Upstream-Status: Pending
 7 files changed, 68 insertions(+)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 100644
+index a75b44ee47e..d15105a73f3 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -682,6 +682,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
 Common Var(warn_return_local_addr) Init(1) Warning
 Warn about returning a pointer/reference to a local or temporary variable.
 
@ -41,10 +41,10 @@ index ec5235c3a41..ca942863064 100644
 Common Var(warn_shadow) Warning
 Warn when one variable shadows another.  Same as -Wshadow=global.
 diff --git a/gcc/config.in b/gcc/config.in
-index 364eba47737..9551c0dfdf9 100644
+index 2de5a463315..059c818c895 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -224,6 +224,12 @@
+@@ -218,6 +218,12 @@
 #endif
 
 
@ -58,18 +58,18 @@ index 364eba47737..9551c0dfdf9 100644
    optimizer and back end) to be checked for dynamic type safety at runtime.
    This is quite expensive. */
 diff --git a/gcc/configure b/gcc/configure
-index 84e0ea21054..3bb7b5b318a 100755
+index 708328e1670..4b977e313b5 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1010,6 +1010,7 @@ with_system_zlib
- enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
 enable_link_mutex
+ enable_link_serialization
 enable_version_specific_runtime_libs
 +enable_poison_system_directories
 enable_plugin
 enable_host_shared
 enable_libquadmath_support
-@@ -1766,6 +1767,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 100755
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@ -99,10 +99,10 @@ index 84e0ea21054..3bb7b5b318a 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 100644
+index df1c9cc3200..5461bab88a9 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 
@ -120,10 +120,10 @@ index d068618bd8f..44ea4725620 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 5a4b3c6c234..9d1126e9751 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
 -Wparentheses  -Wno-pedantic-ms-format @gol
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
 -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -7727,6 +7728,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@ -147,10 +147,10 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..b2200c5185a 100644
+index 8ba410c9e17..a83ba34ac4b 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1041,6 +1041,8 @@ proper position among the other output files.  */
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@ -160,7 +160,7 @@ index 9f790db0daf..b2200c5185a 100644
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 8a2bda00f80..9098ab044ab 100644
+index 446d280321d..fbfc0ce03b8 100644
 --- a/gcc/incpath.c
 +++ b/gcc/incpath.c
@@ -26,6 +26,7 @@
@ -171,7 +171,7 @@ index 8a2bda00f80..9098ab044ab 100644
 
 /* Microsoft Windows does not natively support inodes.
    VMS has non-numeric inodes.  */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
 	}
       fprintf (stderr, _("End of search list.\n"));
     }
--- a/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armhf/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@ -1,4 +1,4 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af 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.
@ -9,10 +9,10 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d9a4b78ffd..129dc5b11f3 100644
+index 9d1126e9751..46e45274859 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@ -23,10 +23,10 @@ index 9d9a4b78ffd..129dc5b11f3 100644
 @opindex u
 Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index b2200c5185a..625c9ab7902 100644
+index a83ba34ac4b..8c15de433ee 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1039,6 +1039,7 @@ proper position among the other output files.  */
+@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
    "%{flto|flto=*:%<fcompare-debug*} \
     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
--- a/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 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,
@ -10,10 +10,10 @@ Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
 2 files changed, 10 insertions(+)

 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index db91a36794a..ed976c71404 100644
+index 9f993c4aff2..7db314195ff 100644
 --- a/gcc/c-family/c-cppbuiltin.c
 +++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1385,6 +1385,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1421,6 +1421,10 @@ c_cpp_builtins (cpp_reader *pfile)
   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
 
@ -25,10 +25,10 @@ index db91a36794a..ed976c71404 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 129dc5b11f3..1b7ef0c68c6 100644
+index 46e45274859..1b4a698a191 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
--- a/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 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,
@ -22,7 +22,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
 14 files changed, 36 insertions(+), 19 deletions(-)

 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index e587e2e9ad6..1d1017aa523 100644
+index 7f2529a2a1d..b097e1688aa 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@ -34,7 +34,7 @@ index e587e2e9ad6..1d1017aa523 100644
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index e25fcac3c59..22b2f7b0d14 100644
+index c1dae8ca2cf..a87dc740171 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@ -47,7 +47,7 @@ index e25fcac3c59..22b2f7b0d14 100644
   %{shared:-shared}						\
   %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0ec3aa53189..f8bda84de2a 100644
+index 0c1c4e70b6b..8b581afacdd 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@ -59,16 +59,19 @@ index 0ec3aa53189..f8bda84de2a 100644
    SUBTARGET_EXTRA_LINK_SPEC
 
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index ff2e880b1fa..7f30c363e4a 100644
+index 5ebbf42a13d..902378e1bad 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
   "%{static-libasan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
 -  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
+ #undef LIBHWASAN_EARLY_SPEC
+ #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
+@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
   "%{static-libtsan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
@ -84,10 +87,10 @@ index ff2e880b1fa..7f30c363e4a 100644
 
 #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index ae4aa844f02..54b91c0492a 100644
+index a23e7ab3eb7..12ac8cb93a9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
   { "link_emulation", GNU_USER_LINK_EMULATION },\
   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
 
@ -97,7 +100,7 @@ index ae4aa844f02..54b91c0492a 100644
     %{!static: \
       %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 785c68220b8..21dd66b412a 100644
+index f3e25b1412a..712b0f1c30e 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@ -109,7 +112,7 @@ index 785c68220b8..21dd66b412a 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ee38e218aec..0325971d818 100644
+index ac40c3dfd3f..6e19e25c35a 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
@ -122,7 +125,7 @@ index ee38e218aec..0325971d818 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 5d0782100bb..4be5fbb2191 100644
+index a390bcece83..be0ee289367 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@ -134,7 +137,7 @@ index 5d0782100bb..4be5fbb2191 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 4afef7c228c..ba1a6e60e05 100644
+index fce5b896e6e..ee29979dd34 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
@ -142,14 +145,14 @@ index 4afef7c228c..ba1a6e60e05 100644
 
 #define LINK_SPEC "\
 +-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+ -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
- %{shared} \
+ %{mbig-endian:-EB} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 2ded3301282..a1e44ddcc0d 100644
+index e3f2cd254f6..43499ed29cf 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -457,13 +457,13 @@ extern int dot_symbols;
+@@ -374,13 +374,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 
@ -166,7 +169,7 @@ index 2ded3301282..a1e44ddcc0d 100644
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..9490b84a153 100644
+index 510abe169c5..3c1f3a8ec5d 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
@ -179,7 +182,7 @@ index 9ade72114e9..9490b84a153 100644
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 6919b468f06..56d52d41b31 100644
+index daa48fdfc2b..2fcfc5d770f 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@ -192,7 +195,7 @@ index 6919b468f06..56d52d41b31 100644
    %{!shared: \
       %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 63853e60c03..de6d8675456 100644
+index 2550d7ee8f0..7596d0b2757 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@ -205,10 +208,10 @@ index 63853e60c03..de6d8675456 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 625c9ab7902..7aec9d3a016 100644
+index 8c15de433ee..be1508e5abe 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -695,8 +695,11 @@ proper position among the other output files.  */
+@@ -737,8 +737,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -222,7 +225,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -713,8 +716,11 @@ proper position among the other output files.  */
+@@ -773,8 +776,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -236,7 +239,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -731,8 +737,11 @@ proper position among the other output files.  */
+@@ -791,8 +797,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -250,7 +253,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -747,8 +756,11 @@ proper position among the other output files.  */
+@@ -807,8 +816,11 @@ proper position among the other output files.  */
 #define STATIC_LIBUBSAN_LIBS \
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
--- a/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From a2c4ea1f97c358486316d0e8536b021faa4581a5 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index c49da99d395..93f25319005 100644
+index 2005b783c68..c5c6af427cc 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
+@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
 of the destination region.  Same as -Wformat-overflow=1.
 
 Wformat-security
@ -20,7 +20,7 @@ index c49da99d395..93f25319005 100644
 Warn about possible security problems with format functions.
 
 Wformat-signedness
-@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 
 Wformat=
--- a/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch
@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 100644
+index d15105a73f3..29f9504cb68 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
+@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 
 Wtrampolines
--- a/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From 02c1d7932c3c3b9813431937dd82971a3ca86088 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
@ -10,10 +10,10 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
 2 files changed, 8 insertions(+), 2 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7aec9d3a016..daeb4d0c8ea 100644
+index be1508e5abe..e495b222095 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -886,6 +886,12 @@ proper position among the other output files.  */
+@@ -989,6 +989,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 
@ -26,20 +26,20 @@ index 7aec9d3a016..daeb4d0c8ea 100644
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1170,7 +1176,7 @@ static const char *cc1_options =
+@@ -1288,7 +1294,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
 diff --git a/gcc/params.opt b/gcc/params.opt
-index 4aec480798b..eaecfab37ad 100644
+index 8ba281b4cfa..bab39cdf8a2 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -946,7 +946,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
 The maximum number of SSA_NAME assignments to follow in determining a value.
 
 -param=ssp-buffer-size=
--- a/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From a91c942466bed1046461500c00e0ee1c9a68481d 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
@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
 2 files changed, 2 insertions(+)

 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index a9391d8d167..f7eee24dc8c 100644
+index ab716ff04ea..e595268d9fc 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
@ -38,10 +38,10 @@ index a9391d8d167..f7eee24dc8c 100644
 
 all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index a0f84b0cfa0..ab24a47a2fd 100644
+index 8edd2e05639..63f61fcf96f 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
-@@ -548,6 +548,7 @@ uninstall-am:
+@@ -553,6 +553,7 @@ uninstall-am:
 
 
 .po.mo:
--- a/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
 1 file changed, 3 insertions(+)

 diff --git a/include/libiberty.h b/include/libiberty.h
-index 141cb886a85..fa0e78eb62f 100644
+index f4c0fe11d6f..cf4b1043e4d 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
-@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
+@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.  */
 
--- a/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch
@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 5fe2309817ce1cdad4183921faf890886ea34493 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
@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
 1 file changed, 1 insertion(+)

 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d6b302e02fd..fd39928546f 100644
+index 4f1213b983b..d0224649d30 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
 	  $(RANLIB) $(TARGETLIB); \
--- a/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armhf/0012-libitm-disable-FORTIFY.patch
@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 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
@ -8,7 +8,7 @@ Subject: [PATCH] libitm: disable FORTIFY
 1 file changed, 10 insertions(+)

 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index a3d84896cc5..ecb281d5919 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
--- a/cross/gcc-armhf/0013-libgcc_s.patch
+++ b/cross/gcc-armhf/0013-libgcc_s.patch
@ -1,4 +1,4 @@
-From 75c269d1783e1b83d9bc4f6c826f10f63a0f51a5 Mon Sep 17 00:00:00 2001
+From f2ff82d829d3d905a48fb877230ef5a096605cd4 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
@ -10,10 +10,10 @@ Subject: [PATCH] libgcc_s
 3 files changed, 6 insertions(+), 6 deletions(-)

 diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index 47d52550e5e..9cb8cc7950e 100644
+index 16765718cc3..4a855b791b9 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
-@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+@@ -11063,10 +11063,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
@ -27,11 +27,11 @@ index 47d52550e5e..9cb8cc7950e 100644
 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
       }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 83301a1445f..89fdc7eb587 100644
+index ef463848f9d..1a3de052c80 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
-@@ -516,7 +516,7 @@ __cpu_indicator_init (void)
-   return 0;
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+ 			     __cpu_features2);
 }
 
 -#if defined SHARED && defined USE_ELF_SYMVER
--- a/cross/gcc-armhf/0014-nopie.patch
+++ b/cross/gcc-armhf/0014-nopie.patch
@ -1,4 +1,4 @@
-From 94df93e5a0241488343d6002912dfbd680df8aba Mon Sep 17 00:00:00 2001
+From ca92d7dea9d05e515e52048c74408652e12787a8 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
@ -9,10 +9,10 @@ Subject: [PATCH] nopie
 2 files changed, 40 insertions(+)

 diff --git a/gcc/configure b/gcc/configure
-index 3bb7b5b318a..1632337439c 100755
+index 4b977e313b5..592e81e40f6 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -30784,6 +30784,33 @@ fi
+@@ -32300,6 +32300,33 @@ fi
 $as_echo "$gcc_cv_no_pie" >&6; }
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
@ -47,10 +47,10 @@ index 3bb7b5b318a..1632337439c 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 44ea4725620..6e4d4092af7 100644
+index 5461bab88a9..1577529ffb7 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6866,6 +6866,19 @@ AC_CACHE_CHECK([for -no-pie option],
+@@ -7571,6 +7571,19 @@ AC_CACHE_CHECK([for -no-pie option],
    LDFLAGS="$saved_LDFLAGS"])
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
--- a/cross/gcc-armhf/0015-libffi-use-linux-instead-of-__gnu_linux__-for-mu.patch
+++ b/cross/gcc-armhf/0015-libffi-use-linux-instead-of-__gnu_linux__-for-mu.patch
@ -1,4 +1,4 @@
-From ac79c17450c4e3a84ad884583ae80f5949f7ffc0 Mon Sep 17 00:00:00 2001
+From 96f17362cdc323db0d556cc13f2ac712ec03db62 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
--- a/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
+++ b/cross/gcc-armhf/0016-dlang-update-zlib-binding.patch
@ -1,4 +1,4 @@
-From ebd9bb4708ce923785eec4d3760536cdd4051e0a Mon Sep 17 00:00:00 2001
+From 20de5d928fc0b3738d62eb2ef0a697cd733a8bdd 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
--- a/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+++ b/cross/gcc-armhf/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
@ -1,4 +1,4 @@
-From 3e29fbd28d442a79b56610c515e9b45933244ae8 Mon Sep 17 00:00:00 2001
+From 1c64f83b19fce8cf0bacff9e1ee3232513d2ef9e 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
@ -9,10 +9,10 @@ Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep
 2 files changed, 16 insertions(+)

 diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 94e42bf5509..73f2e4b7f01 100644
+index 88c027d0c28..48ef12aaa5e 100644
 --- a/libphobos/configure.tgt
 +++ b/libphobos/configure.tgt
-@@ -35,6 +35,7 @@ case "${target}" in
+@@ -38,6 +38,7 @@ case "${target}" in
 	;;
   mips*-*-linux*)
 	LIBPHOBOS_SUPPORTED=yes
@ -21,10 +21,10 @@ index 94e42bf5509..73f2e4b7f01 100644
   power*-*-linux*)
 	LIBPHOBOS_SUPPORTED=yes
 diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 9febcff849b..cb34e2108bd 100644
+index 59df921ba41..9ee9f943948 100644
 --- a/libphobos/libdruntime/core/sys/posix/fcntl.d
 +++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,21 @@ else version (CRuntime_Musl)
+@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
             F_SETLKW       = 7,
         }
     }
--- a/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
+++ b/cross/gcc-armhf/0018-ada-fix-shared-linking.patch
@ -1,4 +1,4 @@
-From 61ee4e71b7c6495afb6b5d71a3c3c3aef7e30bb7 Mon Sep 17 00:00:00 2001
+From 35c96f4e7ae99786e8f519bd7c1c6a3511dd18d1 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
@ -8,7 +8,7 @@ Subject: [PATCH] ada: fix shared linking
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 02c413a412f..f0e52a87d6e 100644
+index 5cd5ef64f56..1c611a82cab 100644
 --- a/gcc/ada/link.c
 +++ b/gcc/ada/link.c
@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
--- a/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/cross/gcc-armhf/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@ -1,4 +1,4 @@
-From 891ef65973d5e72ccad2c55834c0d0371e7427a7 Mon Sep 17 00:00:00 2001
+From e9d428d711843b1ff735da53f81efaca5ed1e962 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
@ -8,7 +8,7 @@ Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
 1 file changed, 1 insertion(+)

 diff --git a/Makefile.in b/Makefile.in
-index 36e369df6e7..63627db68cf 100644
+index 047be0255e2..426949aa91c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -170,6 +170,7 @@ BUILD_EXPORTS = \
--- a/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
+++ b/cross/gcc-armhf/0020-add-fortify-headers-paths.patch
@ -1,4 +1,4 @@
-From 17174b70ba34434fe93901d8a97f0890ece0fa5f Mon Sep 17 00:00:00 2001
+From 131337e43b77d251e6e0128fd95cf11ed1fa2c7d 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
@ -8,7 +8,7 @@ Subject: [PATCH] add fortify-headers paths
 1 file changed, 2 insertions(+)

 diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 95654bcdb5a..d88df8f154a 100644
+index 4e1db60fced..7fcf402b416 100644
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
--- a/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/cross/gcc-armhf/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@ -1,4 +1,4 @@
-From 4c063fda21dc47d87d000995c8fbce46031eb5db Mon Sep 17 00:00:00 2001
+From 803acb891329bc74ac5c7ae99904dd0a0d04759a 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
@ -13,10 +13,10 @@ Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index daeb4d0c8ea..6920bec0fa0 100644
+index e495b222095..ab8866f409f 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -894,8 +894,7 @@ proper position among the other output files.  */
+@@ -997,8 +997,7 @@ proper position among the other output files.  */
 
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
--- a/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/cross/gcc-armhf/0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@ -1,4 +1,4 @@
-From 613210b82caaafb36d7fe39514fa0c5adb363df8 Mon Sep 17 00:00:00 2001
+From 41201c14bee1ece2c15435bc76cc07e5460e566b 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
@ -9,10 +9,10 @@ Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 6920bec0fa0..40e07354b3d 100644
+index ab8866f409f..5093e8bbfd2 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -696,10 +696,10 @@ proper position among the other output files.  */
+@@ -738,10 +738,10 @@ proper position among the other output files.  */
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
@ -25,7 +25,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -717,10 +717,10 @@ proper position among the other output files.  */
+@@ -777,10 +777,10 @@ proper position among the other output files.  */
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
@ -38,7 +38,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -738,10 +738,10 @@ proper position among the other output files.  */
+@@ -798,10 +798,10 @@ proper position among the other output files.  */
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
@ -51,7 +51,7 @@ index 6920bec0fa0..40e07354b3d 100644
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -757,10 +757,10 @@ proper position among the other output files.  */
+@@ -817,10 +817,10 @@ proper position among the other output files.  */
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
 #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--- a/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
+++ b/cross/gcc-armhf/0023-Pure-64-bit-MIPS.patch
@ -1,4 +1,4 @@
-From ca9cae44a1a3b74a48d1370d077e1aea6d36d37f Mon Sep 17 00:00:00 2001
+From 71e4e4a671201d777eda4607ce380ba429bd307b 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
@ -9,10 +9,10 @@ Subject: [PATCH] Pure 64-bit MIPS
 2 files changed, 7 insertions(+), 7 deletions(-)

 diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 3ce0c19a29a..b9920b49167 100644
+index 47aac9d3d61..4ad81059a86 100644
 --- a/gcc/config/mips/mips.h
 +++ b/gcc/config/mips/mips.h
-@@ -3424,11 +3424,11 @@ struct GTY(())  machine_function {
+@@ -3425,11 +3425,11 @@ struct GTY(())  machine_function {
 /* If we are *not* using multilibs and the default ABI is not ABI_32 we
    need to change these from /lib and /usr/lib.  */
 #if MIPS_ABI_DEFAULT == ABI_N32
@ -29,7 +29,7 @@ index 3ce0c19a29a..b9920b49167 100644
 
 /* Load store bonding is not supported by micromips and fix_24k.  The
 diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index ceb58d3b5f3..8116e23ebba 100644
+index 130e1f04707..a64ac2bbb5b 100644
 --- a/gcc/config/mips/t-linux64
 +++ b/gcc/config/mips/t-linux64
@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
--- a/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
+++ b/cross/gcc-armhf/0024-use-pure-64-bit-configuration-where-appropriate.patch
@ -1,4 +1,4 @@
-From bc154c0c49b06871a9d206dc7010f14d8aeaf1f9 Mon Sep 17 00:00:00 2001
+From 43a75f797d0f0217665889830e061dbe74ac69d0 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
@ -14,7 +14,7 @@ Subject: [PATCH] use pure 64-bit configuration where appropriate
 7 files changed, 15 insertions(+), 13 deletions(-)

 diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 83e59e33b85..6ec56fdf6a8 100644
+index 241b0ef20b6..18e63b34d8b 100644
 --- a/gcc/config/aarch64/t-aarch64-linux
 +++ b/gcc/config/aarch64/t-aarch64-linux
@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
@ -27,7 +27,7 @@ index 83e59e33b85..6ec56fdf6a8 100644
 
 MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index 1171e218578..256f8c079ba 100644
+index d288b093522..2949033aa04 100644
 --- a/gcc/config/i386/t-linux64
 +++ b/gcc/config/i386/t-linux64
@@ -33,6 +33,6 @@
@ -64,7 +64,7 @@ index aeb7440c492..ab14c455d8d 100644
 endif
 
 diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index 264a7e27524..d1e460811cc 100644
+index e11a118cb5f..df81dc04a32 100644
 --- a/gcc/config/rs6000/t-linux64
 +++ b/gcc/config/rs6000/t-linux64
@@ -28,8 +28,8 @@
--- a/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
+++ b/cross/gcc-armhf/0025-always-build-libgcc_eh.a.patch
@ -1,4 +1,4 @@
-From fd531b1754dfa64791342c8e76001a509b3646ca Mon Sep 17 00:00:00 2001
+From e8fa599cbaa9e0fe6ae8aaded7c0443807d695cb 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
@ -10,10 +10,10 @@ highly inspired by:
 1 file changed, 6 insertions(+), 5 deletions(-)

 diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
-index 851e7657d07..99ec513a1a6 100644
+index 2c8be561eb5..c557750b1b3 100644
 --- a/libgcc/Makefile.in
 +++ b/libgcc/Makefile.in
-@@ -956,8 +956,9 @@ ifneq ($(LIBUNWIND),)
+@@ -957,8 +957,9 @@ ifneq ($(LIBUNWIND),)
 all: libunwind.a
 endif
 
@ -24,7 +24,7 @@ index 851e7657d07..99ec513a1a6 100644
 ifneq ($(LIBUNWIND),)
 all: libunwind$(SHLIB_EXT)
 libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1159,10 +1160,6 @@ install-libunwind:
+@@ -1160,10 +1161,6 @@ install-libunwind:
 install-shared:
 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
 
@ -35,7 +35,7 @@ index 851e7657d07..99ec513a1a6 100644
 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
 		@shlib_base_name@,libgcc_s,$(subst \
 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1179,6 +1176,10 @@ ifeq ($(enable_gcov),yes)
+@@ -1180,6 +1177,10 @@ ifeq ($(enable_gcov),yes)
 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
 endif
 
--- a/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
+++ b/cross/gcc-armhf/0026-ada-libgnarl-compatibility-for-musl.patch
@ -1,4 +1,4 @@
-From 53958c5c47d20094e2d5b5d1376b45058241d3b4 Mon Sep 17 00:00:00 2001
+From eeb35a7b61205438613b344ab393b23bd54b14b5 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
@ -9,10 +9,10 @@ Subject: [PATCH] ada: libgnarl compatibility for musl
 2 files changed, 3 insertions(+), 61 deletions(-)

 diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index ef449af33d1..bd7312e6686 100644
+index 2272f83d68d..1d78456544a 100644
 --- a/gcc/ada/libgnarl/s-osinte__linux.ads
 +++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -399,12 +399,6 @@ package System.OS_Interface is
+@@ -401,12 +401,6 @@ package System.OS_Interface is
    PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
 
@ -25,7 +25,7 @@ index ef449af33d1..bd7312e6686 100644
    function pthread_rwlock_init
      (mutex : access pthread_rwlock_t;
       attr  : access pthread_rwlockattr_t) return int;
-@@ -466,11 +460,6 @@ package System.OS_Interface is
+@@ -468,11 +462,6 @@ package System.OS_Interface is
       protocol : int) return int;
    pragma Import (C, pthread_mutexattr_setprotocol);
 
@ -38,10 +38,10 @@ index ef449af33d1..bd7312e6686 100644
       sched_priority : int;  --  scheduling priority
    end record;
 diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
-index c45559e5ba0..0b0f173e7d4 100644
+index 757a6cdfdad..82df94f6a00 100644
 --- a/gcc/ada/libgnarl/s-taprop__linux.adb
 +++ b/gcc/ada/libgnarl/s-taprop__linux.adb
-@@ -202,9 +202,6 @@ package body System.Task_Primitives.Operations is
+@@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
    pragma Import
      (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
 
@ -51,7 +51,7 @@ index c45559e5ba0..0b0f173e7d4 100644
    --  We do not have pragma Linker_Options ("-lcap"); here, because this
    --  library is not present on many Linux systems. 'libcap' is the Linux
    --  "capabilities" library, called by __gnat_has_cap_sys_nice.
-@@ -214,38 +211,6 @@ package body System.Task_Primitives.Operations is
+@@ -210,38 +207,6 @@ package body System.Task_Primitives.Operations is
    --  Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
    --  GNU/Linux, so we map 0 .. 98 to 1 .. 99.
 
@ -84,13 +84,13 @@ index c45559e5ba0..0b0f173e7d4 100644
 -      return Ceiling_Support;
 -   end Get_Ceiling_Support;
 -
-   pragma Warnings (Off, "non-static call not allowed in preelaborated unit");
+-   pragma Warnings (Off, "non-preelaborable call not allowed*");
 -   Ceiling_Support : constant Boolean := Get_Ceiling_Support;
-   pragma Warnings (On, "non-static call not allowed in preelaborated unit");
+-   pragma Warnings (On, "non-preelaborable call not allowed*");
    --  True if the locking policy is Ceiling_Locking, and the current process
    --  has permission to use this policy. The process has permission if it is
    --  running as 'root', or if the capability was set by the setcap command,
-@@ -348,7 +313,9 @@ package body System.Task_Primitives.Operations is
+@@ -344,7 +309,9 @@ package body System.Task_Primitives.Operations is
    -- Init_Mutex --
    ----------------
 
@ -100,7 +100,7 @@ index c45559e5ba0..0b0f173e7d4 100644
       Mutex_Attr : aliased pthread_mutexattr_t;
       Result, Result_2 : C.int;
 
-@@ -360,16 +327,7 @@ package body System.Task_Primitives.Operations is
+@@ -356,16 +323,7 @@ package body System.Task_Primitives.Operations is
          return Result;
       end if;
 
@ -118,7 +118,7 @@ index c45559e5ba0..0b0f173e7d4 100644
          Result := pthread_mutexattr_setprotocol
            (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
          pragma Assert (Result = 0);
-@@ -409,11 +367,6 @@ package body System.Task_Primitives.Operations is
+@@ -405,11 +363,6 @@ package body System.Task_Primitives.Operations is
             Result := pthread_rwlockattr_init (RWlock_Attr'Access);
             pragma Assert (Result = 0);
 
--- a/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
+++ b/cross/gcc-armhf/0027-ada-musl-support-fixes.patch
@ -1,4 +1,4 @@
-From f55ddf45b97fc7f827349c3ffe0375353ae6bf59 Mon Sep 17 00:00:00 2001
+From 7448ade62ac32dfe9802eb1d7a7a93b2f3702797 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
@ -11,10 +11,10 @@ Subject: [PATCH] ada: musl support fixes
 4 files changed, 32 insertions(+), 30 deletions(-)

 diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index 55ff9b0f3d5..0fadf4e4b79 100644
+index 987eff0abba..03c8bc6f496 100644
 --- a/gcc/ada/Makefile.rtl
 +++ b/gcc/ada/Makefile.rtl
-@@ -1533,7 +1533,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+@@ -1748,7 +1748,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
   s-intman.adb<libgnarl/s-intman__posix.adb \
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -23,16 +23,16 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
   a-exetim.adb<libgnarl/a-exetim__posix.adb \
   a-exetim.ads<libgnarl/a-exetim__default.ads \
   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2083,7 +2083,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
-   s-osinte.adb<libgnarl/s-osinte__posix.adb \
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+@@ -2355,7 +2355,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
+   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
 -  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
   system.ads<libgnat/system-linux-ppc.ads
-@@ -2112,7 +2112,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2386,7 +2386,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
 endif
 
 # ARM linux, GNU eabi
@ -41,7 +41,7 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
   LIBGNAT_TARGET_PAIRS = \
   a-intnam.ads<libgnarl/a-intnam__linux.ads \
   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2305,7 +2305,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2597,7 +2597,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -49,8 +49,8 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-ia64.ads
-@@ -2401,7 +2401,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+   $(GNATRTL_128BIT_PAIRS) \
+@@ -2699,7 +2699,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
   s-taspri.ads<libgnarl/s-taspri__posix.ads \
   $(TRASYM_DWARF_UNIX_PAIRS) \
@ -58,24 +58,24 @@ index 55ff9b0f3d5..0fadf4e4b79 100644
 +  s-tsmona.adb<libgnat/s-tsmona.adb \
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-x86.ads
+   $(GNATRTL_128BIT_PAIRS) \
 diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 595abf87d65..00858c24f53 100644
+index 2e54e69643a..e7e6507e2e0 100644
 --- a/gcc/ada/adaint.c
 +++ b/gcc/ada/adaint.c
-@@ -90,6 +90,11 @@
+@@ -91,6 +91,11 @@
 #include <sys/param.h>
 #include <sys/pstat.h>
 #endif
 + 
-+#if defined (linux)
+#if defined (linux) || defined(__linux__)
 +#define _GNU_SOURCE 1
 +#include <sched.h>
 +#endif
 
 #ifdef __PikeOS__
 #define __BSD_VISIBLE 1
-@@ -3308,7 +3313,6 @@ __gnat_lwp_self (void)
+@@ -3442,7 +3447,6 @@ __gnat_lwp_self (void)
 #endif
 
 #if defined (__linux__)
@ -83,7 +83,7 @@ index 595abf87d65..00858c24f53 100644
 
 /* glibc versions earlier than 2.7 do not define the routines to handle
    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3318,7 +3322,7 @@ __gnat_lwp_self (void)
+@@ -3452,7 +3456,7 @@ __gnat_lwp_self (void)
 
 /* Dynamic cpu sets */
 
@ -92,7 +92,7 @@ index 595abf87d65..00858c24f53 100644
 __gnat_cpu_alloc (size_t count)
 {
   return CPU_ALLOC (count);
-@@ -3331,33 +3335,33 @@ __gnat_cpu_alloc_size (size_t count)
+@@ -3465,33 +3469,33 @@ __gnat_cpu_alloc_size (size_t count)
 }
 
 void
@ -134,7 +134,7 @@ index 595abf87d65..00858c24f53 100644
 }
 
 size_t
-@@ -3367,23 +3371,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+@@ -3501,23 +3505,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
 }
 
 void
@ -164,10 +164,10 @@ index 595abf87d65..00858c24f53 100644
 #endif /* !CPU_ALLOC */
 #endif /* __linux__ */
 diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 311e240dfcc..1c4d0050103 100644
+index 85997b9ba68..fd10e5b5589 100644
 --- a/gcc/ada/adaint.h
 +++ b/gcc/ada/adaint.h
-@@ -316,13 +316,11 @@ extern void   *__gnat_lwp_self			   (void);
+@@ -325,13 +325,11 @@ extern void   *__gnat_lwp_self			   (void);
 
 /* Routines for interface to required CPU set primitives */
 
@ -186,10 +186,10 @@ index 311e240dfcc..1c4d0050103 100644
 
 #if defined (_WIN32)
 diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index af4417fab90..bab6bf3ca87 100644
+index ec9db3a6a4c..6f92e50dd67 100644
 --- a/gcc/ada/terminals.c
 +++ b/gcc/ada/terminals.c
-@@ -1145,7 +1145,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1132,7 +1132,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 /* POSIX does not specify how to open the master side of a terminal.Several
    methods are available (system specific):
       1- using a cloning device (USE_CLONE_DEVICE)
@ -198,7 +198,7 @@ index af4417fab90..bab6bf3ca87 100644
       3- openpty                (USE_OPENPTY)
 
    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1159,7 +1159,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
+@@ -1146,7 +1146,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
 #if defined (__APPLE__) || defined (BSD)
 #define USE_OPENPTY
 #elif defined (__linux__)
@ -207,7 +207,7 @@ index af4417fab90..bab6bf3ca87 100644
 #elif defined (__sun__)
 #define USE_CLONE_DEVICE "/dev/ptmx"
 #elif defined (_AIX)
-@@ -1208,8 +1208,8 @@ allocate_pty_desc (pty_desc **desc) {
+@@ -1195,8 +1195,8 @@ allocate_pty_desc (pty_desc **desc) {
    int  master_fd   = -1;
    char *slave_name = NULL;
 
--- a/cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+++ b/cross/gcc-armhf/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
@ -1,4 +1,4 @@
-From 546f3c4e5efed3ed0054d7639763a373dce62139 Mon Sep 17 00:00:00 2001
+From 703545905411e5b597e4f462da93fa82c964f4d1 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
@ -12,10 +12,10 @@ Taken from Adélie Linux.
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 88286c07b6e..f8f5cfb5011 100644
+index 96974bd3269..ead47c0c39e 100644
 --- a/libgo/go/syscall/libcall_linux.go
 +++ b/libgo/go/syscall/libcall_linux.go
-@@ -206,19 +206,19 @@ func Gettid() (tid int) {
+@@ -209,19 +209,19 @@ func Gettid() (tid int) {
 //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
 //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
 
--- a/cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch
+++ b/cross/gcc-armhf/0029-gcc-go-Don-t-include-sys-user.h.patch
@ -1,4 +1,4 @@
-From 739b3a500ab6c7926364767c9d6125d8a83e5a10 Mon Sep 17 00:00:00 2001
+From 0cdfd9c48470d12a448e99f4fa7ce73f206bd42a 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
@ -12,10 +12,10 @@ Taken from Adélie Linux.
 1 file changed, 3 deletions(-)

 diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 0692fd41eb7..c8d987358d9 100644
+index 8ce061e2f5f..4d5907a2da5 100644
 --- a/libgo/sysinfo.c
 +++ b/libgo/sysinfo.c
-@@ -73,9 +73,6 @@
+@@ -78,9 +78,6 @@
 #include <sys/times.h>
 #include <sys/wait.h>
 #include <sys/un.h>
--- a/cross/gcc-armhf/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+++ b/cross/gcc-armhf/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
@ -1,4 +1,4 @@
-From b61aaf8df1ea8a6cb3f0ff2954c8580806bf43f4 Mon Sep 17 00:00:00 2001
+From fe1480783664c5b3b9e073b2eb470b32438d392a 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index b429fdb2403..fd1c885f043 100644
+index d30d1603adc..57f6824eb9e 100644
 --- a/libgo/runtime/go-signal.c
 +++ b/libgo/runtime/go-signal.c
@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused)))
--- a/cross/gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+++ b/cross/gcc-armhf/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
@ -1,4 +1,4 @@
-From 9bda07868553de7c877f504b9abce312abce4e92 Mon Sep 17 00:00:00 2001
+From f1bd71f7dbac1570c8fd9990e0ff632e33972584 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
--- a/cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+++ b/cross/gcc-armhf/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
@ -1,4 +1,4 @@
-From 38af7ff7a56fb1b917e7432341614b2604e6721c Mon Sep 17 00:00:00 2001
+From c4fd6db3bd96974a726c41e08e42c242d442f689 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index ba38ebaa9ab..3c9e5ce9461 100644
+index fa3389d857e..57bed97c710 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
@@ -15,7 +15,7 @@ import (
--- a/cross/gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+++ b/cross/gcc-armhf/0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
@ -0,0 +1,27 @@
+From 6412458c90450577dbead578cb38da0a0cb64024 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 25 Nov 2021 01:47:03 +0000
+Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
+ on time64 machines.
+
+Run the Go-isation on all of them.
+---
+ libgo/mksysinfo.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
+index 0c52ea5d71a..6fef104cc1c 100755
+--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
+@@ -510,7 +510,7 @@ fi
+ 
+ # For historical reasons Go uses the suffix "timespec" instead of "tim" for
+ # stat_t's time fields on NetBSD.
+-st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
+st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
+ if test "${GOOS}" = "netbsd"; then
+     st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
+ fi
+-- 
+2.33.1
+
--- a/cross/gcc-armhf/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+++ b/cross/gcc-armhf/0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
@ -1,37 +0,0 @@
-From e937f85b212f2e44101042489d387a249df3ba8e 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are more than one st_{a,m,c}tim fields in struct stat on time64 machines.
-
-Run the Go-isation on all of them.
-
-Taken from Adélie Linux.
---
- libgo/mksysinfo.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index bd2ba32cba1..972e2c379bc 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -510,9 +510,9 @@ fi | sed -e 's/type _stat64/type Stat_t/' \
-          -e 's/st_size/Size/' \
-          -e 's/st_blksize/Blksize/' \
-          -e 's/st_blocks/Blocks/' \
-         -e 's/st_atim/Atim/' \
-         -e 's/st_mtim/Mtim/' \
-         -e 's/st_ctim/Ctim/' \
-+         -e 's/st_atim/Atim/g' \
-+         -e 's/st_mtim/Mtim/g' \
-+         -e 's/st_ctim/Ctim/g' \
-          -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \
-          -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.33.1
-
--- a/cross/gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+++ b/cross/gcc-armhf/0034-gcc-go-signal-34-is-special-on-musl-libc.patch
@ -1,4 +1,4 @@
-From e01c6f439a22f683f953ddeaec4f02fb190d152e Mon Sep 17 00:00:00 2001
+From 0d93aefad5acf36c4f5ef60f95683f106c21f38b 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
@ -12,7 +12,7 @@ Taken from Adélie Linux.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
-index c555712a03c..9e228580d37 100644
+index 2eece687e35..e86490ce203 100644
 --- a/libgo/go/runtime/signal_gccgo.go
 +++ b/libgo/go/runtime/signal_gccgo.go
@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
--- a/cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+++ b/cross/gcc-armhf/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
@ -1,4 +1,4 @@
-From d8e7e867a98058cfdd1f03ddfb18786687f85c88 Mon Sep 17 00:00:00 2001
+From da6a868da00dd1a302c91181e6af2daf57aeb609 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
@ -9,10 +9,10 @@ musl does not seem to have _off64_t.
 1 file changed, 1 insertion(+), 5 deletions(-)

 diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 972e2c379bc..8d6da15f983 100755
+index 6fef104cc1c..5b8cb86eb9c 100755
 --- a/libgo/mksysinfo.sh
 +++ b/libgo/mksysinfo.sh
-@@ -379,11 +379,7 @@ fi
+@@ -403,11 +403,7 @@ fi
 # Some basic types.
 echo 'type Size_t _size_t' >> ${OUT}
 echo "type Ssize_t _ssize_t" >> ${OUT}
--- a/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+++ b/cross/gcc-armhf/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
@ -1,4 +1,4 @@
-From e4b21cb1e140c22a5183ebf0158bff2b655b15d6 Mon Sep 17 00:00:00 2001
+From b15fa407296fc03ad7549852a13aff790406f61d 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
@ -8,7 +8,7 @@ Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
 1 file changed, 4 insertions(+)

 diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 6f7d2e27996..5afd7902497 100644
+index 38bf7a6b255..e50403b5a75 100644
 --- a/libgo/runtime/proc.c
 +++ b/libgo/runtime/proc.c
@@ -66,6 +66,10 @@ static void gscanstack(G*);
--- a/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
+++ b/cross/gcc-armhf/0037-gcc-go-link-to-libucontext.patch
@ -1,4 +1,4 @@
-From a69b517d61fccb5698fcdb3261386ce85ac84b5f Mon Sep 17 00:00:00 2001
+From 566b272d5d7017e8ba72b5c52d06d7c5ed3165e8 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
@ -8,10 +8,10 @@ Subject: [PATCH] gcc-go: link to libucontext
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/Makefile.in b/Makefile.in
-index 63627db68cf..c7f1f84d683 100644
+index 426949aa91c..f97db1ef569 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -48823,7 +48823,7 @@ configure-target-libgo:
+@@ -50331,7 +50331,7 @@ configure-target-libgo:
 	esac; \
 	module_srcdir=libgo; \
 	rm -f no-such-file || : ; \
--- a/cross/gcc-armhf/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+++ b/cross/gcc-armhf/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
@ -1,4 +1,4 @@
-From a68edec2c2adcd43c04f06acaa70b7c23fcbc124 Mon Sep 17 00:00:00 2001
+From 846b94beac2d176f6b22bbe73657657e31cc142c 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
@ -9,10 +9,10 @@ These struct members do not seem to exist on musl.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index fd1c885f043..e845e453332 100644
+index 57f6824eb9e..fd03db420d4 100644
 --- a/libgo/runtime/go-signal.c
 +++ b/libgo/runtime/go-signal.c
-@@ -333,7 +333,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
+@@ -335,7 +335,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u
 		runtime_printf("sp  %X\n", m->sc_regs[30]);
 		runtime_printf("pc  %X\n", m->sc_pc);
 	  }
--- a/cross/gcc-armhf/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+++ b/cross/gcc-armhf/0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
@ -1,53 +0,0 @@
-From fae37346b1fc708e9e54f960c8532deab3afec7d 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
-
-As explained in the comment, `time_t` on Musl is now always 64 bits,
-but used to be 32 bits on 32 bits systems.
---
- .../libdruntime/core/sys/posix/sys/types.d    | 25 ++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
-index 451c8b4fccc..ca654fbe424 100644
--- a/libphobos/libdruntime/core/sys/posix/sys/types.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d
-@@ -139,10 +139,33 @@ else version (CRuntime_Musl)
-     alias int        pid_t;
-     alias uint       uid_t;
-     alias uint       gid_t;
-+
-+    /**
-+     * Musl versions before v1.2.0 (up to v1.1.24) had different
-+     * definitions for `time_t` for 32 bits.
-+     * This was changed to always be 64 bits in v1.2.0:
-+     * https://musl.libc.org/time64.html
-+     * This change was only for 32 bits system and
-+     * didn't affect 64 bits systems
-+     *
-+     * To check previous definitions, `grep` for `time_t` in `arch/`,
-+     * and the result should be (in v1.1.24):
-+     * ---
-+     * // arch/riscv64/bits/alltypes.h.in:20:TYPEDEF long time_t;
-+     * // arch/s390x/bits/alltypes.h.in:17:TYPEDEF long time_t;
-+     * // arch/sh/bits/alltypes.h.in:21:TYPEDEF long time_t;
-+     * ---
-+     *
-+     * In order to be compatible with old versions of Musl,
-+     * one can recompile druntime with `CRuntime_Musl_Pre_Time64`.
-+     */
-     version (D_X32)
-         alias long   time_t;
-    else
-+    else version (CRuntime_Musl_Pre_Time64)
-         alias c_long time_t;
-+    else
-+        alias long   time_t;
-+
-     alias c_long     clock_t;
-     alias c_ulong    pthread_t;
-     version (D_LP64)
-- 
-2.33.1
-
--- a/cross/gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch
+++ b/cross/gcc-armhf/0039-Use-generic-errstr.go-implementation-on-musl.patch
@ -1,4 +1,4 @@
-From c96c9ead4baed0a69f7e4843e199958610c5deba Mon Sep 17 00:00:00 2001
+From 45a69ebecc825636a069a34e9ee7f99075c383ec 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
--- a/cross/gcc-armhf/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/cross/gcc-armhf/0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@ -1,4 +1,4 @@
-From 4785de483dcba1896da1014ddb1a8505ac559a15 Mon Sep 17 00:00:00 2001
+From 8703cb765874411a83d568fde5c3b195c89c3de9 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
@ -9,16 +9,16 @@ This fixes issues with RISC-V.
 Makefile.in           |  1 +
 gcc/config.in         |  6 ++++++
 gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure         | 34 ++++++++++++++++++++++++++++++++--
- gcc/configure.ac      | 23 ++++++++++++++++++++++-
+ gcc/configure         | 34 +++++++++++++++++++++++++++++++---
+ gcc/configure.ac      | 22 +++++++++++++++++++++-
 gcc/doc/install.texi  |  8 ++++++++
 gcc/doc/tm.texi       |  8 +++++++-
 gcc/doc/tm.texi.in    |  8 +++++++-
 gcc/gcc.c             | 12 +++++++++++-
- 9 files changed, 105 insertions(+), 7 deletions(-)
+ 9 files changed, 103 insertions(+), 8 deletions(-)

 diff --git a/Makefile.in b/Makefile.in
-index c7f1f84d683..cb3983ca547 100644
+index f97db1ef569..7e577ed3dbb 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -222,6 +222,7 @@ HOST_EXPORTS = \
@ -30,7 +30,7 @@ index c7f1f84d683..cb3983ca547 100644
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 diff --git a/gcc/config.in b/gcc/config.in
-index 9551c0dfdf9..c8ca910df8a 100644
+index 059c818c895..2a560417440 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
@@ -106,6 +106,12 @@
@ -47,7 +47,7 @@ index 9551c0dfdf9..c8ca910df8a 100644
    format instead of DPD */
 #ifndef USED_FOR_TARGET
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 7f30c363e4a..246698bfea5 100644
+index 902378e1bad..daf7727a01a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@ -71,18 +71,18 @@ index 7f30c363e4a..246698bfea5 100644
 
 #undef LINK_GCC_C_SEQUENCE_SPEC
 diff --git a/gcc/configure b/gcc/configure
-index 1632337439c..77de20dcc23 100755
+index 592e81e40f6..8672298f23f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -969,6 +969,7 @@ with_documentation_root_url
- with_changes_root_url
+@@ -978,6 +978,7 @@ with_changes_root_url
 enable_languages
 with_multilib_list
+ with_multilib_generator
 +enable_autolink_libatomic
 with_zstd
 with_zstd_include
 with_zstd_lib
-@@ -1695,6 +1696,9 @@ Optional Features:
+@@ -1707,6 +1708,9 @@ Optional Features:
   --disable-shared        don't provide a shared libgcc
   --disable-gcov          don't provide libgcov and related host tools
   --enable-languages=LIST specify which front-ends to build
@ -92,10 +92,18 @@ index 1632337439c..77de20dcc23 100755
   --disable-rpath         do not hardcode runtime library paths
   --enable-sjlj-exceptions
                           arrange to use setjmp/longjmp exception handling
-@@ -8009,6 +8013,33 @@ else
+@@ -8070,7 +8074,6 @@ else
 fi
 
 
+-
+ # Check whether --with-multilib-generator was given.
+ if test "${with_multilib_generator+set}" = set; then :
+   withval=$with_multilib_generator; :
+@@ -8078,6 +8081,32 @@ else
+   with_multilib_generator=default
+ fi
+ 
 +# If libatomic is available, whether it should be linked automatically
 +# Check whether --enable-autolink-libatomic was given.
 +if test "${enable_autolink_libatomic+set}" = set; then :
@ -122,31 +130,30 @@ index 1632337439c..77de20dcc23 100755
 +  fi
 +fi
 +
-+
+ 
 # -------------------------
 # Checks for other programs
- # -------------------------
-@@ -19131,7 +19162,7 @@ else
+@@ -19501,7 +19530,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 19131 "configure"
+-#line 19501 "configure"
 +#line 19158 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
-@@ -32267,4 +32298,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+@@ -34068,4 +34097,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 -
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6e4d4092af7..205f7d5e137 100644
+index 1577529ffb7..e96691f69ba 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -1110,6 +1110,28 @@ AC_ARG_WITH(multilib-list,
+@@ -1149,6 +1149,27 @@ AC_ARG_WITH(multilib-generator,
 :,
- with_multilib_list=default)
+ with_multilib_generator=default)
 
 +# If libatomic is available, whether it should be linked automatically
 +AC_ARG_ENABLE(autolink-libatomic,
@ -168,21 +175,20 @@ index 6e4d4092af7..205f7d5e137 100644
 +    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
 +  fi
 +fi
-+
 +
 # -------------------------
 # Checks for other programs
 # -------------------------
-@@ -6945,4 +6967,3 @@ done
+@@ -7729,4 +7750,3 @@ done
 ], 
 [subdirs='$subdirs'])
 AC_OUTPUT
 -
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 7d98ec4190a..a58d5a05be2 100644
+index 4c38244ae58..4a544e6a4ee 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
-@@ -2169,6 +2169,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2213,6 +2213,14 @@ files, but these changed header paths may conflict with some compilation
 environments.  Enabled by default, and may be disabled using
 @option{--disable-canonical-system-headers}.
 
@ -198,7 +204,7 @@ index 7d98ec4190a..a58d5a05be2 100644
 Tell GCC that when the GNU C Library (glibc) is used on the target it
 will be version @var{major}.@var{minor} or later.  Normally this can
 diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index fcb7245e95c..67b485e8d0c 100644
+index b370bc76b25..acc78273983 100644
 --- a/gcc/doc/tm.texi
 +++ b/gcc/doc/tm.texi
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@ -217,7 +223,7 @@ index fcb7245e95c..67b485e8d0c 100644
 
 @defmac POST_LINK_SPEC
 diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index c17209daa51..3ec63f6d091 100644
+index 2974dae2701..80e003a38ce 100644
 --- a/gcc/doc/tm.texi.in
 +++ b/gcc/doc/tm.texi.in
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@ -236,11 +242,11 @@ index c17209daa51..3ec63f6d091 100644
 
 @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 40e07354b3d..81bd50b4d7c 100644
+index 5093e8bbfd2..1871b5ab6eb 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -877,13 +877,23 @@ proper position among the other output files.  */
- # define ASM_DEBUG_SPEC ""
+@@ -980,13 +980,23 @@ proper position among the other output files.  */
+ # define ASM_DEBUG_OPTION_SPEC ""
 #endif
 
 +#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
--- a/cross/gcc-armhf/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
+++ b/cross/gcc-armhf/0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
@ -1,4 +1,4 @@
-From df182f44e2e25e6c7ad70f7e90f246e2c8a1006b Mon Sep 17 00:00:00 2001
+From abe5e7af0cb74a10adad65122f8a0c75c3f15615 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sun, 29 Aug 2021 09:45:27 +0200
 Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
@ -22,7 +22,7 @@ See:
 1 file changed, 20 insertions(+)

 diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 5dd0926d207..0b57a801e23 100644
+index 670b0d72cfe..38c2cd9345f 100644
 --- a/libatomic/configure.tgt
 +++ b/libatomic/configure.tgt
@@ -30,6 +30,26 @@
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@ -24,8 +24,8 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"

 pkgname=gcc-armhf
-_pkgbase=10.3.1
-pkgver=10.3.1_git20211027
+_pkgbase=11.2.1
+pkgver=11.2.1_git20211125
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
@ -47,7 +47,8 @@ replaces="libstdc++ binutils"
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
 : "${LANG_OBJC:=true}"
-: "${LANG_GO:=true}"
+# Go frontend presently fails to build due to missing _size_t type in sysinfo.go.
+: "${LANG_GO:=false}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"

@ -226,16 +227,15 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
 	0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
 	0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
+	0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
 	0034-gcc-go-signal-34-is-special-on-musl-libc.patch
 	0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
 	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0037-gcc-go-link-to-libucontext.patch
 	0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
+	0039-Use-generic-errstr.go-implementation-on-musl.patch
 	0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0041-Use-generic-errstr.go-implementation-on-musl.patch
-	0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
 	"

 # we build out-of-tree
@ -681,47 +681,46 @@ gnat() {
 }

 sha512sums="
-2cba43a26debf22fde6442fcc446b7a84ca18bc4281cee1f1f1b50c254eee2615360982d0502df63ed39d7e739e4715373bae75f1c9f226378c7d617478062d9  gcc-10.3.1_git20211027.tar.xz
-a098a33a9d5a0360341c41aec036bce9463a5b67046b19fb2f5bcecfb5fe2aeb58dbd087ec4f8831c503ce57445a7ecd45e500f11476f24d2f441b46cbb99d9c  0001-posix_memalign.patch
-a8da4611f43c0a1641b6f01c230aa706bd8e65ad367acea35051ab7ea821fb4622647c2ceadb6ec7c67388c9af70d06f3c134caa1af47c8542309898e9cd96ba  0002-gcc-poison-system-directories.patch
-e1b5858902dc719bef17d4d6704d66a9662173af57948240282a43b138633932216fa549ea73c54b377aeee4b2658650e756766493a2f2f30e26756b8f9b43da  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-ef6bcc83e17253f403029f23eae7f0075e41fbe8ec6d391545e32b77b0f5c0cb100a2d56be592ef14cb396a48c7c4a195ad211fd761bdd84d95db7f53e7f5e51  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-93023be3c1ce4a2b19f5d1ed0a074a5a93daf74329fb59d8e01cfafe69018053e48f842ecdcd61f58526ba213fac99c6cc6cde30b603897a74972f1c51347596  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-4f6f1f3aef017841dd42a131b686b55c777769aa23d4483660f6c852ab441b6d8eac2ee41c9f83cb62a31988851a57a303fe00a96c9e9f47017e67d2eb73c714  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-5cf49b9be154e3f7f077ccb0737606018af5a660a35041ba0d6192082f7db423e7621874cf66af16e525670a75e7d555e0ddb44d2e5b664635267928497b9d09  0007-Enable-Wtrampolines-by-default.patch
-3af183d717288f8aa0b5206bae906b553448f723380932d2da1dc41d56db730c192ef4ec424cd4eba2052acf1b2c5f35f1a7b608fc17fb8100c4c0e1d27d5e1f  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-e92cd9e054601bcb6a16966ae378cb3d3ce0b584c0a179996faa3921fb60668298d200d923dc7ca419bd39c4077c55d57d9703252a0728410dc04d427c0206e8  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-8d094d1e8f90cf44f307ef1e8257138ff61b47aabf58b9ec78080e3ad202de31319436b04f6eff33af5bbf983a0814bb2b9d8b1c8dfdcfaafd48eef414f07b1a  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-dd06807fb9d02c6de37cb44f17ffea2c86d4f22aabf441ab015e8613f9f37068113d52cd00d57365d53b145799f6affdc008b6d8d0a7daebf500e82debc4f53f  0011-libiberty-copy-PIC-objects-during-build-process.patch
-6d9fe75cbb488e0ac6d85bddb4f6f06fa3424889d225d4c25352555dbd5aed7db0be6d276b6214380f3c8bff37e31a1a56da40066a090a46d727a5f68b9f92a8  0012-libitm-disable-FORTIFY.patch
-ccdacf75756dda9af59a7355a87645d39231e9bf6e9a2f1fa8b6351ca0466dccecaa97a263e67c7a95d71176b31ad6d991f665ef5b855d7134e28ba7a8d30c5f  0013-libgcc_s.patch
-5304f689f1016f0df3bfa580c2a8c72ac936faaaf4edd614eebbc9f1ffad40fe2e306cd46c079f4acb407b56335a4414a462001dcc9ef111afc034f1de4b956b  0014-nopie.patch
-3dec2f23a0b6e4ef183cb9ec8550ac2f59873dad3758dd25eac82c9bd10573c83cf429333b584613e272bd6b20825f164ae015902d93cd996d604d0af6e59220  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-51c6ac1b3788a4a925873109e243b5cfbf081825b1890a05d1106ab1d73aead60863d80707b52dcfe75ccfe2ece7ae29a68338bb6a4142bc47d2678a10f60fb8  0016-dlang-update-zlib-binding.patch
-c2d32cd3b4765924d30e96216d5482b006fb9a56a281cc10177d09d04b545c77e81f201cc0218cec5345a2672aa69452236576f57ffdedea37d942db3eca7b33  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
-64836685eeb4c87a6f014f20eabe98e212b8082100827a0a3c25d8f0c8e8aa69594bbce0229d7b73fce06ab899030068f64388fa999ecd2914209c4ce7deb902  0018-ada-fix-shared-linking.patch
-e85463e664371e19ac49c4f603c18e2676b395c847fe1fc9969339533d6f9f929e54038a64636ad594f5b3ff53b8fe513b504e06644f5647581aa6b301c3a27e  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-c7e0eb5f426c613f025fe26af82dd16c7be06b944a4eea642440e2b010d3e8455658ec453ca82333823dc7a52c9bf039b2edcf0f3be6e141bf69618c449b0792  0020-add-fortify-headers-paths.patch
-fa2489368639203189f2ac5fd433cc4fb25c356dd21f560043aa7e2e3a94cbf13df3bd48cc9b2eb472876236f0bb807efa6b06506c2f5b51f71567e54004b430  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-bf693daf2fcf497c8a804eed2d039d42b2e95725f584d87bc3d9d5fc057693fbfb9b76fb4818399664014497b6dd9055df32e2e7ea29182eb0078cc76dc14839  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-3c339f40bf3d9059fb5ab14ddde239996d4aebe36e5eb10feecd2ba93ef3e88d56c78f719308458cac74175fd604d7125956568d68c49dbe011c6f8cb6c98c33  0023-Pure-64-bit-MIPS.patch
-43fb576d041698ecaa2f640d6dda8511408d0967d4dd26d597400aa307d0bf9f9a224d8d4d841703453be21c6a321485b84ba0200ae69e260ea043e71a57c0d2  0024-use-pure-64-bit-configuration-where-appropriate.patch
-4aab3f2319a926e25af6f4219001f2f0c250da7ff66bfc7a70c26c6489fffbd52232ec8104e79fb64dfe97e50c8914d333f44eb493629aa0014aa392e3585382  0025-always-build-libgcc_eh.a.patch
-2af7eaf89af20ba945fa8b64592f310632e75afef09f417d6c6efd49f3b9e4624f6659512dcdc077ebc2c38684fcf979a9b4a501e3a414902db2c44bc105eb4c  0026-ada-libgnarl-compatibility-for-musl.patch
-5ef42aa075b048592c6e22417dab5d07f78a7c13914fa1aa9e9c47f53b71bbbf27d3982201a74816b1347cd123048dd669b7c8da4ad4e481d915f67a3ae0f754  0027-ada-musl-support-fixes.patch
-9fbcb2addffa042e4791b715e156402d03b8f3703356d0b9570526df7b5b311595c1b772e5295328f56e05efc7f99e22f5e5b48c5ffb9bf71ebc56afe5321d11  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
-88aa25ead0706b775a4ab4d31a2319cfdbb094490798f87f8272a74228683d6a295b42f9af7c57a646ea17b8d393e8b2e52bb57d10e0527c3fbfcad6e1c5e159  0029-gcc-go-Don-t-include-sys-user.h.patch
-9f38276188ae56d037b99df4a068fc71c94b5d17341d4131ef1252c42352a5029768ffdb4a8d12ef92bfd30b5d5f7a3c440ed91d334c85dc66b837d6d23897a9  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
-de6fac26c37ee3d5e55129620f6793d80e74db1d922e545591d3d2a1eabb0cd9a6f2f918800a1177a79a9aaea49263ee7b126ccd1a05ecab3f90304f1ce4db68  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-0c48d1acca7f33e796de0bd520f727ccc498530c86aa56e1bb1ceb68f2b751f2b265a5cd86ce142213906a4fbc4667e3d5bad07fb8613989ed6a77a7aaa11a29  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-bebd27d21d8b64011b3752fdc9ca03ebcda52ba452aae074a484ed204eac6056ac8ea46cb4413de810e0c3df05a4ccfbb2033582497426447f9c06bd784fbc56  0033-gcc-go-Fix-st_-a-m-c-tim-fields-in-generated-sysinfo.patch
-dfec489d78a0921cdd9a6a1b35a14566f565413e2f4f0467db37f0650e28be9482111bdfe93274280594ddac9c5ef7f50a9d0443c4f9393f71ef7195d1dd8166  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
-89ac788b3a49ce46cf852e5396c9bac99155059700a07736794773291e43dd07c3693999e115e683fc6df110b2081c6d93226b31cced0eff905b58855ff986ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
-1473f977f2fc259a8d7abc29d554b0b44fb7d65b5e5cdddf1601505ba2cb3aa2f86e13691e8bdbe2f93c7ae866a6702ef7764adff8c535ccf2f6abf6f2e377dc  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-89c40e32ec0f02d294f4bc576c652b976d63ff8ab4dca9f3a7533bca40e3c267e8a4b02ff5099bf7534174d68e21044c38a9141cc7a9399573bab6fc4fb7ac8d  0037-gcc-go-link-to-libucontext.patch
-2742b50a629835577de5f3ac4a764770fd7a6f42e0e0da5d35673cecf4d24a2d1d4227f3f03745001947c5b69dae72fe0584941257333f916c4db3d240bcbbfa  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-70987dea8cbee832660d8a27e3ebf7b072974e6e8f5112c1365a6a4c84830bdff8342c7a4933486f5f4becabb81a89c46e3c3cde5602e172206c59965cdd5f3f  0039-CRuntime_Musl-Support-v1.2.0-for-32-bits.patch
-3963bac9cd0f8c442599a5e983f033798266e20e9f7ba72c023724e0917a0ae750856d15e0e9a527f6f60e735ddfa66f8f3e300de47e54cad6c440ddc0403081  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-9f82ce02f355ae38952d17512fc962886f485e06d9ae2ef57f13ccc3f7b298d7e9921f8867b86d7d1fee442df887ba4ee3983521bfa91248872110a1b6c070aa  0041-Use-generic-errstr.go-implementation-on-musl.patch
-40168210e381c329a7ff3e332dedadfa0c60e9da3251c29e660aeeae478da5c5988dc9144a9e6be178202d1d15e2dfa273f5034a861054786ef7cfd4f56c2745  0042-configure-fix-detection-of-atomic-builtins-in-libato.patch
+2a682823f9b114c4288a3428dc658ce21679f48a5b901d4792fc4ea09f75e9c9516f8cdc7c70697e1be335d925f99eac01eaf20c117cd5ee685181d37fcc7290  gcc-11.2.1_git20211125.tar.xz
+14ef1a0b284c85859f4db03cb0750c4dcadb8821dd0ec1b04e6872ffd2fa55ae125a99fee986a160bce9448226d08daf05e1a7feda5220e746aaa5f338d78d69  0001-posix_memalign.patch
+950b04c8bf96810dfe4bd4c2ea5218dfacfae0f0b1be9e64cbb1f09bbf67d29565b59094aa4d5cca095355db8cce99c80c99f0463ef296a96faf6b13e38230e0  0002-gcc-poison-system-directories.patch
+1d9c1b028b07644da9182288a26762f294d1ef25804c0227bfd3419a2a8ba579bec7590aaac9a241242bb14e3e371eff81ad26a07d0183be821af59bd6abe4d4  0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+5a705aa5ffdc5ab3fb417ddb494486156db4af3b7f9a1d29e1b3ac2e7095f924b2a3f73a73b4d7d20f6ba3c77b062f1b47e7b46c0a8e1992f349abe3cf7f6542  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+87573db27fd83fe9d7c40cefb5bd264e36500280ab2dd39c1763f87f4cfaef3e0d3115f4aadd3b3d65c93a13db17df469e038931335685dfad4adf6b48e96c66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+4055d8b934c8a017bbba74b224c8da105668ea16fc9f244b0dacc9511a89088701b491daec09d95041f640b7f0e994feb17a0803d389818f104578bfaf433623  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+0ffb348414468ea166d5875e0f20f77a813473a6823e26189b010eebb835c91e14b04f360b139fffbc50b30622476a625a5f567d26b6c18ddcbfc88e6d28e54f  0007-Enable-Wtrampolines-by-default.patch
+799117fc233f3172457024a71d4d964c6a367b7ae7246e208ba16192a533bdf484dc72b79eb7ee3629c0eb7fe202d32658a64219c03c9098120c899d9f832309  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+eb47d678ff9a14ad54833b1fdc2d04976e31db741cdf9ac6b213d56df3df3ea61514bdfa5bbe2577b82135517e184de53028663b7aad565613e90c0bafd6513f  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+e3d2241e3bb8e67bece8a322cdc707542586f7a1b5da9412eb38dbfa40508e618b8827e3574b21c86b9d263e8ed31941d8885618707c1947d07f86d18d34a9a8  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+e8976a1f1618e94d519852dee346bb787589637905451a6f02b4f8a1ffc5a6fa797a697b8c0964a72830aad32ba412986d45e9f88ae86e3d7c8007d3b1400692  0011-libiberty-copy-PIC-objects-during-build-process.patch
+2cc03796789b6680f43533d41a1966283b6e913b19080a00c4ec6653614f1af66754db7ffca05103bb398e389316c9fca525d2fe00965e1105b210d1d940d507  0012-libitm-disable-FORTIFY.patch
+8fe44a88f66f1d282c5c6db80642ac8ef52f89ccc8287f73eecd1c8d78ee3e5ac890065d173fc3ff00172b8b3984ca484debbf84b9ba649dc5939afdfc4a220a  0013-libgcc_s.patch
+1323a512d063f9a0679c68c9856ede8a6d48ae0c9c52ef14e63d34e6a2b6486fa02301d75554b2d623a369967c71ca35e7c93530c093f334f0cf666c7d1b4911  0014-nopie.patch
+1fb9fb420335d5e87245eb781960bc876a1d60bc69af2a8febad8ddd23cc064e28227a7b9f8389b4f2bb0211259102feaa6e2a7f64457fac06d60a59fdc1c2bb  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+226e68c4561524ece4340107736f5f7f5a31fb725373a5ad472147f443a5fc037d0e0d93562c3e6d333ed43ceef7a2c6a2adad1ad10a464235d168a2dd4ed65e  0016-dlang-update-zlib-binding.patch
+9615d8844f4ffaab6dc61ad452ec9502acfe41029f2225b4b9fa10b034659447fb92b037918d52c615cae30acbb778b8a3d2197c705c90698221ae9e7bb30a32  0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch
+3008df8b4e4f582ced4976e640cb3329904bdefe9d454b13c8e61f3393fee21ec4e49cefc90e6049f85bacced500886681520b46b5063c948b7f5506c050b8cc  0018-ada-fix-shared-linking.patch
+3df7c1285a370e9741f649b26e31074177826b11da5172e5571c982ff1127ba83c6baf6b0666433ab7cd937217550ed2f083460d8ef8ed62531a98e63cbcc4c9  0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+5235fbd6bb39c98f9ef702112d5bda05dcba03e897106ef864be606568e0c51e2fb5cadc5df93d162ceb8bf38a544adf9487ddd995ed0b936e86e3fbbc10512e  0020-add-fortify-headers-paths.patch
+9405ea49a6832ae7e2c81c00a9c0c7eeb03b2b4cb887ff2f6352b0f0a5de2c002208a12a6a61ec0e287b114c30090197e867be1a5ed8f462e6f74a63b87fd6f5  0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+aa46e49551ff84654166927f62fc81a118dcec1934cf0a95bdbcfe0ed08fac21d6c4b123965d9e718936411e2935c6cd6b60dbba2853c01169fea8d0fa401464  0022-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+62a743dea9f0b644876138f5d336726a32ad62ad1b49c308daf3a11c7122cef292e93fe580fc71aa1ec9c73bb234e485a3d447135f2d169b98af1900d304368e  0023-Pure-64-bit-MIPS.patch
+6959cf80dcceeee5d89eff1337bdf35d7a1d42fe3861a56bebd10ccfba1e5046837b63923a2f1b23109c8494d39a18a400f08342686271d539964ad85c83d2f1  0024-use-pure-64-bit-configuration-where-appropriate.patch
+1f160b42a88f1d6cdf2cf140323d5fb96233f82b5fbeb8efdb861820b25c1b0354e55202655bfb5f571e21fdb18e66a532b7278a014aab828e03b04e9345fe19  0025-always-build-libgcc_eh.a.patch
+fec758a6cbee1d468b966b90e35fe83742b2ebb2cc873634115ab4db599bd84a8c00f687ff18a2f37360126a75f4b8d85d9de3127d44b9076d931479cdd65ab1  0026-ada-libgnarl-compatibility-for-musl.patch
+e49720b5d78fca91bdc0dbc431b70e9e75bbd6a95ba2e856dce6764dd9759fc830bb445ce8aa8fc9aa6ace80c474e9c2a947c6b23a1178b2cb6bd8780447350a  0027-ada-musl-support-fixes.patch
+199b87e0844c361fc176755cd5846ea48f4a18382609633d0f4d1fb3e11a41ad93168f9b4f44ed993dca977354c0072637779658941cebe6adebfea28b28531c  0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch
+17642cb9f179007b898f62cb4d6c9b436876cf667606c8003e02a782f09d29e17a301225efb94102094cc7f2b3efb413dd5ea2581e7e421e2b814f29f1b7e776  0029-gcc-go-Don-t-include-sys-user.h.patch
+08268c1ec6b6f0097ea15230f45f2a7231b8c5f9e6f90fcb102f86fe8e83c81a1755482a88415ab11a3de62e82769e4f0e3e029b812e477fcb6ddccb5f086734  0030-gcc-go-Fix-ucontext_t-on-PPC64.patch
+1345b99c20a9f7335c8af5e619c769f0555e46c18ba0f084d2655bce1581d11353f278dd9c94874edaceed1bf9d11a4a720b5263197c0cc9ce288f664e26eb01  0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch
+ff8fb2cd67dd4723b271c2d1b6bca80e062d2fe31fe9f71aa1b83bab1c131decff4b4ddf8da9ce188cd28eee0fa1cf04d8ffc863033c5ce0096a6dd7b748e3b5  0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+ce677dad505e56c67c79f7836888b6c28feaa4172d41c8c7573b931e6baff56ca0e5b9e6902b576d784735c5d278bc8a23e08a83597e3f41d11be9e14cf1dc59  0033-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
+19743886041ed1fc8e3afebc48b5c196c032f4bd8d20a8deb99ba83ec7ffb3a5e18f1686a705a0578ce120f702493e444c599c9228f2b466abbcb8820f313d7a  0034-gcc-go-signal-34-is-special-on-musl-libc.patch
+150dba551824d99a3b58ea531c939237ce3aa642d04e5a2f774fe96bb27f1aa498d2b95d74369dd893da6142f9a8e5fe8966c72f38e21fc14ff614f90e7374ce  0035-gcc-go-Prefer-_off_t-over-_off64_t.patch
+2e09c90e5b9ba295949d5a9986ca4e13774981fb918d35098ab560139d34703b15924767bb54ffadf38b061b2b395c50f53c367c96959e5e9d1e7c65224171f4  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
+01b3010bdfcec65d68f851ed425fa22c744e6744aaf4b0fe7699c7a678e970e11bc7b907188fbacababacadf520b515883944480e91262259e0a03a0966d7540  0037-gcc-go-link-to-libucontext.patch
+f7eefa7ae1f31fc7bc1721578d4c1642f2ef5feda37dec03264dde53717474437722ee646ab9a837d888eedbee4ea3c407f20cc4c7cb36d34a81e56b3ea02c79  0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
+83deca7a68c6e1ce934f79b5d1e1a4b8b8a25c7bc24c3ef934307c232e168d9b17048a00a040fe81ac0cf6d4a23beefb292369c35d9896dab440dda228c90b0a  0039-Use-generic-errstr.go-implementation-on-musl.patch
+4074c62c2ee0ed555f01bf0cc69e32ef275bc3ac74de1d428ba1a2ac59fae973fe6f9aab8b3796df4bda7ab7cf220e5e1cbfdf103f41e4cbea175067a947d08f  0040-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+1fe1b1e9ec288f65cd0d80a74b0a060b29c40e501f666b01e2825b61949be4568aeaf7cf473142889a7fd5e011b096837a651582d64fce67500fcb2ba39e16ce  0041-configure-fix-detection-of-atomic-builtins-in-libato.patch
 "
--- a/cross/gcc-armv7/0001-posix_memalign.patch
+++ b/cross/gcc-armv7/0001-posix_memalign.patch
@ -1,4 +1,4 @@
-From 3d818cf1e0a28d094ea415f6748fd1b7285519fc Mon Sep 17 00:00:00 2001
+From 135cfe09a582b4076324a5f350f775c18164aa1f 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
@ -8,7 +8,7 @@ Subject: [PATCH] posix_memalign
 1 file changed, 5 insertions(+), 4 deletions(-)

 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 87344d9383f..ece428df487 100644
+index 1b0bfe37852..d7b2b19bb3c 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
--- a/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
+++ b/cross/gcc-armv7/0002-gcc-poison-system-directories.patch
@ -1,4 +1,4 @@
-From 6fcb950659e4382067ff4b297547b178f0697a08 Mon Sep 17 00:00:00 2001
+From b0d26972848280c3035668a6caccf0ca5475f062 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
@ -26,10 +26,10 @@ Upstream-Status: Pending
 7 files changed, 68 insertions(+)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ec5235c3a41..ca942863064 100644
+index a75b44ee47e..d15105a73f3 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -682,6 +682,10 @@ Wreturn-local-addr
+@@ -683,6 +683,10 @@ Wreturn-local-addr
 Common Var(warn_return_local_addr) Init(1) Warning
 Warn about returning a pointer/reference to a local or temporary variable.
 
@ -41,10 +41,10 @@ index ec5235c3a41..ca942863064 100644
 Common Var(warn_shadow) Warning
 Warn when one variable shadows another.  Same as -Wshadow=global.
 diff --git a/gcc/config.in b/gcc/config.in
-index 364eba47737..9551c0dfdf9 100644
+index 2de5a463315..059c818c895 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
-@@ -224,6 +224,12 @@
+@@ -218,6 +218,12 @@
 #endif
 
 
@ -58,18 +58,18 @@ index 364eba47737..9551c0dfdf9 100644
    optimizer and back end) to be checked for dynamic type safety at runtime.
    This is quite expensive. */
 diff --git a/gcc/configure b/gcc/configure
-index 84e0ea21054..3bb7b5b318a 100755
+index 708328e1670..4b977e313b5 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -1010,6 +1010,7 @@ with_system_zlib
- enable_maintainer_mode
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
 enable_link_mutex
+ enable_link_serialization
 enable_version_specific_runtime_libs
 +enable_poison_system_directories
 enable_plugin
 enable_host_shared
 enable_libquadmath_support
-@@ -1766,6 +1767,8 @@ Optional Features:
+@@ -1782,6 +1783,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
@ -78,7 +78,7 @@ index 84e0ea21054..3bb7b5b318a 100755
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
-@@ -30276,6 +30279,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -31790,6 +31793,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 
 
@ -99,10 +99,10 @@ index 84e0ea21054..3bb7b5b318a 100755
 
 
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index d068618bd8f..44ea4725620 100644
+index df1c9cc3200..5461bab88a9 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
-@@ -6608,6 +6608,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -7311,6 +7311,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 
@ -120,10 +120,10 @@ index d068618bd8f..44ea4725620 100644
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 6d3cfcc664e..9d9a4b78ffd 100644
+index 5a4b3c6c234..9d1126e9751 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
 -Wparentheses  -Wno-pedantic-ms-format @gol
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
@ -131,7 +131,7 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
 -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -6927,6 +6928,14 @@ made up of data only and thus requires no special treatment.  But, for
+@@ -7727,6 +7728,14 @@ made up of data only and thus requires no special treatment.  But, for
 most targets, it is made up of code and thus requires the stack to be
 made executable in order for the program to work properly.
 
@ -147,10 +147,10 @@ index 6d3cfcc664e..9d9a4b78ffd 100644
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 9f790db0daf..b2200c5185a 100644
+index 8ba410c9e17..a83ba34ac4b 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1041,6 +1041,8 @@ proper position among the other output files.  */
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@ -160,7 +160,7 @@ index 9f790db0daf..b2200c5185a 100644
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 8a2bda00f80..9098ab044ab 100644
+index 446d280321d..fbfc0ce03b8 100644
 --- a/gcc/incpath.c
 +++ b/gcc/incpath.c
@@ -26,6 +26,7 @@
@ -171,7 +171,7 @@ index 8a2bda00f80..9098ab044ab 100644
 
 /* Microsoft Windows does not natively support inodes.
    VMS has non-numeric inodes.  */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
 	}
       fprintf (stderr, _("End of search list.\n"));
     }
--- a/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/cross/gcc-armv7/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
@ -1,4 +1,4 @@
-From 8e72eea50b282e77163cc3c907170a9da8a638e3 Mon Sep 17 00:00:00 2001
+From d0e45e3e71b386dcd57fa807e0182b0c00a4f7af 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.
@ -9,10 +9,10 @@ Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default.
 2 files changed, 4 insertions(+)

 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9d9a4b78ffd..129dc5b11f3 100644
+index 9d1126e9751..46e45274859 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -14666,6 +14666,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+@@ -15920,6 +15920,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
 linker.  When using the GNU linker, you can also get the same effect with
 @option{-Wl,-Map=output.map}.
 
@ -23,10 +23,10 @@ index 9d9a4b78ffd..129dc5b11f3 100644
 @opindex u
 Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index b2200c5185a..625c9ab7902 100644
+index a83ba34ac4b..8c15de433ee 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -1039,6 +1039,7 @@ proper position among the other output files.  */
+@@ -1150,6 +1150,7 @@ proper position among the other output files.  */
    "%{flto|flto=*:%<fcompare-debug*} \
     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
--- a/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/cross/gcc-armv7/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@ -1,4 +1,4 @@
-From 43d2fb2068739661a61ded0a1124e98947773831 Mon Sep 17 00:00:00 2001
+From 0615d5fe72c9c23cd9d08f2a54eafb4ab46cbe11 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,
@ -10,10 +10,10 @@ Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC,
 2 files changed, 10 insertions(+)

 diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index db91a36794a..ed976c71404 100644
+index 9f993c4aff2..7db314195ff 100644
 --- a/gcc/c-family/c-cppbuiltin.c
 +++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1385,6 +1385,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1421,6 +1421,10 @@ c_cpp_builtins (cpp_reader *pfile)
   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
 
@ -25,10 +25,10 @@ index db91a36794a..ed976c71404 100644
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 129dc5b11f3..1b7ef0c68c6 100644
+index 46e45274859..1b4a698a191 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -9231,6 +9231,12 @@ also turns on the following optimization flags:
+@@ -10224,6 +10224,12 @@ also turns on the following optimization flags:
 Please note the warning under @option{-fgcse} about
 invoking @option{-O2} on programs that use computed gotos.
 
--- a/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/cross/gcc-armv7/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@ -1,4 +1,4 @@
-From ae3a276ae169a782fc114655343afef6bbc1a3ae Mon Sep 17 00:00:00 2001
+From 071d4ac4bacf555c61c7c44b54acee94e35d7c59 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,
@ -22,7 +22,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
 14 files changed, 36 insertions(+), 19 deletions(-)

 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index e587e2e9ad6..1d1017aa523 100644
+index 7f2529a2a1d..b097e1688aa 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
@ -34,7 +34,7 @@ index e587e2e9ad6..1d1017aa523 100644
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index e25fcac3c59..22b2f7b0d14 100644
+index c1dae8ca2cf..a87dc740171 100644
 --- a/gcc/config/alpha/linux-elf.h
 +++ b/gcc/config/alpha/linux-elf.h
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
@ -47,7 +47,7 @@ index e25fcac3c59..22b2f7b0d14 100644
   %{shared:-shared}						\
   %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0ec3aa53189..f8bda84de2a 100644
+index 0c1c4e70b6b..8b581afacdd 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
@ -59,16 +59,19 @@ index 0ec3aa53189..f8bda84de2a 100644
    SUBTARGET_EXTRA_LINK_SPEC
 
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index ff2e880b1fa..7f30c363e4a 100644
+index 5ebbf42a13d..902378e1bad 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
-@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
   "%{static-libasan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
 -  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
+ #undef LIBHWASAN_EARLY_SPEC
+ #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
+@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
   "%{static-libtsan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
@ -84,10 +87,10 @@ index ff2e880b1fa..7f30c363e4a 100644
 
 #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index ae4aa844f02..54b91c0492a 100644
+index a23e7ab3eb7..12ac8cb93a9 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
   { "link_emulation", GNU_USER_LINK_EMULATION },\
   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
 
@ -97,7 +100,7 @@ index ae4aa844f02..54b91c0492a 100644
     %{!static: \
       %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 785c68220b8..21dd66b412a 100644
+index f3e25b1412a..712b0f1c30e 100644
 --- a/gcc/config/i386/gnu-user64.h
 +++ b/gcc/config/i386/gnu-user64.h
@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@ -109,7 +112,7 @@ index 785c68220b8..21dd66b412a 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ee38e218aec..0325971d818 100644
+index ac40c3dfd3f..6e19e25c35a 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
@ -122,7 +125,7 @@ index ee38e218aec..0325971d818 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index 5d0782100bb..4be5fbb2191 100644
+index a390bcece83..be0ee289367 100644
 --- a/gcc/config/mips/gnu-user.h
 +++ b/gcc/config/mips/gnu-user.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
@ -134,7 +137,7 @@ index 5d0782100bb..4be5fbb2191 100644
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 4afef7c228c..ba1a6e60e05 100644
+index fce5b896e6e..ee29979dd34 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
@ -142,14 +145,14 @@ index 4afef7c228c..ba1a6e60e05 100644
 
 #define LINK_SPEC "\
 +-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
+ -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
- %{shared} \
+ %{mbig-endian:-EB} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 2ded3301282..a1e44ddcc0d 100644
+index e3f2cd254f6..43499ed29cf 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
-@@ -457,13 +457,13 @@ extern int dot_symbols;
+@@ -374,13 +374,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 
@ -166,7 +169,7 @@ index 2ded3301282..a1e44ddcc0d 100644
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 9ade72114e9..9490b84a153 100644
+index 510abe169c5..3c1f3a8ec5d 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
@ -179,7 +182,7 @@ index 9ade72114e9..9490b84a153 100644
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 6919b468f06..56d52d41b31 100644
+index daa48fdfc2b..2fcfc5d770f 100644
 --- a/gcc/config/s390/linux.h
 +++ b/gcc/config/s390/linux.h
@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
@ -192,7 +195,7 @@ index 6919b468f06..56d52d41b31 100644
    %{!shared: \
       %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 63853e60c03..de6d8675456 100644
+index 2550d7ee8f0..7596d0b2757 100644
 --- a/gcc/config/sparc/linux.h
 +++ b/gcc/config/sparc/linux.h
@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@ -205,10 +208,10 @@ index 63853e60c03..de6d8675456 100644
   %{!shared: \
     %{!static: \
 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 625c9ab7902..7aec9d3a016 100644
+index 8c15de433ee..be1508e5abe 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -695,8 +695,11 @@ proper position among the other output files.  */
+@@ -737,8 +737,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -222,7 +225,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -713,8 +716,11 @@ proper position among the other output files.  */
+@@ -773,8 +776,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -236,7 +239,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -731,8 +737,11 @@ proper position among the other output files.  */
+@@ -791,8 +797,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
@ -250,7 +253,7 @@ index 625c9ab7902..7aec9d3a016 100644
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -747,8 +756,11 @@ proper position among the other output files.  */
+@@ -807,8 +816,11 @@ proper position among the other output files.  */
 #define STATIC_LIBUBSAN_LIBS \
   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
 #ifdef HAVE_LD_STATIC_DYNAMIC
--- a/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/cross/gcc-armv7/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@ -1,4 +1,4 @@
-From fe4ed38e850c9965482a28e16857dc4a451bbfc6 Mon Sep 17 00:00:00 2001
+From a2c4ea1f97c358486316d0e8536b021faa4581a5 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wformat and -Wformat-security by default.
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index c49da99d395..93f25319005 100644
+index 2005b783c68..c5c6af427cc 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
-@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end
+@@ -637,7 +637,7 @@ Warn about function calls with format strings that write past the end
 of the destination region.  Same as -Wformat-overflow=1.
 
 Wformat-security
@ -20,7 +20,7 @@ index c49da99d395..93f25319005 100644
 Warn about possible security problems with format functions.
 
 Wformat-signedness
-@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+@@ -658,7 +658,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 
 Wformat=
--- a/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
+++ b/cross/gcc-armv7/0007-Enable-Wtrampolines-by-default.patch
@ -1,4 +1,4 @@
-From 937c028663fa21fe9694a5725d1e96f3dbfb93fd Mon Sep 17 00:00:00 2001
+From 5cbd83abefc1f3cf93057383e6ff59196934dbf7 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Enable -Wtrampolines by default.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/gcc/common.opt b/gcc/common.opt
-index ca942863064..0a0ab6195ee 100644
+index d15105a73f3..29f9504cb68 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
-@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning
+@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 
 Wtrampolines
--- a/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/cross/gcc-armv7/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@ -1,4 +1,4 @@
-From 43813024350c27cf11fc07dcd3d7a02f752bd0c7 Mon Sep 17 00:00:00 2001
+From 02c1d7932c3c3b9813431937dd82971a3ca86088 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
@ -10,10 +10,10 @@ Subject: [PATCH] Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
 2 files changed, 8 insertions(+), 2 deletions(-)

 diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 7aec9d3a016..daeb4d0c8ea 100644
+index be1508e5abe..e495b222095 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
-@@ -886,6 +886,12 @@ proper position among the other output files.  */
+@@ -989,6 +989,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 
@ -26,20 +26,20 @@ index 7aec9d3a016..daeb4d0c8ea 100644
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1170,7 +1176,7 @@ static const char *cc1_options =
+@@ -1288,7 +1294,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
 - %{fsyntax-only:-o %j} %{-param*}\
 + %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
  %{coverage:-fprofile-arcs -ftest-coverage}\
  %{fprofile-arcs|fprofile-generate*|coverage:\
    %{!fprofile-update=single:\
 diff --git a/gcc/params.opt b/gcc/params.opt
-index 4aec480798b..eaecfab37ad 100644
+index 8ba281b4cfa..bab39cdf8a2 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
-@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+@@ -946,7 +946,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
 The maximum number of SSA_NAME assignments to follow in determining a value.
 
 -param=ssp-buffer-size=
--- a/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/cross/gcc-armv7/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@ -1,4 +1,4 @@
-From 506bda71fad5e51ffe5d1cfbf408f56a5e67afed Mon Sep 17 00:00:00 2001
+From a91c942466bed1046461500c00e0ee1c9a68481d 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
@ -26,7 +26,7 @@ https://bugs.gentoo.org/295480
 2 files changed, 2 insertions(+)

 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index a9391d8d167..f7eee24dc8c 100644
+index ab716ff04ea..e595268d9fc 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
@ -38,10 +38,10 @@ index a9391d8d167..f7eee24dc8c 100644
 
 all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index a0f84b0cfa0..ab24a47a2fd 100644
+index 8edd2e05639..63f61fcf96f 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
-@@ -548,6 +548,7 @@ uninstall-am:
+@@ -553,6 +553,7 @@ uninstall-am:
 
 
 .po.mo:
--- a/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/cross/gcc-armv7/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@ -1,4 +1,4 @@
-From 311daa31ea5f1f0b410c58aeda7c2c4635ec0e2b Mon Sep 17 00:00:00 2001
+From 856b0c7ac4f4513af20e505b27e9fa19234b7fa9 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.
@ -8,10 +8,10 @@ Subject: [PATCH] Don't declare asprintf if defined as a macro.
 1 file changed, 3 insertions(+)

 diff --git a/include/libiberty.h b/include/libiberty.h
-index 141cb886a85..fa0e78eb62f 100644
+index f4c0fe11d6f..cf4b1043e4d 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
-@@ -645,8 +645,11 @@ extern int pwait (int, int *, int);
+@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
 /* Like sprintf but provides a pointer to malloc'd storage, which must
    be freed by the caller.  */
 
--- a/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/cross/gcc-armv7/0011-libiberty-copy-PIC-objects-during-build-process.patch
@ -1,4 +1,4 @@
-From 2146e96bc76ef7d1e6796f991b880ebd0302afa4 Mon Sep 17 00:00:00 2001
+From 5fe2309817ce1cdad4183921faf890886ea34493 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
@ -8,10 +8,10 @@ Subject: [PATCH] libiberty: copy PIC objects during build process
 1 file changed, 1 insertion(+)

 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index d6b302e02fd..fd39928546f 100644
+index 4f1213b983b..d0224649d30 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
-@@ -263,6 +263,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+@@ -264,6 +264,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
 	  $(RANLIB) $(TARGETLIB); \
--- a/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
+++ b/cross/gcc-armv7/0012-libitm-disable-FORTIFY.patch
@ -1,4 +1,4 @@
-From e3b5b8fc0ad9c7bf33930632060385fd340aafb7 Mon Sep 17 00:00:00 2001
+From e0dfb9ef8b3a3ef3264847b030c9e38a3059ad24 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
@ -8,7 +8,7 @@ Subject: [PATCH] libitm: disable FORTIFY
 1 file changed, 10 insertions(+)

 diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index d1beb5c9ec8..c2b50b95c01 100644
+index a3d84896cc5..ecb281d5919 100644
 --- a/libitm/configure.tgt
 +++ b/libitm/configure.tgt
@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
--- a/Show more
+++ b/Show more