main/gcc: upgrade to 11.2.1_git20211125

c29fc976 · Ariadne Conill · 6aaabb6c · c29fc976 · c29fc976 · c29fc976
Commit c29fc976 authored Nov 25, 2021 by Ariadne Conill
--- a/main/gcc/0001-posix_memalign.patch
+++ b/main/gcc/0001-posix_memalign.patch
-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/main/gcc/0002-gcc-poison-system-directories.patch
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
-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/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
+++ b/main/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch
-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/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-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/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-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/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
-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/main/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
-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/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-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/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-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/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-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/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
-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/main/gcc/0012-libitm-disable-FORTIFY.patch
+++ b/main/gcc/0012-libitm-disable-FORTIFY.patch
-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/main/gcc/0013-libgcc_s.patch
+++ b/main/gcc/0013-libgcc_s.patch
-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/main/gcc/0014-nopie.patch
+++ b/main/gcc/0014-nopie.patch
-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/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
+++ b/main/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-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