Added gcc 13.2.0 with alpine linux patches to base

Added a C file to create a libssp file separate from gcc to musl build file in base
2024-11-05 13:03:07 +05:30 · 2024-11-05 13:03:07 +05:30 · 506c5912cd
commit 506c5912cd
parent 60f3c99df5
25 changed files with 1645 additions and 6 deletions
--- a/base/gcc/0001-posix_memalign.patch
+++ b/base/gcc/0001-posix_memalign.patch
@ -0,0 +1,42 @@
 From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Fri, 26 Jan 2018 20:32:50 +0000
 Subject: [PATCH 01/35] posix_memalign
 ---
 gcc/config/i386/pmm_malloc.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
 index 3527283693b..c4071b64b53 100644
 --- a/gcc/config/i386/pmm_malloc.h
 +++ b/gcc/config/i386/pmm_malloc.h
@@ -27,12 +27,13 @@
 #include <stdlib.h>
 /* We can't depend on <stdlib.h> since the prototype of posix_memalign
 -   may not be visible.  */
 +   may not be visible and we can't pollute the namespace either.  */
 #ifndef __cplusplus
 -extern int posix_memalign (void **, size_t, size_t);
 +extern int _mm_posix_memalign (void **, size_t, size_t)
 #else
 -extern "C" int posix_memalign (void **, size_t, size_t) throw ();
 +extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
 #endif
 +__asm__("posix_memalign");
 static __inline void *
 _mm_malloc (size_t __size, size_t __alignment)
@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
     return malloc (__size);
   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
     __alignment = sizeof (void *);
 -  if (posix_memalign (&__ptr, __alignment, __size) == 0)
 +  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
     return __ptr;
   else
     return NULL;
 -- 
 2.41.0
--- a/base/gcc/0002-gcc-poison-system-directories.patch
+++ b/base/gcc/0002-gcc-poison-system-directories.patch
@ -0,0 +1,203 @@
 From 4fa620d8c3e6730211bfb071eb4c817320491bd0 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 02/35] gcc: poison-system-directories
 Add /sw/include and /opt/include based on the original
 zecke-no-host-includes.patch patch.  The original patch checked for
 /usr/include, /sw/include and /opt/include and then triggered a failure and
 aborted.
 Instead, we add the two missing items to the current scan.  If the user
 wants this to be a failure, they can add "-Werror=poison-system-directories".
 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 ---
 gcc/common.opt      |  4 ++++
 gcc/config.in       |  6 ++++++
 gcc/configure       | 16 ++++++++++++++++
 gcc/configure.ac    | 10 ++++++++++
 gcc/doc/invoke.texi |  9 +++++++++
 gcc/gcc.cc          |  2 ++
 gcc/incpath.cc      | 21 +++++++++++++++++++++
 7 files changed, 68 insertions(+)
 diff --git a/gcc/common.opt b/gcc/common.opt
 index 862c474d3c8..64c4277c991 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
@@ -711,6 +711,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.
 +Wpoison-system-directories
 +Common Var(flag_poison_system_directories) Init(1) Warning
 +Warn for -I and -L options using system directories if cross compiling
 +
 Wshadow
 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 4cad077bfbe..0679fbbf4c6 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
@@ -236,6 +236,12 @@
 #endif
 +/* Define to warn for use of native system header directories */
 +#ifndef USED_FOR_TARGET
 +#undef ENABLE_POISON_SYSTEM_DIRECTORIES
 +#endif
 +
 +
 /* Define if you want all operations on RTL (the basic data structure of the
    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 c7b26d1927d..8c46369f73f 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -1026,6 +1026,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
@@ -1788,6 +1789,8 @@ Optional Features:
   --enable-version-specific-runtime-libs
                           specify that runtime libraries should be installed
                           in a compiler-specific directory
 +  --enable-poison-system-directories
 +                          warn for use of native system header directories
   --enable-plugin         enable plugin support
   --enable-host-shared    build host code as shared libraries
   --disable-libquadmath-support
@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
 fi
 +# Check whether --enable-poison-system-directories was given.
 +if test "${enable_poison_system_directories+set}" = set; then :
 +  enableval=$enable_poison_system_directories;
 +else
 +  enable_poison_system_directories=no
 +fi
 +
 +if test "x${enable_poison_system_directories}" = "xyes"; then
 +
 +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
 +
 +fi
 +
 # Substitute configuration variables
 diff --git a/gcc/configure.ac b/gcc/configure.ac
 index 09082e8ccae..5504bf6eb01 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
                 [specify that runtime libraries should be
                  installed in a compiler-specific directory])])
 +AC_ARG_ENABLE([poison-system-directories],
 +             AS_HELP_STRING([--enable-poison-system-directories],
 +                            [warn for use of native system header directories]),,
 +             [enable_poison_system_directories=no])
 +if test "x${enable_poison_system_directories}" = "xyes"; then
 +  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
 +           [1],
 +           [Define to warn for use of native system header directories])
 +fi
 +
 # Substitute configuration variables
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
 index af0e5933fdb..b6731a4673c 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
 -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
 -Wparentheses  -Wno-pedantic-ms-format
 -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
 +-Wno-poison-system-directories
 -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
 -Wrestrict  -Wno-return-local-addr  -Wreturn-type
 -Wno-scalar-storage-order  -Wsequence-point
@@ -8426,6 +8427,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.
 +@opindex Wno-poison-system-directories
 +@item -Wno-poison-system-directories
 +Do not warn for @option{-I} or @option{-L} options using system
 +directories such as @file{/usr/include} when cross compiling.  This
 +option is intended for use in chroot environments when such
 +directories contain the correct headers and libraries for the target
 +system rather than the host.
 +
 @opindex Wfloat-equal
 @opindex Wno-float-equal
 @item -Wfloat-equal
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 16bb07f2cdc..33b56e721d2 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -1146,6 +1146,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}}} \
 +    %{Wno-poison-system-directories:--no-poison-system-directories} \
 +    %{Werror=poison-system-directories:--error-poison-system-directories} \
     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
 diff --git a/gcc/incpath.cc b/gcc/incpath.cc
 index 4d44321183f..0f3f071b44c 100644
 --- a/gcc/incpath.cc
 +++ b/gcc/incpath.cc
@@ -26,6 +26,7 @@
 #include "intl.h"
 #include "incpath.h"
 #include "cppdefault.h"
 +#include "diagnostic-core.h"
 /* Microsoft Windows does not natively support inodes.
    VMS has non-numeric inodes.  */
@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
 	}
       fprintf (stderr, _("End of search list.\n"));
     }
 +
 +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
 +  if (flag_poison_system_directories)
 +    {
 +       struct cpp_dir *p;
 +
 +       for (p = heads[INC_QUOTE]; p; p = p->next)
 +         {
 +          if ((!strncmp (p->name, "/usr/include", 12))
 +              || (!strncmp (p->name, "/usr/local/include", 18))
 +              || (!strncmp (p->name, "/usr/X11R6/include", 18))
 +              || (!strncmp (p->name, "/sw/include", 11))
 +              || (!strncmp (p->name, "/opt/include", 12)))
 +            warning (OPT_Wpoison_system_directories,
 +                     "include location \"%s\" is unsafe for "
 +                     "cross-compilation",
 +                     p->name);
 +         }
 +    }
 +#endif
 }
 /* Use given -I paths for #include "..." but not #include <...>, and
 -- 
 2.41.0
--- a/base/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
+++ b/base/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
@ -0,0 +1,44 @@
 From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:45:49 +0000
 Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
 Previously, we also used to turn on -z relro here, but we now build
 binutils with --enable-relro, which is functionally equivalent.
 Binutils does not appear to have a similar option for enabling -z
 now by default.
 ---
 gcc/doc/invoke.texi | 3 +++
 gcc/gcc.cc          | 1 +
 2 files changed, 4 insertions(+)
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
 index b6731a4673c..f393c7846c6 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -17961,6 +17961,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}.
 +NOTE: In Alpine Linux, for LDFLAGS, the option
 +@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
 +
 @opindex u
 @item -u @var{symbol}
 Pretend the symbol @var{symbol} is undefined, to force linking of
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 33b56e721d2..f82fae23c22 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -1144,6 +1144,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 \
 +   "-z now " \
    "%X %{o*} %{e*} %{N} %{n} %{r}\
     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
     %{Wno-poison-system-directories:--no-poison-system-directories} \
 -- 
 2.41.0
--- a/base/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+++ b/base/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@ -0,0 +1,46 @@
 From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:22 +0000
 Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
 ObjC, ObjC++, if the optimization level is > 0
 ---
 gcc/c-family/c-cppbuiltin.cc | 4 ++++
 gcc/doc/invoke.texi          | 6 ++++++
 2 files changed, 10 insertions(+)
 diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
 index 5d64625fcd7..868d69506e4 100644
 --- a/gcc/c-family/c-cppbuiltin.cc
 +++ b/gcc/c-family/c-cppbuiltin.cc
@@ -1546,6 +1546,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);
 +  /* Fortify Source enabled by default for optimization levels > 0 */
 +  if (optimize)
 +    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
 +
   /* Misc.  */
   if (flag_gnu89_inline)
     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
 index f393c7846c6..ef3c14a189e 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -11868,6 +11868,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.
 +NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
 +set by default, and is activated when @option{-O} is set to 2 or higher.
 +This enables additional compile-time and run-time checks for several libc
 +functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
 +@option{-D_FORTIFY_SOURCE=0}.
 +
 @opindex O3
 @item -O3
 Optimize yet more.  @option{-O3} turns on all optimizations specified
 -- 
 2.41.0
--- a/base/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+++ b/base/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@ -0,0 +1,272 @@
 From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
 linker, but always link the sanitizer libraries with --no-as-needed.
 ---
 gcc/config/aarch64/aarch64-linux.h |  1 +
 gcc/config/alpha/linux-elf.h       |  2 +-
 gcc/config/arm/linux-elf.h         |  1 +
 gcc/config/gnu-user.h              |  6 +++---
 gcc/config/i386/gnu-user.h         |  2 +-
 gcc/config/i386/gnu-user64.h       |  1 +
 gcc/config/ia64/linux.h            |  2 +-
 gcc/config/mips/gnu-user.h         |  1 +
 gcc/config/riscv/linux.h           |  1 +
 gcc/config/rs6000/linux64.h        |  4 ++--
 gcc/config/rs6000/sysv4.h          |  2 +-
 gcc/config/s390/linux.h            |  2 +-
 gcc/config/sparc/linux.h           |  2 +-
 gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
 14 files changed, 36 insertions(+), 19 deletions(-)
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
 index 4277f03da2a..b131983a546 100644
 --- a/gcc/config/aarch64/aarch64-linux.h
 +++ b/gcc/config/aarch64/aarch64-linux.h
@@ -35,6 +35,7 @@
 #define CPP_SPEC "%{pthread:-D_REENTRANT}"
 #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
 +   --as-needed					\
    %{static:-Bstatic}				\
    %{shared:-shared}				\
    %{symbolic:-Bsymbolic}			\
 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
 index 03f783f2ad1..d946e700dda 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
 #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
 -#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
 +#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
   %{O*:-O3} %{!O*:-O1}						\
   %{shared:-shared}						\
   %{!shared:							\
 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
 index 7b7b7cbbe14..49c050c6f2c 100644
 --- a/gcc/config/arm/linux-elf.h
 +++ b/gcc/config/arm/linux-elf.h
@@ -70,6 +70,7 @@
      %{rdynamic:-export-dynamic} \
      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
    -X \
 +   --as-needed \
    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
    SUBTARGET_EXTRA_LINK_SPEC
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
 index eda8010b133..b26b17f2f2a 100644
 --- a/gcc/config/gnu-user.h
 +++ b/gcc/config/gnu-user.h
@@ -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 LIBHWASAN_EARLY_SPEC
 #define LIBHWASAN_EARLY_SPEC "%{!shared:libhwasan_preinit%O%s} " \
   "%{static-libhwasan:%{!shared:" \
@@ -146,12 +146,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 " \
 -  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
 #undef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
   "%{static-liblsan:%{!shared:" \
   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
 -  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
 +  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
 #endif
 #undef TARGET_F951_OPTIONS
 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
 index a79b739089d..e0752673dff 100644
 --- a/gcc/config/i386/gnu-user.h
 +++ b/gcc/config/i386/gnu-user.h
@@ -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 }
 -#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
 +#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{!static-pie: \
 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
 index 3b63b99acf6..759bf0db86f 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
                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
 +  --as-needed \
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
 index 5dfd428aa17..02656dad7fc 100644
 --- a/gcc/config/ia64/linux.h
 +++ b/gcc/config/ia64/linux.h
@@ -58,7 +58,7 @@ do {						\
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
 #undef LINK_SPEC
 -#define LINK_SPEC "\
 +#define LINK_SPEC " --as-needed \
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
 index a4e5380b589..3cc61bce69f 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
 #undef GNU_USER_TARGET_LINK_SPEC
 #define GNU_USER_TARGET_LINK_SPEC "\
   %{G*} %{EB} %{EL} %{mips*} %{shared} \
 + -as-needed \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
 index 3e625e0f867..f8c2c351e5a 100644
 --- a/gcc/config/riscv/linux.h
 +++ b/gcc/config/riscv/linux.h
@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
   "%{mabi=ilp32:_ilp32}"
 #define LINK_SPEC "\
 +-as-needed \
 -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
 %{mno-relax:--no-relax} \
 %{mbig-endian:-EB} \
 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
 index 9e457033d11..08016bf224d 100644
 --- a/gcc/config/rs6000/linux64.h
 +++ b/gcc/config/rs6000/linux64.h
@@ -377,13 +377,13 @@ extern int dot_symbols;
 					   " -m elf64ppc")
 #endif
 -#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
 +#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
   %{!static-pie: \
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
   %(link_os_extra_spec32)"
 -#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
 +#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
   %{!static-pie: \
     %{rdynamic:-export-dynamic} \
     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
 index ae932fc22f0..c8ff0c6dc8e 100644
 --- a/gcc/config/rs6000/sysv4.h
 +++ b/gcc/config/rs6000/sysv4.h
@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
 #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
 #endif
 -#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
 +#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
 index 02aa1edaff8..64df5801134 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
 #undef  LINK_SPEC
 #define LINK_SPEC \
 -  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
 +  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
    %{shared:-shared} \
    %{!shared: \
       %{static:-static} \
 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
 index 0e33b3cac2c..c2f44546e62 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);
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 #undef  LINK_SPEC
 -#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
 +#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
   %{!mno-relax:%{!r:-relax}} \
   %{!shared: \
     %{!static: \
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index f82fae23c22..da6417dd0d1 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -754,8 +754,11 @@ proper position among the other output files.  */
 #ifdef LIBASAN_EARLY_SPEC
 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 -#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
 -		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
 +#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
 +		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " -lasan " \
 +		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
 +		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
@@ -790,8 +793,11 @@ proper position among the other output files.  */
 #ifdef LIBTSAN_EARLY_SPEC
 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 -#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
 -		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
 +#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
 +		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " -ltsan " \
 +		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
 +		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
@@ -808,8 +814,11 @@ proper position among the other output files.  */
 #ifdef LIBLSAN_EARLY_SPEC
 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
 #elif defined(HAVE_LD_STATIC_DYNAMIC)
 -#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
 -		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
 +#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
 +		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " -llsan " \
 +		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
 +		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
@@ -824,8 +833,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
 -#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
 -		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
 +#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
 +		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " -lubsan " \
 +		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
 +		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
 2.41.0
--- a/base/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
+++ b/base/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@ -0,0 +1,34 @@
 From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
 ---
 gcc/c-family/c.opt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
 index a75038930ae..b98726f33ed 100644
 --- a/gcc/c-family/c.opt
 +++ b/gcc/c-family/c.opt
@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
 of the destination region.  Same as -Wformat-overflow=1.
 Wformat-security
 -C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
 +C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
 Warn about possible security problems with format functions.
 Wformat-signedness
@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
 Warn about zero-length formats.
 Wformat=
 -C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
 +C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
 Warn about printf/scanf/strftime/strfmon format string anomalies.
 Wformat-overflow=
 -- 
 2.41.0
--- a/base/gcc/0007-Enable-Wtrampolines-by-default.patch
+++ b/base/gcc/0007-Enable-Wtrampolines-by-default.patch
@ -0,0 +1,25 @@
 From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:48:24 +0000
 Subject: [PATCH 07/35] Enable -Wtrampolines by default.
 ---
 gcc/common.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/gcc/common.opt b/gcc/common.opt
 index 64c4277c991..c24839d32bc 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
 Do not suppress warnings from system headers.
 Wtrampolines
 -Common Var(warn_trampolines) Warning
 +Common Var(warn_trampolines) Init(1) Warning
 Warn whenever a trampoline is generated.
 Wtrivial-auto-var-init
 -- 
 2.41.0
--- a/base/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+++ b/base/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@ -0,0 +1,53 @@
 From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:49:40 +0000
 Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
 -ffreestanding Change the buffer size.
 ---
 gcc/gcc.cc     | 8 +++++++-
 gcc/params.opt | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index da6417dd0d1..b5a6f200635 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -983,6 +983,12 @@ proper position among the other output files.  */
 #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 #endif
 +#ifdef ENABLE_DEFAULT_SSP
 +#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
 +#else
 +#define NO_SSP_SPEC ""
 +#endif
 +
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
@@ -1282,7 +1288,7 @@ static const char *cc1_options =
  %{-version:--version}\
  %{-help=*:--help=%*}\
  %{!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 823cdb2ff85..5b096899b40 100644
 --- a/gcc/params.opt
 +++ b/gcc/params.opt
@@ -1006,7 +1006,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=
 -Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
 +Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
 The lower bound for a buffer to be considered for stack smashing protection.
 -param=stack-clash-protection-guard-size=
 -- 
 2.41.0
--- a/base/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+++ b/base/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@ -0,0 +1,54 @@
 From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
 gcc bootstrapping.
 Solves error messages like the following:
 msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
 The libgcc_s.so used during build doesn't satisfy the needs of the
 libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
 is used as a stand-alone application here, and what library it uses
 behind the scenes is of no concern to the gcc build process.
 Therefore, simply invoking it "as usual", i.e. without any special
 library path, will make it work as expected here.
 2011-09-19 Martin von Gagern
 References:
 https://bugs.gentoo.org/372377
 https://bugs.gentoo.org/295480
 ---
 libstdc++-v3/po/Makefile.am | 1 +
 libstdc++-v3/po/Makefile.in | 1 +
 2 files changed, 2 insertions(+)
 diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
 index 12d34910830..61b13762b71 100644
 --- a/libstdc++-v3/po/Makefile.am
 +++ b/libstdc++-v3/po/Makefile.am
@@ -38,6 +38,7 @@ MSGFMT = msgfmt
 EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
 .po.mo:
 +	env --unset=LD_LIBRARY_PATH \
 	$(MSGFMT) -o $@ $<
 all-local: all-local-$(USE_NLS)
 diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
 index 8e93445acd2..d6ff06e5ddb 100644
 --- a/libstdc++-v3/po/Makefile.in
 +++ b/libstdc++-v3/po/Makefile.in
@@ -561,6 +561,7 @@ uninstall-am:
 .po.mo:
 +	env --unset=LD_LIBRARY_PATH \
 	$(MSGFMT) -o $@ $<
 all-local: all-local-$(USE_NLS)
 -- 
 2.41.0
--- a/base/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+++ b/base/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@ -0,0 +1,28 @@
 From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
 ---
 include/libiberty.h | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/include/libiberty.h b/include/libiberty.h
 index 1d5c779fcff..19e3cb1e31c 100644
 --- a/include/libiberty.h
 +++ b/include/libiberty.h
@@ -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.  */
 +/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
 +#ifndef asprintf
 extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
 #endif
 +#endif
 /* Like asprintf but allocates memory without fail. This works like
    xmalloc.  */
 -- 
 2.41.0
--- a/base/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
+++ b/base/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@ -0,0 +1,24 @@
 From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
 ---
 libiberty/Makefile.in | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
 index 72608f3e4a7..58356884728 100644
 --- a/libiberty/Makefile.in
 +++ b/libiberty/Makefile.in
@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
 	  $(RANLIB) $(TARGETLIB); \
 +	  cp $(TARGETLIB) ../ ; \
 	  cd ..; \
 	else true; fi
 -- 
 2.41.0
--- a/base/gcc/0012-libgcc_s.patch
+++ b/base/gcc/0012-libgcc_s.patch
@ -0,0 +1,57 @@
 From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH 12/35] libgcc_s
 ---
 gcc/config/i386/i386-expand.cc | 4 ++--
 libgcc/config/i386/cpuinfo.c   | 6 +++---
 libgcc/config/i386/t-linux     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
 index 0d817fc3f3b..2e99db00db9 100644
 --- a/gcc/config/i386/i386-expand.cc
 +++ b/gcc/config/i386/i386-expand.cc
@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
     {
     case IX86_BUILTIN_CPU_INIT:
       {
 -	/* Make it call __cpu_indicator_init in libgcc.  */
 +	/* Make it call __cpu_indicator_init in libgcc.a.  */
 	tree call_expr, fndecl, type;
 	type = build_function_type_list (integer_type_node, NULL_TREE);
 -	fndecl = build_fn_decl ("__cpu_indicator_init", type);
 +	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
 	call_expr = build_call_expr (fndecl, 0);
 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
       }
 diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
 index 50b6d8248a2..724ced402a1 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
 			     __cpu_features2);
 }
 -#if defined SHARED && defined USE_ELF_SYMVER
 -__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
 -__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
 +#ifndef SHARED
 +int __cpu_indicator_init_local (void)
 +  __attribute__ ((weak, alias ("__cpu_indicator_init")));
 #endif
 diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
 index 8506a635790..564296f788e 100644
 --- a/libgcc/config/i386/t-linux
 +++ b/libgcc/config/i386/t-linux
@@ -3,5 +3,5 @@
 # t-slibgcc-elf-ver and t-linux
 SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
 -HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
 -- 
 2.41.0
--- a/base/gcc/0013-nopie.patch
+++ b/base/gcc/0013-nopie.patch
@ -0,0 +1,75 @@
 From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH 13/35] nopie
 ---
 gcc/configure    | 27 +++++++++++++++++++++++++++
 gcc/configure.ac | 13 +++++++++++++
 2 files changed, 40 insertions(+)
 diff --git a/gcc/configure b/gcc/configure
 index 8c46369f73f..e59cbee1767 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -32268,6 +32268,33 @@ fi
 $as_echo "$gcc_cv_no_pie" >&6; }
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
 +else
 +  # Check if -nopie works.
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
 +$as_echo_n "checking for -nopie option... " >&6; }
 +if test "${gcc_cv_nopie+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  saved_LDFLAGS="$LDFLAGS"
 +     LDFLAGS="$LDFLAGS -nopie"
 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +int main(void) {return 0;}
 +_ACEOF
 +if ac_fn_cxx_try_link "$LINENO"; then :
 +  gcc_cv_nopie=yes
 +else
 +  gcc_cv_nopie=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +     LDFLAGS="$saved_LDFLAGS"
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
 +$as_echo "$gcc_cv_nopie" >&6; }
 +  if test "$gcc_cv_nopie" = "yes"; then
 +    NO_PIE_FLAG="-nopie"
 +  fi
 fi
 diff --git a/gcc/configure.ac b/gcc/configure.ac
 index 5504bf6eb01..57268319de1 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
    LDFLAGS="$saved_LDFLAGS"])
 if test "$gcc_cv_no_pie" = "yes"; then
   NO_PIE_FLAG="-no-pie"
 +else
 +  # Check if -nopie works.
 +  AC_CACHE_CHECK([for -nopie option],
 +    [gcc_cv_nopie],
 +    [saved_LDFLAGS="$LDFLAGS"
 +     LDFLAGS="$LDFLAGS -nopie"
 +     AC_LINK_IFELSE([int main(void) {return 0;}],
 +       [gcc_cv_nopie=yes],
 +       [gcc_cv_nopie=no])
 +     LDFLAGS="$saved_LDFLAGS"])
 +  if test "$gcc_cv_nopie" = "yes"; then
 +    NO_PIE_FLAG="-nopie"
 +  fi
 fi
 AC_SUBST([NO_PIE_FLAG])
 -- 
 2.41.0
--- a/base/gcc/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+++ b/base/gcc/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@ -0,0 +1,24 @@
 From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
 ---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/Makefile.in b/Makefile.in
 index 06a9398e172..6ff2b3f9925 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
 # built for the build system to override those in BASE_FLAGS_TO_PASS.
 EXTRA_BUILD_FLAGS = \
 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
 +	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
 # This is the list of directories to built for the host system.
 -- 
 2.41.0
--- a/base/gcc/0016-add-fortify-headers-paths.patch
+++ b/base/gcc/0016-add-fortify-headers-paths.patch
@ -0,0 +1,25 @@
 From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH 16/35] add fortify-headers paths
 ---
 gcc/config/linux.h | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/gcc/config/linux.h b/gcc/config/linux.h
 index e3aca79cccc..b3537b8fbeb 100644
 --- a/gcc/config/linux.h
 +++ b/gcc/config/linux.h
@@ -159,6 +159,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #ifdef NATIVE_SYSTEM_HEADER_DIR
 #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
 +    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
 +    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
 #else
 -- 
 2.41.0
--- a/base/gcc/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+++ b/base/gcc/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@ -0,0 +1,31 @@
 From 857db04f4f1a06e866551b4172fe8f27363f4a92 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 17/35] Alpine musl package provides libssp_nonshared.a. We
 link to it unconditionally, as otherwise we get link failures if some objects
 are -fstack-protector built and final link happens with -fno-stack-protector.
 This seems to be the common case when bootstrapping gcc, the piepatches do
 not seem to fully fix the crosstoolchain and bootstrap sequence wrt.
 stack-protector flag usage.
 ---
 gcc/gcc.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index b5a6f200635..6cbb726599b 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -991,8 +991,7 @@ proper position among the other output files.  */
 #ifndef LINK_SSP_SPEC
 #ifdef TARGET_LIBC_PROVIDES_SSP
 -#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 -		       "|fstack-protector-strong|fstack-protector-explicit:}"
 +#define LINK_SSP_SPEC "-lssp_nonshared"
 #else
 #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
 		       "|fstack-protector-strong|fstack-protector-explicit" \
 -- 
 2.41.0
--- a/base/gcc/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+++ b/base/gcc/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@ -0,0 +1,69 @@
 From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
 linking libtsan.
 ---
 gcc/gcc.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 6cbb726599b..59390fd39d6 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -755,10 +755,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 "}" \
 -		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " %{!static-libasan:--push-state --no-as-needed}" \
 		     " -lasan " \
 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
 -		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 +		     " %{!static-libasan:--pop-state}" \
 		     STATIC_LIBASAN_LIBS
 #else
 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
@@ -794,10 +794,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 "}" \
 -		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " %{!static-libtsan:--push-state --no-as-needed}" \
 		     " -ltsan " \
 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
 -		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 +		     " %{!static-libtsan:--pop-state}" \
 		     STATIC_LIBTSAN_LIBS
 #else
 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
@@ -815,10 +815,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 "}" \
 -		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " %{!static-liblsan:--push-state --no-as-needed}" \
 		     " -llsan " \
 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
 -		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 +		     " %{!static-liblsan:--pop-state}" \
 		     STATIC_LIBLSAN_LIBS
 #else
 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
@@ -834,10 +834,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 "}" \
 -		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
 +		     " %{!static-libubsan:--push-state --no-as-needed}" \
 		     " -lubsan " \
 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
 -		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
 +		     " %{!static-libubsan:--pop-state}" \
 		     STATIC_LIBUBSAN_LIBS
 #else
 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
 -- 
 2.41.0
--- a/base/gcc/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+++ b/base/gcc/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@ -0,0 +1,256 @@
 From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
 Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
 LINK_GCC_C_SEQUENCE_SPEC [PR81358]
 This fixes issues with RISC-V.
 ---
 Makefile.in           |  1 +
 gcc/config.in         |  6 ++++++
 gcc/config/gnu-user.h | 12 +++++++++++-
 gcc/configure         | 31 ++++++++++++++++++++++++++++++-
 gcc/configure.ac      | 21 +++++++++++++++++++++
 gcc/doc/install.texi  |  8 ++++++++
 gcc/doc/tm.texi       |  8 +++++++-
 gcc/doc/tm.texi.in    |  8 +++++++-
 gcc/gcc.cc            | 12 +++++++++++-
 9 files changed, 102 insertions(+), 5 deletions(-)
 diff --git a/Makefile.in b/Makefile.in
 index 6ff2b3f9925..394b105b271 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -235,6 +235,7 @@ HOST_EXPORTS = \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 +	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 diff --git a/gcc/config.in b/gcc/config.in
 index 0679fbbf4c6..ee81139b385 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
@@ -118,6 +118,12 @@
 #endif
 +/* Define if libatomic should always be linked. */
 +#ifndef USED_FOR_TARGET
 +#undef ENABLE_AUTOLINK_LIBATOMIC
 +#endif
 +
 +
 /* Define to 1 to specify that we are using the BID decimal floating point
    format instead of DPD */
 #ifndef USED_FOR_TARGET
 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
 index b26b17f2f2a..3f64ea46180 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
 #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
 #endif
 +#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
 +#  ifdef LD_AS_NEEDED_OPTION
 +#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
 +#  else
 +#    define LINK_LIBATOMIC_SPEC "-latomic"
 +#  endif
 +#elif !defined(LINK_LIBATOMIC_SPEC)
 +#  define LINK_LIBATOMIC_SPEC ""
 +#endif
 +
 #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
 -  "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
 +  "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
 #undef LINK_GCC_C_SEQUENCE_SPEC
 diff --git a/gcc/configure b/gcc/configure
 index e59cbee1767..787c35d4e25 100755
 --- a/gcc/configure
 +++ b/gcc/configure
@@ -984,6 +984,7 @@ with_changes_root_url
 enable_languages
 with_multilib_list
 with_multilib_generator
 +enable_autolink_libatomic
 with_zstd
 with_zstd_include
 with_zstd_lib
@@ -1713,6 +1714,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
 +  --enable-autolink-libatomic
 +                          enable automatic linking of libatomic (ignored if
 +                          not built)
   --disable-rpath         do not hardcode runtime library paths
   --enable-sjlj-exceptions
                           arrange to use setjmp/longjmp exception handling
@@ -8329,7 +8333,6 @@ else
 fi
 -
 # Check whether --with-multilib-generator was given.
 if test "${with_multilib_generator+set}" = set; then :
   withval=$with_multilib_generator; :
@@ -8337,6 +8340,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 :
 +  enableval=$enable_autolink_libatomic;
 +  case $enable_autolink_libatomic in
 +    yes | no) ;;
 +    *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
 +--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
 +  esac
 +
 +else
 +  enable_autolink_libatomic=''
 +fi
 +
 +
 +if test x$enable_autolink_libatomic = xyes; then
 +  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
 +
 +$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
 +
 +  else
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
 +$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
 +  fi
 +fi
 +
 # -------------------------
 # Checks for other programs
 diff --git a/gcc/configure.ac b/gcc/configure.ac
 index 57268319de1..56bcaa87620 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
 :,
 with_multilib_generator=default)
 +# If libatomic is available, whether it should be linked automatically
 +AC_ARG_ENABLE(autolink-libatomic,
 +[AS_HELP_STRING([--enable-autolink-libatomic],
 +		[enable automatic linking of libatomic (ignored if not built)])],
 +[
 +  case $enable_autolink_libatomic in
 +    yes | no) ;;
 +    *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
 +--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'.]) ;;
 +  esac
 +], [enable_autolink_libatomic=''])
 +
 +if test x$enable_autolink_libatomic = xyes; then
 +  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
 +    AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
 +	[Define if libatomic should always be linked.])
 +  else
 +    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
 +  fi
 +fi
 +
 # -------------------------
 # Checks for other programs
 # -------------------------
 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
 index b30d3691fe6..ccc8e5dbb00 100644
 --- a/gcc/doc/install.texi
 +++ b/gcc/doc/install.texi
@@ -2377,6 +2377,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}.
 +@item --enable-autolink-libatomic
 +@itemx --disable-autolink-libatomic
 +Tell GCC that it should automatically link libatomic; if supported by
 +the linker, the file is only linked as needed. This flag is ignored
 +when libatomic is not built. Note that this conigure flag is in particular
 +useful when building an offloading-target compiler; as for those, a
 +user had to specify @code{-foffload=target=-latomic} otherwise.
 +
 @item --with-glibc-version=@var{major}.@var{minor}
 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 a660e33739b..6183c407a2b 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.
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
 -By default this is @code{%G %L %G}.
 +By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
 +@end defmac
 +
 +@defmac LINK_LIBATOMIC_SPEC
 +This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
 +libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
 +is set.
 @end defmac
 @defmac POST_LINK_SPEC
 diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
 index f7ab5d48a63..281540aba68 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.
 @defmac LINK_GCC_C_SEQUENCE_SPEC
 The sequence in which libgcc and libc are specified to the linker.
 -By default this is @code{%G %L %G}.
 +By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
 +@end defmac
 +
 +@defmac LINK_LIBATOMIC_SPEC
 +This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
 +libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
 +is set.
 @end defmac
 @defmac POST_LINK_SPEC
 diff --git a/gcc/gcc.cc b/gcc/gcc.cc
 index 59390fd39d6..dae1dd4cf79 100644
 --- a/gcc/gcc.cc
 +++ b/gcc/gcc.cc
@@ -974,13 +974,23 @@ proper position among the other output files.  */
 # define ASM_DEBUG_OPTION_SPEC ""
 #endif
 +#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
 +#  ifdef LD_AS_NEEDED_OPTION
 +#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
 +#  else
 +#    define LINK_LIBATOMIC_SPEC "-latomic"
 +#  endif
 +#elif !defined(LINK_LIBATOMIC_SPEC)
 +#  define LINK_LIBATOMIC_SPEC ""
 +#endif
 +
 /* Here is the spec for running the linker, after compiling all files.  */
 /* This is overridable by the target in case they need to specify the
    -lgcc and -lc order specially, yet not require them to override all
    of LINK_COMMAND_SPEC.  */
 #ifndef LINK_GCC_C_SEQUENCE_SPEC
 -#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
 +#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
 #endif
 #ifdef ENABLE_DEFAULT_SSP
 -- 
 2.41.0
--- a/base/gcc/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+++ b/base/gcc/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@ -0,0 +1,27 @@
 From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
 Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
 musl targets
 ---
 libstdc++-v3/config/locale/generic/c_locale.cc | 3 ---
 1 file changed, 3 deletions(-)
 diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
 index 8849d78fdfa..aff467f98fe 100644
 --- a/libstdc++-v3/config/locale/generic/c_locale.cc
 +++ b/libstdc++-v3/config/locale/generic/c_locale.cc
@@ -242,9 +242,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     // Currently, the generic model only supports the "C" locale.
     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
     __cloc = 0;
 -    if (strcmp(__s, "C"))
 -      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
 -			    "name not valid"));
   }
   void
 -- 
 2.41.0
--- a/base/gcc/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+++ b/base/gcc/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
@ -0,0 +1,27 @@
 From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
 From: Mathias LANG <pro.mathias.lang@gmail.com>
 Date: Mon, 17 Jan 2022 03:49:21 +0000
 Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
 libucontext
 ref: alpine/aports#13422
 ---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/Makefile.in b/Makefile.in
 index 394b105b271..bc4a77fc300 100644
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -52809,7 +52809,7 @@ configure-target-libphobos:
 	esac; \
 	module_srcdir=libphobos; \
 	rm -f no-such-file || : ; \
 -	CONFIG_SITE=no-such-file $(SHELL) \
 +	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 -- 
 2.41.0
--- a/base/gcc/0031-druntime-link-against-libucontext-on-all-platforms.patch
+++ b/base/gcc/0031-druntime-link-against-libucontext-on-all-platforms.patch
@ -0,0 +1,54 @@
 From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 16 Jul 2022 09:21:11 +0200
 Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
 On musl-based Linux distributions, swapcontext etc. are not provided by
 musl but instead by libucontext. Hence, we _always_ need to link against
 an external library for these functions.
 ---
 libphobos/configure                | 8 --------
 libphobos/m4/druntime/libraries.m4 | 8 --------
 2 files changed, 16 deletions(-)
 diff --git a/libphobos/configure b/libphobos/configure
 index 925c53c5f5e..60c2a0c11c6 100755
 --- a/libphobos/configure
 +++ b/libphobos/configure
@@ -15216,14 +15216,6 @@ fi
   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
   # "yes" for targets that have 'version = AsmExternal'.
   druntime_fiber_asm_external=no
 -  case "$target_cpu" in
 -    aarch64* | \
 -    arm* | \
 -    i[34567]86|x86_64 | \
 -    powerpc)
 -      druntime_fiber_asm_external=yes
 -      ;;
 -  esac
   if test "$druntime_fiber_asm_external" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
 $as_echo_n "checking for library containing swapcontext... " >&6; }
 diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
 index 45a56f6f76a..fef6e890b1e 100644
 --- a/libphobos/m4/druntime/libraries.m4
 +++ b/libphobos/m4/druntime/libraries.m4
@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
   # "yes" for targets that have 'version = AsmExternal'.
   druntime_fiber_asm_external=no
 -  case "$target_cpu" in
 -    aarch64* | \
 -    arm* | \
 -    i[[34567]]86|x86_64 | \
 -    powerpc)
 -      druntime_fiber_asm_external=yes
 -      ;;
 -  esac
   if test "$druntime_fiber_asm_external" = no; then
     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
       AC_MSG_ERROR([swapcontext required but not found]))
 -- 
 2.41.0
--- a/base/gcc/0033-libphobos-do-not-use-LFS64-symbols.patch
+++ b/base/gcc/0033-libphobos-do-not-use-LFS64-symbols.patch
@ -0,0 +1,44 @@
 From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
 Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
 musl does not have these since 1.2.4, we can't use the compat interfaces.
 ---
 libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
 libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)
 diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
 index ae6752f220e..6b80d1ff0e6 100644
 --- a/libphobos/libdruntime/core/sys/posix/config.d
 +++ b/libphobos/libdruntime/core/sys/posix/config.d
@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
     enum __REDIRECT          = false;
     // Those three are irrelevant for Musl as it always uses 64 bits off_t
 -    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
 +    enum __USE_FILE_OFFSET64 = false;
     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
 diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
 index 0d3d517d69a..323aa0af72d 100644
 --- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
 +++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
 }
 else version (CRuntime_Musl)
 {
 -    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
 -    static if (__USE_FILE_OFFSET64)
 -        alias mmap = mmap64;
 -    else
 -        void* mmap(void*, size_t, int, int, int, off_t);
 +    void* mmap(void*, size_t, int, int, int, off_t);
     int munmap(void*, size_t);
 }
 else version (CRuntime_UClibc)
 -- 
 2.41.0
--- a/base/gcc/smbuild
+++ b/base/gcc/smbuild
@ -0,0 +1,116 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 # Generated by mksm SMLinux build file generator version 0.101
 app=gcc
 version=13.2.0
 build=1sml
 homepage="https://gcc.gnu.org/"
 download="https://ftp.gnu.org/gnu/gcc/gcc-$version/gcc-$version.tar.xz"
 desc="The Gnu Compiler Collection"
 requires="mpfr mpc"
 noautoconfsite=1
 preservestaticlibs=1
 prepbuilddir() {
  mkandenterbuilddir
  rm -rf $app-$version
  tar xf $srcdir/$app-$version.tar.?z*
  cd $app-$version
  fixbuilddirpermissions
  applypatch $srcdir/0001-posix_memalign.patch
  applypatch $srcdir/0002-gcc-poison-system-directories.patch
  applypatch $srcdir/0003-specs-turn-on-Wl-z-now-by-default.patch
  applypatch $srcdir/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
  applypatch $srcdir/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
  applypatch $srcdir/0006-Enable-Wformat-and-Wformat-security-by-default.patch
  applypatch $srcdir/0007-Enable-Wtrampolines-by-default.patch
  applypatch $srcdir/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
  applypatch $srcdir/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
  applypatch $srcdir/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
  applypatch $srcdir/0011-libiberty-copy-PIC-objects-during-build-process.patch
  applypatch $srcdir/0012-libgcc_s.patch
  applypatch $srcdir/0013-nopie.patch
  applypatch $srcdir/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
  applypatch $srcdir/0016-add-fortify-headers-paths.patch
  applypatch $srcdir/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
  applypatch $srcdir/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
  applypatch $srcdir/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
  applypatch $srcdir/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
  applypatch $srcdir/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
  applypatch $srcdir/0031-druntime-link-against-libucontext-on-all-platforms.patch
  applypatch $srcdir/0033-libphobos-do-not-use-LFS64-symbols.patch
 }
 build() {
  ./configure \
    --prefix=/usr \
    --libdir=/usr/lib \
    --mandir=/usr/share/man \
    --enable-checking=release \
    --disable-cet \
    --disable-fixed-point \
    --disable-libstdcxx-pch \
    --disable-multilib \
    --disable-nls \
    --disable-werror \
    --disable-symvers \
    --enable-__cxa_atexit \
    --enable-default-pie \
    --enable-default-ssp \
    --enable-languages=c,c++,objc,fortran \
    --enable-link-serialization=2 \
    --enable-linker-build-id \
    --disable-libssp \
    --disable-libsanitizer \
    --with-system-zlib \
    --with-linker-hash-style=gnu \
    --disable-libquadmadth \
    --enable-shared \
    --enable-threads \
    --enable-tls
  make 
  make -j1 install DESTDIR=$pkg
  cp COPYING $pkgdocs/
  mv $pkg/usr/lib64/* $pkg/usr/lib/
  rmdir $pkg/usr/lib64
  (
    cd $pkg/usr/bin
    ln -s gcc cc
  )
  mv $pkg/usr/lib/*.spec $pkg/usr/lib/gcc/x86_64-pc-linux-musl/$version/
  mkfinalpkg
 }
 sha512sums="
 f5664cb074db27a5acc82d6fecbd5183df0df724cadad9a595a6296a061b66c97cf0dd29d475924369926f1e7f9131e658099ece24382c35053bb73a53ecc9ce  gcc-13.2.0.tar.lz
 1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
 163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
 3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
 17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
 444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
 5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
 3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
 7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
 93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
 da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
 35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
 9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
 b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
 00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
 7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
 0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
 589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
 3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
 58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
 d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
 c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
 "
--- a/base/musl/__stack_chk_fail_local.c
+++ b/base/musl/__stack_chk_fail_local.c
@ -0,0 +1,2 @@
 extern void __stack_chk_fail(void);
 void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
--- a/base/musl/smbuild
+++ b/base/musl/smbuild
@ -7,6 +7,7 @@ download="https://musl.libc.org/releases/musl-$version.tar.gz"
 desc="Simple, fast and POSIX-compliant C library"
 requires="musl"
 preservestaticlibs=1
 ignorebinlib=1
 prepbuilddir() {
  mkandenterbuilddir
@ -25,16 +26,22 @@ build() {
  make install DESTDIR=$pkg
  # Some additional stuff from alpine 
-  mkdir -p $pkg/usr/bin 
+  mkdir -p $pkg/usr/bin $pkg/usr/lib
  gcc -o $pkg/usr/bin/getconf $srcdir/getconf.c 
  gcc -o $pkg/usr/bin/getent $srcdir/getent.c
  gcc -o $pkg/usr/bin/iconv $srcdir/iconv.c 
-  #( 
+  # provide minimal libssp_nonshared.a so we don't need libssp from gcc
-    #mkdir -p $pkg/lib
+  gcc $CFLAGS -c $srcdir/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
-    #cd $pkg/lib
+  ar r libssp_nonshared.a __stack_chk_fail_local.o
-    #ln -sf ../usr/lib/libc.so ld-musl-$arch.so.1
+
-  #)
+  cp libssp_nonshared.a $pkg/usr/lib/
  ( 
    mkdir -p $pkg/usr/lib
    cd $pkg/usr/lib
    ln -sf libc.so ld-musl-$arch.so.1
  )
  cp COPYRIGHT $pkgdocs/
		`@ -0,0 +1,2 @@`
							`extern void __stack_chk_fail(void);`
							`void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }`