temp/calamares-extensions: fork, increase timeout (MR 3280)

Increase the timeout for the PartitionJob from 2 min to 10 min, so it works on the PinePhone Pro with its 128 GiB eMMC. Related: https://github.com/calamares/calamares-extensions/pull/20 [ci:skip-vercheck]: forked pkg intentionally not having pkgrel=0
device-pine64-pinephonepro: backport to stable
2022-07-11 21:33:01 +02:00 · 2022-07-11 21:32:40 +02:00 · 2022-06-15 13:16:19 +02:00 · 2022-06-14 10:20:28 +02:00 · 2022-06-14 10:15:13 +02:00 · 2022-06-12 14:10:47 +02:00
3558 changed files with 4012 additions and 1393365 deletions
@@ -15,7 +15,9 @@ def test_aports_ui(args):
    """
    Raise an error if package in _pmb_recommends is not found
    """
-    for arch in pmb.config.build_device_architectures:
+    pmaports_cfg = pmb.config.pmaports.read_config(args)
+
+    for arch in pmaports_cfg["supported_arches"].split(","):
        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
            apkbuild = pmb.parse.apkbuild(path)
            # Skip if arch isn't enabled
@@ -14,11 +14,11 @@ stages:
 # merge request ID is not available. This means, we must set the "only"
 # variable accordingly - and if we only do it for one job, all other jobs will
 # not get executed. So have the defaults here, and use them in all jobs that
-# should run on both the master branch, and in merge requests.
+# should run on both the v22.06 branch, and in merge requests.
 # https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
 .only-default: &only-default
  only:
-    - master
+    - v22.06
    - merge_requests
    - tags

@@ -108,7 +108,7 @@ kernel-kconfig:
  stage: lint
  only:
    refs:
-      - master
+      - v22.06
      - merge_requests
    changes:
      - device/*/linux-*/config-*
@@ -149,14 +149,8 @@ mr-settings:
 build-x86_64:
  extends: .build

-build-x86:
-  extends: .build
-
 build-aarch64:
  extends: .build

 build-armv7:
  extends: .build
-
-build-armhf:
-  extends: .build
@@ -3,7 +3,6 @@
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
-main/mesa-pvr-dri-classic/          @xc-racer99
 main/postmarketos-ui-plasma-mobile/ @bshah
 temp/u-boot-librem5/                @craftyguy @bshah
 device/community/*-qcom-sdm845      @calebccff @joelselvaraj
@@ -1,33 +0,0 @@
-# Reference: https://postmarketos.org/channels.cfg
-[channels.cfg]
-recommended=edge
-
-[edge]
-description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
-branch_pmaports=master
-branch_aports=master
-mirrordir_alpine=edge
-
-[v21.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v21.12
-branch_aports=3.15-stable
-mirrordir_alpine=v3.15
-
-[v21.06]
-description=Old release (unsupported)
-branch_pmaports=v21.06
-branch_aports=3.14-stable
-mirrordir_alpine=v3.14
-
-[v21.03]
-description=Old release (unsupported)
-branch_pmaports=v21.03
-branch_aports=3.13-stable
-mirrordir_alpine=v3.13
-
-[v20.05]
-description=Old release (unsupported)
-branch_pmaports=v20.05
-branch_aports=3.12-stable
-mirrordir_alpine=v3.12
@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
---
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
--- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
-	  /* Don't transfer these tags from dynamic objects.  */
-	  if ((ibfd->flags & DYNAMIC) != 0)
-	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
--- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
-
-      /* If the input bfd has no contents, it shouldn't set the
-	 private data of the output bfd.  */
-      else if (!file->flags.just_syms
-	       && ((input_bfd->flags & DYNAMIC) != 0
-		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
-- 
-2.33.0
-
@@ -1,86 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen binutils-armhf
-# Based on: main/binutils
-
-pkgname=binutils-armhf
-pkgver=2.38
-pkgrel=2
-pkgdesc="Tools necessary to build programs for armhf targets"
-url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
-	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	"
-builddir="$srcdir/binutils-$pkgver"
-
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	pkgname="binutils-$CTARGET_ARCH"
-	subpackages=""
-	sonameprefix="binutils:"
-fi
-
-# secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
-#   2.28-r1:
-#     - CVE-2017-7614
-
-build() {
-	_target="$(arch_to_hostspec armhf)"
-	"$builddir"/configure \
-		--build="$CBUILD" \
-		--target=$_target \
-		--with-lib-path=/usr/lib \
-		--prefix=/usr \
-		--with-sysroot=/usr/$_target \
-		--enable-ld=default \
-		--enable-gold=yes \
-		--enable-plugins \
-		--enable-deterministic-archives \
-		--disable-multilib \
-		--disable-werror \
-		--disable-nls
-	make
-}
-
-package() {
-	make install DESTDIR="$pkgdir"
-
-	# remove man, info folders
-	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
-}
-
-
-
-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-"
@@ -1,46 +0,0 @@
-This fixes static linking for our hardened toolchain
-diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
-index e8126cb..9532bfb 100644
--- a/ld/scripttempl/elf.sc
-+++ b/ld/scripttempl/elf.sc
-@@ -235,8 +235,8 @@ test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
- if test "${ENABLE_INITFINI_ARRAY}" = "yes"; then
-   SORT_INIT_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))"
-  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors"
-  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors"
-+  CTORS_IN_INIT_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .ctors"
-+  DTORS_IN_FINI_ARRAY="EXCLUDE_FILE (*crtbegin*.o *crtend*.o $OTHER_EXCLUDE_FILES) .dtors"
- else
-   SORT_INIT_ARRAY="KEEP (*(SORT(.init_array.*)))"
-   SORT_FINI_ARRAY="KEEP (*(SORT(.fini_array.*)))"
-@@ -270,15 +270,14 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
-        doesn't matter which directory crtbegin.o
-        is in.  */
- 
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*crtbegin?.o(.ctors))
-+    KEEP (*crtbegin*.o(.ctors))
- 
-     /* We don't want to include the .ctor section from
-        the crtend.o file until after the sorted ctors.
-        The .ctor section from the crtend file contains the
-        end of ctors marker and it must be last */
- 
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-     KEEP (*(SORT(.ctors.*)))
-     KEEP (*(.ctors))
-     ${CONSTRUCTING+${CTOR_END}}
-@@ -286,9 +285,8 @@ CTOR=".ctors        ${CONSTRUCTING-0} :
- DTOR=".dtors        ${CONSTRUCTING-0} :
-   {
-     ${CONSTRUCTING+${DTOR_START}}
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*crtbegin?.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-     KEEP (*(SORT(.dtors.*)))
-     KEEP (*(.dtors))
-     ${CONSTRUCTING+${DTOR_END}}
@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
--- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;
@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
--- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
-	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else
@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
---
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
-  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
-	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
-      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
-	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
-	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
-	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
-- 
-2.27.0
-
@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
---
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
-	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
-- 
-2.27.0
-
@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
--- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS
@@ -1,19 +0,0 @@
--- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
-			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
-			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip
@@ -8,10 +8,10 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=13
+pkgrel=14

 _arch="aarch64"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
@@ -21,16 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"

 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk::$_mirror/v3.16/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "

 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk
 	rm .PKGINFO .SIGN.*
 }

 sha512sums="
-cea078b709b3bb1e1a4eec3e2b75ebaa9057131461cbf8be799f4840a510d8d0341cd218bfd154533c735f7ddc000b606ad590f44b5e997855e7e300d1b4effa  busybox-static-1.35.0-r13-aarch64-edge.apk
+c7c242c2954aaa4367d176ffc27fed92b87015206f62094656cb146b75081e4ffd42d939568df87dd03a79ba12bae933901f01347aa8c32b2320f4cdd537f2f5  busybox-static-1.35.0-r14-aarch64-v3.16.apk
 "
@@ -1,36 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen busybox-static-armhf
-
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
-pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=13
-
-_arch="armhf"
-_mirror="http://uk.alpinelinux.org/alpine/"
-
-url="http://busybox.net"
-license="GPL2"
-arch="x86_64"
-options="!check !strip"
-pkgdesc="Statically linked Busybox for $_arch"
-_target="$(arch_to_hostspec $_arch)"
-
-source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
-"
-
-package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
-}
-
-sha512sums="
-c62128c0c1bb4e9888342f079b4306f73ae6771173606e0a60802f95d31673f9bbf3426f301f2161c08c72137da5373bb6ea8acbf0b9ababc003aee4786d6229  busybox-static-1.35.0-r13-armhf-edge.apk
-"
@@ -8,10 +8,10 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=13
+pkgrel=14

 _arch="armv7"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"

 url="http://busybox.net"
 license="GPL2"
@@ -21,16 +21,16 @@ pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"

 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+	busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk::$_mirror/v3.16/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "

 package() {
 	mkdir -p "$pkgdir/usr/$_target"
 	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
+	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-v3.16.apk
 	rm .PKGINFO .SIGN.*
 }

 sha512sums="
-5b1bca1f7d8c0c331c7a2712a909507c1cab8710fb5cce7199e584dbbc67612850e8c87edbdd8a0ca2d901819d0eab343ca9bb537b824eb438fc1d3b1faaa32b  busybox-static-1.35.0-r13-armv7-edge.apk
+8fe3a2c6583c90907fdd09e0a54e60ca070a49b75d486d43606b674ba465f4dec63d404463db38427fe44eac1edc40ee41329cb7eb5fd3b1fb8ca400a94c1267  busybox-static-1.35.0-r14-armv7-v3.16.apk
 "
@@ -1,42 +0,0 @@
-From feb04e50d907683385cc4dc0163cf1d82258073a 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
-
---
- 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 1b0bfe37852..d7b2b19bb3c 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.35.1
-
@@ -1,203 +0,0 @@
-From d64825212f807435a4b2f8e068c0f65195c8e2e6 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
-
-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.c           |  2 ++
- gcc/incpath.c       | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index a75b44ee47e..d15105a73f3 100644
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -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.
- 
-+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 2de5a463315..059c818c895 100644
--- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -218,6 +218,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 708328e1670..4b977e313b5 100755
--- a/gcc/configure
-+++ b/gcc/configure
-@@ -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
-@@ -1782,6 +1783,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
-@@ -31790,6 +31793,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 df1c9cc3200..5461bab88a9 100644
--- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7311,6 +7311,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 cf536a15116..7d3f1ccddf3 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -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
-+-Wno-poison-system-directories @gol
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
- -Wno-scalar-storage-order  -Wsequence-point @gol
-@@ -7728,6 +7729,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.
- 
-+@item -Wno-poison-system-directories
-+@opindex 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.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 8ba410c9e17..a83ba34ac4b 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -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}}} \
-+    %{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.c b/gcc/incpath.c
-index 446d280321d..fbfc0ce03b8 100644
--- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -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.  */
-@@ -395,6 +396,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.35.1
-
@@ -1,44 +0,0 @@
-From 9675297b3a46b65a54e9df97f26ea445d53c67c6 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH] 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.c           | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 7d3f1ccddf3..485d2d6b742 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -15921,6 +15921,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}.
-+
- @item -u @var{symbol}
- @opindex u
- Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a83ba34ac4b..faf9ce76b3d 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -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 \
-+   "-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.35.1
-
@@ -1,46 +0,0 @@
-From 4eb1b3849325b77c4cb66b675119299de35125bb 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,
- ObjC++, if the optimization level is > 0
-
---
- gcc/c-family/c-cppbuiltin.c | 4 ++++
- gcc/doc/invoke.texi         | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c
-index 11e015bdb87..de8b7bf246f 100644
--- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1427,6 +1427,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 485d2d6b742..164929f7583 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -10225,6 +10225,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}.
-+
- @item -O3
- @opindex O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
-- 
-2.35.1
-
@@ -1,272 +0,0 @@
-From 8de5d46c530ceca9f4add46d5cae3cd52c38eba3 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,
- 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.c                          | 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 7f2529a2a1d..b097e1688aa 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 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
- 
- #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 0c1c4e70b6b..8b581afacdd 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 5ebbf42a13d..902378e1bad 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 "%{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 " \
-  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 a23e7ab3eb7..12ac8cb93a9 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 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
-                   "%{" 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 ac40c3dfd3f..6e19e25c35a 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 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
- #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 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
-   "%{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 e3f2cd254f6..43499ed29cf 100644
--- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,13 +374,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 510abe169c5..3c1f3a8ec5d 100644
--- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,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 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
- 
- #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 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);
- #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.c b/gcc/gcc.c
-index faf9ce76b3d..1ad5da6d769 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -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)
-#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
-@@ -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)
-#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
-@@ -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)
-#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
-@@ -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
-#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.35.1
-
@@ -1,34 +0,0 @@
-From 85e12e3d32a44c3fd10b5327edd542972a179eec 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.
-
---
- 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 2005b783c68..c5c6af427cc 100644
--- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -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
-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
-@@ -658,7 +658,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.35.1
-
@@ -1,25 +0,0 @@
-From f1e92f5f3576779776c9f3d6aeef76e1569e719a 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.
-
---
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index d15105a73f3..29f9504cb68 100644
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -775,7 +775,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.
- 
- Wtype-limits
-- 
-2.35.1
-
@@ -1,53 +0,0 @@
-From 3503fd734a33b67ec6a9fdc2c52bb8310864b119 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
- Change the buffer size.
-
---
- gcc/gcc.c      | 8 +++++++-
- gcc/params.opt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 1ad5da6d769..99314032ec2 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -989,6 +989,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" \
-@@ -1288,7 +1294,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 8ba281b4cfa..bab39cdf8a2 100644
--- a/gcc/params.opt
-+++ b/gcc/params.opt
-@@ -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=
-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.35.1
-
@@ -1,54 +0,0 @@
-From c4dd51fe15a938fdd76d781a4eede2a9205eacbc 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
- 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 ab716ff04ea..e595268d9fc 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 8edd2e05639..63f61fcf96f 100644
--- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -553,6 +553,7 @@ uninstall-am:
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-- 
-2.35.1
-
@@ -1,28 +0,0 @@
-From 0a1fd78184f00fb77dac00dabe98eb025620efc2 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.
-
---
- include/libiberty.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/libiberty.h b/include/libiberty.h
-index f4c0fe11d6f..cf4b1043e4d 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.35.1
-
@@ -1,24 +0,0 @@
-From f81d67f6fe1f1066642606209c882b333d937cb7 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
-
---
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 4f1213b983b..d0224649d30 100644
--- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -264,6 +264,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.35.1
-
@@ -1,33 +0,0 @@
-From 3b732288ce771348cbcc9fb633a36b7aff2b4ad4 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
-
---
- libitm/configure.tgt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index a3d84896cc5..ecb281d5919 100644
--- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
-@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
-   esac
- fi
- 
-+# FIXME: error: inlining failed in call to always_inline 
-+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’
-+# : function body can be overwritten at link time
-+# Disable Fortify in libitm for now. #508852
-+case "${target}" in
-+    *-*-linux*)
-+	XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE"
-+	;;
-+esac
-+
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
-- 
-2.35.1
-
@@ -1,57 +0,0 @@
-From a3e556187d0a8e9d39544f023960eca0f07d3e83 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
-
---
- gcc/config/i386/i386-expand.c | 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.c b/gcc/config/i386/i386-expand.c
-index 1772fb16c9a..77e04b0c2df 100644
--- a/gcc/config/i386/i386-expand.c
-+++ b/gcc/config/i386/i386-expand.c
-@@ -11066,10 +11066,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_local 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 ef463848f9d..1a3de052c80 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.35.1
-
@@ -1,75 +0,0 @@
-From f520e67fba621f213146271408ff3210b3527176 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
-
---
- gcc/configure    | 27 +++++++++++++++++++++++++++
- gcc/configure.ac | 13 +++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/gcc/configure b/gcc/configure
-index 4b977e313b5..592e81e40f6 100755
--- a/gcc/configure
-+++ b/gcc/configure
-@@ -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"
-+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 5461bab88a9..1577529ffb7 100644
--- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -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"
-+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.35.1
-
@@ -1,25 +0,0 @@
-From 37310cabb8bc7256899c4d45cc68a47ca2a3232b Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:57:09 +0000
-Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
-
---
- libffi/src/closures.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libffi/src/closures.c b/libffi/src/closures.c
-index 721ff00ea43..22a699c6340 100644
--- a/libffi/src/closures.c
-+++ b/libffi/src/closures.c
-@@ -34,7 +34,7 @@
- #include <ffi_common.h>
- 
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
-# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
-- 
-2.35.1
-
@@ -1,425 +0,0 @@
-From 586e82425a024d85d1bd9952ca51d8a671aa9b5d Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:57:51 +0000
-Subject: [PATCH] dlang: update zlib binding
-
---
- libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
- 1 file changed, 196 insertions(+), 70 deletions(-)
-
-diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
-index e6cce240fd5..bd2fe37ebec 100644
--- a/libphobos/src/std/zlib.d
-+++ b/libphobos/src/std/zlib.d
-@@ -1,7 +1,7 @@
- // Written in the D programming language.
- 
- /**
- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library).
-+ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library).
-  *
-  * Examples:
-  *
-@@ -43,12 +43,12 @@
-  * References:
-  *  $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia)
-  *
- * Copyright: Copyright Digital Mars 2000 - 2011.
-+ * Copyright: Copyright The D Language Foundation 2000 - 2011.
-  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-  * Authors:   $(HTTP digitalmars.com, Walter Bright)
- * Source:    $(PHOBOSSRC std/_zlib.d)
-+ * Source:    $(PHOBOSSRC std/zlib.d)
-  */
-/*          Copyright Digital Mars 2000 - 2011.
-+/*          Copyright The D Language Foundation 2000 - 2011.
-  * Distributed under the Boost Software License, Version 1.0.
-  *    (See accompanying file LICENSE_1_0.txt or copy at
-  *          http://www.boost.org/LICENSE_1_0.txt)
-@@ -75,9 +75,9 @@ enum
- 
- class ZlibException : Exception
- {
-    this(int errnum)
-    {   string msg;
-
-+    private static string getmsg(int errnum) nothrow @nogc pure @safe
-+    {
-+        string msg;
-         switch (errnum)
-         {
-             case Z_STREAM_END:      msg = "stream end"; break;
-@@ -90,7 +90,12 @@ class ZlibException : Exception
-             case Z_VERSION_ERROR:   msg = "version error"; break;
-             default:                msg = "unknown error";  break;
-         }
-        super(msg);
-+        return msg;
-+    }
-+
-+    this(int errnum)
-+    {
-+        super(getmsg(errnum));
-     }
- }
- 
-@@ -104,7 +109,7 @@ class ZlibException : Exception
-  *     buf = buffer containing input data
-  *
-  * Returns:
- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Adler-32)
-@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf)
-  *     buf = buffer containing input data
-  *
-  * Returns:
- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
-@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf)
- ubyte[] compress(const(void)[] srcbuf, int level)
- in
- {
-    assert(-1 <= level && level <= 9);
-+    assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9].");
- }
-body
-+do
- {
-     import core.memory : GC;
-+    import std.array : uninitializedArray;
-     auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
-    auto destbuf = new ubyte[destlen];
-+    auto destbuf = uninitializedArray!(ubyte[])(destlen);
-     auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
-     if (err)
-     {
-@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15)
-                 throw new ZlibException(err);
-         }
-     }
-    assert(0);
-+    assert(0, "Unreachable code");
- }
- 
- @system unittest
-@@ -370,9 +376,9 @@ class Compress
-     this(int level, HeaderFormat header = HeaderFormat.deflate)
-     in
-     {
-        assert(1 <= level && level <= 9);
-+        assert(1 <= level && level <= 9, "Legal compression level are in [1, 9].");
-     }
-    body
-+    do
-     {
-         this.level = level;
-         this.gzip = header == HeaderFormat.gzip;
-@@ -406,6 +412,7 @@ class Compress
-     const(void)[] compress(const(void)[] buf)
-     {
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
-         ubyte[] destbuf;
- 
-@@ -420,7 +427,7 @@ class Compress
-             inited = 1;
-         }
- 
-        destbuf = new ubyte[zs.avail_in + buf.length];
-+        destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length);
-         zs.next_out = destbuf.ptr;
-         zs.avail_out = to!uint(destbuf.length);
- 
-@@ -461,9 +468,10 @@ class Compress
-     void[] flush(int mode = Z_FINISH)
-     in
-     {
-        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH);
-+        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH,
-+                "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH.");
-     }
-    body
-+    do
-     {
-         import core.memory : GC;
-         ubyte[] destbuf;
-@@ -523,6 +531,7 @@ class UnCompress
-     z_stream zs;
-     int inited;
-     int done;
-+    bool inputEnded;
-     size_t destbufsize;
- 
-     HeaderFormat format;
-@@ -571,16 +580,16 @@ class UnCompress
-     const(void)[] uncompress(const(void)[] buf)
-     in
-     {
-        assert(!done);
-+        assert(!done, "Buffer has been flushed.");
-     }
-    body
-+    do
-     {
-+        if (inputEnded || !buf.length)
-+            return null;
-+
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
-        ubyte[] destbuf;
-
-        if (buf.length == 0)
-            return null;
- 
-         if (!inited)
-         {
-@@ -598,26 +607,152 @@ class UnCompress
- 
-         if (!destbufsize)
-             destbufsize = to!uint(buf.length) * 2;
-        destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
-        zs.next_out = destbuf.ptr;
-        zs.avail_out = to!uint(destbuf.length);
-
-        if (zs.avail_in)
-            buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf;
-+        auto destbuf = uninitializedArray!(ubyte[])(destbufsize);
-+        size_t destFill;
- 
-         zs.next_in = cast(ubyte*) buf.ptr;
-         zs.avail_in = to!uint(buf.length);
- 
-        err = inflate(&zs, Z_NO_FLUSH);
-        if (err != Z_STREAM_END && err != Z_OK)
-+        while (true)
-         {
-            GC.free(destbuf.ptr);
-            error(err);
-+            auto oldAvailIn = zs.avail_in;
-+
-+            zs.next_out = destbuf[destFill .. $].ptr;
-+            zs.avail_out = to!uint(destbuf.length - destFill);
-+
-+            err = inflate(&zs, Z_NO_FLUSH);
-+            if (err == Z_STREAM_END)
-+            {
-+                inputEnded = true;
-+                break;
-+            }
-+            else if (err != Z_OK)
-+            {
-+                GC.free(destbuf.ptr);
-+                error(err);
-+            }
-+            else if (!zs.avail_in)
-+                break;
-+
-+            /*
-+                According to the zlib manual inflate() stops when either there's
-+                no more data to uncompress or the output buffer is full
-+                So at this point, the output buffer is too full
-+            */
-+
-+            destFill = destbuf.length;
-+
-+            if (destbuf.capacity)
-+            {
-+                if (destbuf.length < destbuf.capacity)
-+                    destbuf.length = destbuf.capacity;
-+                else
-+                {
-+                    auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize);
-+
-+                    if (newLength && destbuf.length < destbuf.capacity)
-+                        destbuf.length = destbuf.capacity;
-+                    else
-+                        destbuf.length += destbufsize;
-+                }
-+            }
-+            else
-+                destbuf.length += destbufsize;
-         }
-+
-         destbuf.length = destbuf.length - zs.avail_out;
-         return destbuf;
-     }
- 
-+    // Test for issues 3191 and 9505
-+    @system unittest
-+    {
-+        import std.algorithm.comparison;
-+        import std.array;
-+        import std.file;
-+        import std.zlib;
-+
-+        // Data that can be easily compressed
-+        ubyte[1024] originalData;
-+
-+        // This should yield a compression ratio of at least 1/2
-+        auto compressedData = compress(originalData, 9);
-+        assert(compressedData.length < originalData.length / 2,
-+                "The compression ratio is too low to accurately test this situation");
-+
-+        auto chunkSize = compressedData.length / 4;
-+        assert(chunkSize < compressedData.length,
-+                "The length of the compressed data is too small to accurately test this situation");
-+
-+        auto decompressor = new UnCompress();
-+        ubyte[originalData.length] uncompressedData;
-+        ubyte[] reusedBuf;
-+        int progress;
-+
-+        reusedBuf.length = chunkSize;
-+
-+        for (int i = 0; i < compressedData.length; i += chunkSize)
-+        {
-+            auto len = min(chunkSize, compressedData.length - i);
-+            // simulate reading from a stream in small chunks
-+            reusedBuf[0 .. len] = compressedData[i .. i + len];
-+
-+            // decompress using same input buffer
-+            auto chunk = decompressor.uncompress(reusedBuf);
-+            assert(progress + chunk.length <= originalData.length,
-+                    "The uncompressed result is bigger than the original data");
-+
-+            uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+            progress += chunk.length;
-+        }
-+
-+        auto chunk = decompressor.flush();
-+        assert(progress + chunk.length <= originalData.length,
-+                "The uncompressed result is bigger than the original data");
-+
-+        uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+        progress += chunk.length;
-+
-+        assert(progress == originalData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[1024] invalidData;
-+        auto decompressor = new UnCompress();
-+
-+        try
-+        {
-+            auto uncompressedData = decompressor.uncompress(invalidData);
-+        }
-+        catch (ZlibException e)
-+        {
-+            assert(e.msg == "data error");
-+            return;
-+        }
-+
-+        assert(false, "Corrupted data didn't result in an error");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[2014] originalData = void;
-+        auto compressedData = compress(originalData, 9);
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever");
-+
-+        assert(originalData.length == uncompressedData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+        assert(!decompressor.uncompress("whatever").length,
-+                "Compression continued after the end");
-+    }
-+
-     /**
-      * Decompress and return any remaining data.
-      * The returned data should be appended to that returned by uncompress().
-@@ -626,49 +761,40 @@ class UnCompress
-     void[] flush()
-     in
-     {
-        assert(!done);
-+        assert(!done, "Buffer has been flushed before.");
-     }
-     out
-     {
-        assert(done);
-+        assert(done, "Flushing failed.");
-     }
-    body
-+    do
-     {
-        import core.memory : GC;
-        ubyte[] extra;
-        ubyte[] destbuf;
-        int err;
-
-         done = 1;
-        if (!inited)
-            return null;
-+        return null;
-+    }
- 
-      L1:
-        destbuf = new ubyte[zs.avail_in * 2 + 100];
-        zs.next_out = destbuf.ptr;
-        zs.avail_out = to!uint(destbuf.length);
-+    /// Returns true if all input data has been decompressed and no further data
-+    /// can be decompressed (inflate() returned Z_STREAM_END)
-+    @property bool empty() const
-+    {
-+        return inputEnded;
-+    }
- 
-        err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
-        if (err == Z_OK && zs.avail_out == 0)
-        {
-            extra ~= destbuf;
-            goto L1;
-        }
-        if (err != Z_STREAM_END)
-        {
-            GC.free(destbuf.ptr);
-            if (err == Z_OK)
-                err = Z_BUF_ERROR;
-            error(err);
-        }
-        destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
-        err = etc.c.zlib.inflateEnd(&zs);
-        inited = 0;
-        if (err)
-            error(err);
-        if (extra.length)
-            destbuf = extra ~ destbuf;
-        return destbuf;
-+    ///
-+    @system unittest
-+    {
-+        // some random data
-+        ubyte[1024] originalData = void;
-+
-+        // append garbage data (or don't, this works in both cases)
-+        auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever";
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData);
-+
-+        assert(uncompressedData[] == originalData[],
-+                "The uncompressed and the original data differ");
-+        assert(decompressor.empty, "The UnCompressor reports not being done");
-     }
- }
- 
-- 
-2.35.1
-
@@ -1,24 +0,0 @@
-From 26daa73d678b87a6950df1d79d171ba40ecbce15 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:18:32 +0000
-Subject: [PATCH] dlang: use libucontext on mips64
-
---
- libphobos/configure.tgt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 0643daeb613..b74d9fb3f25 100644
--- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-freebsd*)
- 	LIBPHOBOS_SUPPORTED=yes
-- 
-2.35.1
-
@@ -1,38 +0,0 @@
-From caeae8288593dbd5a1a6d93508d875eb0d8fdf49 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:19:12 +0000
-Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
-
---
- libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 59df921ba41..9ee9f943948 100644
--- a/libphobos/libdruntime/core/sys/posix/fcntl.d
-+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
-             F_SETLKW       = 7,
-         }
-     }
-+    else version (MIPS_Any)
-+    {
-+        enum 
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x008000, // octal   0100000
-+            O_LARGEFILE     = 0x002000, // octal   0020000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 33,
-+            F_SETLK        = 34,
-+            F_SETLKW       = 35,
-+        }
-+    }
-     else
-         static assert(0, "Platform not supported");
- 
-- 
-2.35.1
-
@@ -1,42 +0,0 @@
-From 374a19de60fcd5c31321c3f4d26dcc4b631e8c3f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH] ada: fix shared linking
-
---
- gcc/ada/link.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 5cd5ef64f56..1c611a82cab 100644
--- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
-    || defined (__NetBSD__) || defined (__OpenBSD__) \
-    || defined (__QNX__)
- const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
-char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
- 
- #elif defined (__linux__) || defined (__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
-char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-- 
-2.35.1
-
@@ -1,24 +0,0 @@
-From ad053bc46b535e78397f992e3c2c1d28c1ebd1f4 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing
-
---
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 047be0255e2..426949aa91c 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -170,6 +170,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.35.1
-
@@ -1,25 +0,0 @@
-From 18d44a7f8d801cc6926a73e2dda2f0ce859dc561 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH] add fortify-headers paths
-
---
- gcc/config/linux.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 4e1db60fced..7fcf402b416 100644
--- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- #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.35.1
-
@@ -1,31 +0,0 @@
-From 38d27ebdcc5a8bea0807b5d56203f0ea5e16868f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to
- 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.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 99314032ec2..6e91767efe8 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -997,8 +997,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.35.1
-
@@ -1,69 +0,0 @@
-From 0cc2a1befaf343e5ce1cbc15bd247eee812bdf33 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when
- linking libtsan.
-
---
- gcc/gcc.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 6e91767efe8..22dbbf85850 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -738,10 +738,10 @@ proper position among the other output files.  */
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-		     " %{!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
-@@ -777,10 +777,10 @@ proper position among the other output files.  */
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-		     " %{!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
-@@ -798,10 +798,10 @@ proper position among the other output files.  */
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-		     " %{!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
-@@ -817,10 +817,10 @@ proper position among the other output files.  */
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-		     " %{!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.35.1
-
@@ -1,48 +0,0 @@
-From feea6f782e83a53487ad633608484dfa3483be1b Mon Sep 17 00:00:00 2001
-From: Nils Andreas Svee <me@lochnair.net>
-Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] mips64: disable multilib support
-
-multilib is not supported by Alpine GCC
---
- gcc/config/mips/mips.h    | 8 ++++----
- gcc/config/mips/t-linux64 | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 47aac9d3d61..4ad81059a86 100644
--- a/gcc/config/mips/mips.h
-+++ b/gcc/config/mips/mips.h
-@@ -3425,11 +3425,11 @@ struct GTY(())  machine_function {
- /* If we are *not* using multilibs and the default ABI is not ABI_32 we
-    need to change these from /lib and /usr/lib.  */
- #if MIPS_ABI_DEFAULT == ABI_N32
-#define STANDARD_STARTFILE_PREFIX_1 "/lib32/"
-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #elif MIPS_ABI_DEFAULT == ABI_64
-#define STANDARD_STARTFILE_PREFIX_1 "/lib64/"
-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #endif
- 
- /* Load store bonding is not supported by micromips and fix_24k.  The
-diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index 130e1f04707..a64ac2bbb5b 100644
--- a/gcc/config/mips/t-linux64
-+++ b/gcc/config/mips/t-linux64
-@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
- MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
- MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
-	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
-	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
-	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-+        ../lib \
-+        ../lib32 \
-+        ../lib
-- 
-2.35.1
-
@@ -1,26 +0,0 @@
-From cbd96a32dc2aaa61f6adcb3643e1da21f185f80e Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH] aarch64: disable multilib support
-
-multilib is unsupported on Alpine GCC
---
- gcc/config/aarch64/t-aarch64-linux | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index 241b0ef20b6..18e63b34d8b 100644
--- a/gcc/config/aarch64/t-aarch64-linux
-+++ b/gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-- 
-2.35.1
-
@@ -1,25 +0,0 @@
-From e87e415e9a88dbce68ed7b9d8386c3c2d0c0d6b6 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH] s390x: disable multilib support
-
-multilib is not supported on Alpine GCC at present
---
- gcc/config/s390/t-linux64 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
-index cc6ab367072..7f498ee1cdc 100644
--- a/gcc/config/s390/t-linux64
-+++ b/gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- 
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
-- 
-2.35.1
-
@@ -1,81 +0,0 @@
-From 5c24869c9bc1a552f8bb5c32a8538c6e065a4db8 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH] ppc64[le]: disable multilib support
-
-multilib is not presently supported on Alpine GCC
---
- gcc/config/rs6000/t-linux       | 6 ++++--
- gcc/config/rs6000/t-linux64     | 4 ++--
- gcc/config/rs6000/t-linux64bele | 4 ++--
- gcc/config/rs6000/t-linux64lebe | 4 ++--
- 4 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
-index aeb7440c492..ab14c455d8d 100644
--- a/gcc/config/rs6000/t-linux
-+++ b/gcc/config/rs6000/t-linux
-@@ -2,7 +2,8 @@
- # or soft-float.
- ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
- ifneq (,$(findstring powerpc64,$(target)))
-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- else
- MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
- endif
-@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
- MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
- endif
- ifneq (,$(findstring powerpc64le,$(target)))
-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- endif
- endif
- 
-diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
-index e11a118cb5f..df81dc04a32 100644
--- a/gcc/config/rs6000/t-linux64
-+++ b/gcc/config/rs6000/t-linux64
-@@ -28,8 +28,8 @@
- MULTILIB_OPTIONS    := m64/m32
- MULTILIB_DIRNAMES   := 64 32
- MULTILIB_EXTRA_OPTS := 
-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- 
- rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
- 	$(COMPILE) $<
-diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
-index 97c1ee6fb4d..08d72639cb6 100644
--- a/gcc/config/rs6000/t-linux64bele
-+++ b/gcc/config/rs6000/t-linux64bele
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mlittle
- MULTILIB_DIRNAMES   += le
-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
-index 2e63bdb9fc9..c6e1c5db65d 100644
--- a/gcc/config/rs6000/t-linux64lebe
-+++ b/gcc/config/rs6000/t-linux64lebe
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mbig
- MULTILIB_DIRNAMES   += be
-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-- 
-2.35.1
-
@@ -1,26 +0,0 @@
-From 25927f8106583ee594e7bcdf92dd1387e0fd024c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH] x86_64: disable multilib support
-
-multilib is not presently supported on Alpine GCC
---
- gcc/config/i386/t-linux64 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
-index d288b093522..2949033aa04 100644
--- a/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
-@@ -33,6 +33,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
-- 
-2.35.1
-
@@ -1,74 +0,0 @@
-From 18bcf23cae4069ffe9d9f64e851193d29dd4814f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 3 Jan 2022 07:14:48 +0100
-Subject: [PATCH] riscv: disable multilib support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From the musl wiki [1]:
-
-	musl does not support sharing an include directory between archs
-	[…], and thus is not compatible with GCC-style multilib. It is
-	recommended that distributions build GCC with multilib disabled,
-	and use library directories named lib, not lib64 or lib32.
-
-For this reason, we patch existing GCC configuration files (gcc/config)
-to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
-upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
-directories is a bit more difficult on the RISC-V architecture. This is
-due to the fact that the default RISC-V configuration does not only use
-the lib64 and lib32 directories but also subdirectories within these
-directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
-
-This patch aligns the RISC-V configuration with other architectures by
-pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
-march). Furthermore, this patch removes the ABI-specific startfile
-prefix spec. Since both of these impact the default LIBRARY_PATH [4]
-this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
-other Alpine architectures and thereby fixes #13369 [5].
-
-Incidentally, this also fixes gccgo on riscv64, as without this patch
-gccgo is otherwise not able to find the *.gox files for the Go standard
-library.
-
-[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
-[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
-[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
-[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
-[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
---
- gcc/config/riscv/linux.h | 6 ------
- gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index ee29979dd34..fe8a82d6702 100644
--- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -71,9 +71,3 @@ along with GCC; see the file COPYING3.  If not see
-     %{static:-static}}"
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-
-#define STARTFILE_PREFIX_SPEC 			\
-   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
-   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
-   "/lib/ "					\
-   "/usr/lib/ "
-diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
-index 216d2776a18..1a8a863853e 100644
--- a/gcc/config/riscv/t-linux
-+++ b/gcc/config/riscv/t-linux
-@@ -1,3 +1,6 @@
-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
-+MULTILIB_OPTIONS := march=rv64gc
-+MULTILIB_DIRNAMES := rv64gc
-+
-+MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
- MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
-+MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
-- 
-2.35.1
-
@@ -1,51 +0,0 @@
-From a46c8d6cb9428db29fbf8a80609ff449354ce111 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH] always build libgcc_eh.a
-
-highly inspired by:
-  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
---
- libgcc/Makefile.in | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
-index 2c8be561eb5..c557750b1b3 100644
--- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -957,8 +957,9 @@ ifneq ($(LIBUNWIND),)
- all: libunwind.a
- endif
- 
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
-@@ -1160,10 +1161,6 @@ install-libunwind:
- install-shared:
- 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
- 
-	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-
- 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -1180,6 +1177,10 @@ ifeq ($(enable_gcov),yes)
- 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
- endif
- 
-+	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- 	parts="$(INSTALL_PARTS)";				\
- 	for file in $$parts; do					\
- 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
-- 
-2.35.1
-
@@ -1,135 +0,0 @@
-From d7064ab25a561bb99c3d0b35663154656013aed2 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH] ada: libgnarl compatibility for musl
-
---
- gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
- gcc/ada/libgnarl/s-taprop__linux.adb | 53 ++--------------------------
- 2 files changed, 3 insertions(+), 61 deletions(-)
-
-diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
-index 2272f83d68d..1d78456544a 100644
--- a/gcc/ada/libgnarl/s-osinte__linux.ads
-+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -401,12 +401,6 @@ package System.OS_Interface is
-    PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
-    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
- 
-   function pthread_rwlockattr_setkind_np
-     (attr : access pthread_rwlockattr_t;
-      pref : int) return int;
-   pragma Import
-     (C, pthread_rwlockattr_setkind_np, "pthread_rwlockattr_setkind_np");
-
-    function pthread_rwlock_init
-      (mutex : access pthread_rwlock_t;
-       attr  : access pthread_rwlockattr_t) return int;
-@@ -468,11 +462,6 @@ package System.OS_Interface is
-       protocol : int) return int;
-    pragma Import (C, pthread_mutexattr_setprotocol);
- 
-   function pthread_mutexattr_setprioceiling
-     (attr        : access pthread_mutexattr_t;
-      prioceiling : int) return int;
-   pragma Import (C, pthread_mutexattr_setprioceiling);
-
-    type struct_sched_param is record
-       sched_priority : int;  --  scheduling priority
-    end record;
-diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
-index 757a6cdfdad..82df94f6a00 100644
--- a/gcc/ada/libgnarl/s-taprop__linux.adb
-+++ b/gcc/ada/libgnarl/s-taprop__linux.adb
-@@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
-    pragma Import
-      (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
- 
-   function GNAT_has_cap_sys_nice return C.int;
-   pragma Import
-     (C, GNAT_has_cap_sys_nice, "__gnat_has_cap_sys_nice");
-    --  We do not have pragma Linker_Options ("-lcap"); here, because this
-    --  library is not present on many Linux systems. 'libcap' is the Linux
-    --  "capabilities" library, called by __gnat_has_cap_sys_nice.
-@@ -210,38 +207,6 @@ package body System.Task_Primitives.Operations is
-    --  Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
-    --  GNU/Linux, so we map 0 .. 98 to 1 .. 99.
- 
-   function Get_Ceiling_Support return Boolean;
-   --  Get the value of the Ceiling_Support constant (see below).
-   --  Note well: If this function or related code is modified, it should be
-   --  tested by hand, because automated testing doesn't exercise it.
-
-   -------------------------
-   -- Get_Ceiling_Support --
-   -------------------------
-
-   function Get_Ceiling_Support return Boolean is
-      Ceiling_Support : Boolean := False;
-   begin
-      if Locking_Policy /= 'C' then
-         return False;
-      end if;
-
-      declare
-         function geteuid return Integer;
-         pragma Import (C, geteuid, "geteuid");
-         Superuser : constant Boolean := geteuid = 0;
-         Has_Cap : constant C.int := GNAT_has_cap_sys_nice;
-         pragma Assert (Has_Cap in 0 | 1);
-      begin
-         Ceiling_Support := Superuser or else Has_Cap = 1;
-      end;
-
-      return Ceiling_Support;
-   end Get_Ceiling_Support;
-
-   pragma Warnings (Off, "non-preelaborable call not allowed*");
-   Ceiling_Support : constant Boolean := Get_Ceiling_Support;
-   pragma Warnings (On, "non-preelaborable call not allowed*");
-    --  True if the locking policy is Ceiling_Locking, and the current process
-    --  has permission to use this policy. The process has permission if it is
-    --  running as 'root', or if the capability was set by the setcap command,
-@@ -344,7 +309,9 @@ package body System.Task_Primitives.Operations is
-    -- Init_Mutex --
-    ----------------
- 
-+   pragma Warnings (Off, "formal parameter * is not referenced");
-    function Init_Mutex (L : RTS_Lock_Ptr; Prio : Any_Priority) return C.int is
-+   pragma Warnings (On, "formal parameter * is not referenced");
-       Mutex_Attr : aliased pthread_mutexattr_t;
-       Result, Result_2 : C.int;
- 
-@@ -356,16 +323,7 @@ package body System.Task_Primitives.Operations is
-          return Result;
-       end if;
- 
-      if Ceiling_Support then
-         Result := pthread_mutexattr_setprotocol
-           (Mutex_Attr'Access, PTHREAD_PRIO_PROTECT);
-         pragma Assert (Result = 0);
-
-         Result := pthread_mutexattr_setprioceiling
-           (Mutex_Attr'Access, Prio_To_Linux_Prio (Prio));
-         pragma Assert (Result = 0);
-
-      elsif Locking_Policy = 'I' then
-+      if Locking_Policy = 'I' then
-          Result := pthread_mutexattr_setprotocol
-            (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
-          pragma Assert (Result = 0);
-@@ -405,11 +363,6 @@ package body System.Task_Primitives.Operations is
-             Result := pthread_rwlockattr_init (RWlock_Attr'Access);
-             pragma Assert (Result = 0);
- 
-            Result := pthread_rwlockattr_setkind_np
-              (RWlock_Attr'Access,
-               PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
-            pragma Assert (Result = 0);
-
-             Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access);
- 
-             pragma Assert (Result in 0 | ENOMEM);
-- 
-2.35.1
-
@@ -1,223 +0,0 @@
-From 5193de0a6c96fefe0c46fc9a6b8c27623ad85640 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH] ada: musl support fixes
-
---
- gcc/ada/Makefile.rtl | 10 +++++-----
- gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
- gcc/ada/adaint.h     | 10 ++++------
- gcc/ada/terminals.c  |  8 ++++----
- 4 files changed, 32 insertions(+), 30 deletions(-)
-
-diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
-index b5b8b573ea4..6fce40d1e98 100644
--- a/gcc/ada/Makefile.rtl
-+++ b/gcc/ada/Makefile.rtl
-@@ -1748,7 +1748,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
-   s-intman.adb<libgnarl/s-intman__posix.adb \
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   a-exetim.adb<libgnarl/a-exetim__posix.adb \
-   a-exetim.ads<libgnarl/a-exetim__default.ads \
-   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2355,7 +2355,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
-   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-ppc.ads
-@@ -2386,7 +2386,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
- endif
- 
- # ARM linux, GNU eabi
-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
-+ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<libgnarl/a-intnam__linux.ads \
-   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2597,7 +2597,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-@@ -2700,7 +2700,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   $(GNATRTL_128BIT_PAIRS) \
-diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 2e54e69643a..e7e6507e2e0 100644
--- a/gcc/ada/adaint.c
-+++ b/gcc/ada/adaint.c
-@@ -91,6 +91,11 @@
- #include <sys/param.h>
- #include <sys/pstat.h>
- #endif
-+ 
-+#if defined (linux) || defined(__linux__)
-+#define _GNU_SOURCE 1
-+#include <sched.h>
-+#endif
- 
- #ifdef __PikeOS__
- #define __BSD_VISIBLE 1
-@@ -3442,7 +3447,6 @@ __gnat_lwp_self (void)
- #endif
- 
- #if defined (__linux__)
-#include <sched.h>
- 
- /* glibc versions earlier than 2.7 do not define the routines to handle
-    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3452,7 +3456,7 @@ __gnat_lwp_self (void)
- 
- /* Dynamic cpu sets */
- 
-cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count)
- {
-   return CPU_ALLOC (count);
-@@ -3465,33 +3469,33 @@ __gnat_cpu_alloc_size (size_t count)
- }
- 
- void
-__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
-  CPU_FREE (set);
-+  CPU_FREE ((cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_zero (size_t count, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count, void *set)
- {
-  CPU_ZERO_S (count, set);
-+  CPU_ZERO_S (count, (cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
-  CPU_SET_S (cpu - 1, count, set);
-+  CPU_SET_S (cpu - 1, count, (cpu_set_t *) set);
- }
- 
- #else /* !CPU_ALLOC */
- 
- /* Static cpu sets */
- 
-cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED)
- {
-  return (cpu_set_t *) xmalloc (sizeof (cpu_set_t));
-+  return xmalloc (sizeof (cpu_set_t));
- }
- 
- size_t
-@@ -3501,23 +3505,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
- }
- 
- void
-__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
-   free (set);
- }
- 
- void
-__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set)
- {
-  CPU_ZERO (set);
-+  CPU_ZERO ((cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
-  CPU_SET (cpu - 1, set);
-+  CPU_SET (cpu - 1, (cpu_set_t *) set);
- }
- #endif /* !CPU_ALLOC */
- #endif /* __linux__ */
-diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 85997b9ba68..fd10e5b5589 100644
--- a/gcc/ada/adaint.h
-+++ b/gcc/ada/adaint.h
-@@ -325,13 +325,11 @@ extern void   *__gnat_lwp_self			   (void);
- 
- /* Routines for interface to required CPU set primitives */
- 
-#include <sched.h>
-
-extern cpu_set_t *__gnat_cpu_alloc                 (size_t);
-+extern void * __gnat_cpu_alloc                 (size_t);
- extern size_t __gnat_cpu_alloc_size                (size_t);
-extern void   __gnat_cpu_free                  (cpu_set_t *);
-extern void   __gnat_cpu_zero                      (size_t, cpu_set_t *);
-extern void   __gnat_cpu_set                       (int, size_t, cpu_set_t *);
-+extern void   __gnat_cpu_free                  (void *);
-+extern void   __gnat_cpu_zero                      (size_t, void *);
-+extern void   __gnat_cpu_set                       (int, size_t, void *);
- #endif
- 
- #if defined (_WIN32)
-diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index ec9db3a6a4c..6f92e50dd67 100644
--- a/gcc/ada/terminals.c
-+++ b/gcc/ada/terminals.c
-@@ -1132,7 +1132,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
- /* POSIX does not specify how to open the master side of a terminal.Several
-    methods are available (system specific):
-       1- using a cloning device (USE_CLONE_DEVICE)
-      2- getpt                  (USE_GETPT)
-+      2- posix_openpt           (USE_POSIX_OPENPT)
-       3- openpty                (USE_OPENPTY)
- 
-    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1146,7 +1146,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
- #if defined (__APPLE__) || defined (BSD)
- #define USE_OPENPTY
- #elif defined (__linux__)
-#define USE_GETPT
-+#define USE_POSIX_OPENPT
- #elif defined (__sun__)
- #define USE_CLONE_DEVICE "/dev/ptmx"
- #elif defined (_AIX)
-@@ -1195,8 +1195,8 @@ allocate_pty_desc (pty_desc **desc) {
-    int  master_fd   = -1;
-    char *slave_name = NULL;
- 
-#ifdef USE_GETPT
-  master_fd = getpt ();
-+#if defined(USE_POSIX_OPENPT)
-+  master_fd = posix_openpt(O_RDWR | O_NOCTTY);
- #elif defined (USE_OPENPTY)
-   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
- #elif defined (USE_CLONE_DEVICE)
-- 
-2.35.1
-
@@ -1,43 +0,0 @@
-From 8a42d93247c375f199f3079538d659f95b9ff2a0 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 17:59:45 +0200
-Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
---
- libgo/mksigtab.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/mksigtab.sh b/libgo/mksigtab.sh
-index 11e4ec436bd..fe866eacb27 100644
--- a/libgo/mksigtab.sh
-+++ b/libgo/mksigtab.sh
-@@ -82,7 +82,7 @@ checksig _SIGPWR     '{_SigNotify, "SIGPWR: power failure restart"}'
- checksig _SIGEMT     '{_SigThrow, "SIGEMT: emulate instruction executed"}'
- checksig _SIGINFO    '{_SigNotify, "SIGINFO: status request from keyboard"}'
- checksig _SIGTHR     '{_SigNotify, "SIGTHR: reserved"}'
-checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
-+#checksig _SIGPOLL    '{_SigNotify, "SIGPOLL: pollable event occurred"}'
- checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}'
- checksig _SIGLWP     '{_SigNotify, "SIGLWP: reserved signal no longer used by"}'
- checksig _SIGFREEZE  '{_SigNotify, "SIGFREEZE: special signal used by CPR"}'
-@@ -95,10 +95,12 @@ checksig _SIGLOST '   {_SigNotify, "SIGLOST: resource lost (Sun); server died (G
- 
- # Special handling of signals 32 and 33 on GNU/Linux systems,
- # because they are special to glibc.
-+# Signal 34 is additionally special to Linux systems with musl.
- if test "${GOOS}" = "linux"; then
-    SIGLIST=$SIGLIST"_32__33_"
-+    SIGLIST=$SIGLIST"_32__33__34_"
-     echo '	32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */'
-     echo '	33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */'
-+    echo '	34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */'
- fi
- 
- if test "${GOOS}" = "aix"; then
-- 
-2.35.1
-
@@ -1,27 +0,0 @@
-From c205f79c18add13247a06cfd843f5eb44c4c3cb4 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 25 Nov 2021 01:47:03 +0000
-Subject: [PATCH] There are more than one st_{a,m,c}tim fields in struct stat
- on time64 machines.
-
-Run the Go-isation on all of them.
---
- libgo/mksysinfo.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 0c52ea5d71a..6fef104cc1c 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -510,7 +510,7 @@ fi
- 
- # For historical reasons Go uses the suffix "timespec" instead of "tim" for
- # stat_t's time fields on NetBSD.
-st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
-+st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
- if test "${GOOS}" = "netbsd"; then
-     st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
- fi
-- 
-2.35.1
-
@@ -1,29 +0,0 @@
-From af64f915a4717036a7f1fe637308b455c94e0f1e Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 18:03:03 +0200
-Subject: [PATCH] gcc-go: signal 34 is special on musl libc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Taken from Adélie Linux.
---
- libgo/go/runtime/signal_gccgo.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
-index 2eece687e35..e86490ce203 100644
--- a/libgo/go/runtime/signal_gccgo.go
-+++ b/libgo/go/runtime/signal_gccgo.go
-@@ -106,7 +106,7 @@ func getsig(i uint32) uintptr {
- 	if sigaction(i, nil, &sa) < 0 {
- 		// On GNU/Linux glibc rejects attempts to call
- 		// sigaction with signal 32 (SIGCANCEL) or 33 (SIGSETXID).
-		if GOOS == "linux" && (i == 32 || i == 33) {
-+		if GOOS == "linux" && (i == 32 || i == 33 || i == 34) {
- 			return _SIG_DFL
- 		}
- 		throw("sigaction read failure")
-- 
-2.35.1
-
@@ -1,27 +0,0 @@
-From 6e41b6753af412388e9259fe791904146695e84e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:27:51 +0200
-Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c
-
---
- libgo/runtime/proc.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 38bf7a6b255..e50403b5a75 100644
--- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
- 
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
- 
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
-+
- #ifndef SETCONTEXT_CLOBBERS_TLS
- 
- static inline void
-- 
-2.35.1
-
@@ -1,25 +0,0 @@
-From cc89c078ffc58a7f6675a60fbca24224effcb7e3 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Mon, 31 Aug 2020 08:59:40 +0200
-Subject: [PATCH] gcc-go: link to libucontext
-
---
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 426949aa91c..f97db1ef569 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -50331,7 +50331,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	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.35.1
-
@@ -1,48 +0,0 @@
-From 3fb914ca83ac18287ee24aa75aba9149e35487ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
-
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
-
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
--- a/libgo/go/syscall/errstr.go
-+++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
- // license that can be found in the LICENSE file.
- 
- // +build !hurd
-// +build !linux
- 
- package syscall
- 
-diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
--- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
-// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
-- 
-2.35.1
-
@@ -1,275 +0,0 @@
-From 52ce9c86c0c89ae45e0d08cc232682e1811aa8f2 Mon Sep 17 00:00:00 2001
-From: Drew DeVault <sir@cmpwn.com>
-Date: Wed, 9 Dec 2020 16:07:26 +0000
-Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
- 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         | 34 +++++++++++++++++++++++++++++++---
- gcc/configure.ac      | 22 +++++++++++++++++++++-
- gcc/doc/install.texi  |  8 ++++++++
- gcc/doc/tm.texi       |  8 +++++++-
- gcc/doc/tm.texi.in    |  8 +++++++-
- gcc/gcc.c             | 12 +++++++++++-
- 9 files changed, 103 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f97db1ef569..7e577ed3dbb 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -222,6 +222,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 059c818c895..2a560417440 100644
--- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -106,6 +106,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 902378e1bad..daf7727a01a 100644
--- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #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 592e81e40f6..8672298f23f 100755
--- a/gcc/configure
-+++ b/gcc/configure
-@@ -978,6 +978,7 @@ with_changes_root_url
- enable_languages
- with_multilib_list
- with_multilib_generator
-+enable_autolink_libatomic
- with_zstd
- with_zstd_include
- with_zstd_lib
-@@ -1707,6 +1708,9 @@ Optional Features:
-   --disable-shared        don't provide a shared libgcc
-   --disable-gcov          don't provide libgcov and related host tools
-   --enable-languages=LIST specify which front-ends to build
-+  --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
-@@ -8070,7 +8074,6 @@ else
- fi
- 
- 
-
- # Check whether --with-multilib-generator was given.
- if test "${with_multilib_generator+set}" = set; then :
-   withval=$with_multilib_generator; :
-@@ -8078,6 +8081,32 @@ else
-   with_multilib_generator=default
- fi
- 
-+# If libatomic is available, whether it should be linked automatically
-+# Check whether --enable-autolink-libatomic was given.
-+if test "${enable_autolink_libatomic+set}" = set; then :
-+  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
-@@ -19501,7 +19530,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
-#line 19501 "configure"
-+#line 19158 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -34068,4 +34097,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
- 
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 1577529ffb7..e96691f69ba 100644
--- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1149,6 +1149,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
- # -------------------------
-@@ -7729,4 +7750,3 @@ done
- ], 
- [subdirs='$subdirs'])
- AC_OUTPUT
-
-diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 4c38244ae58..4a544e6a4ee 100644
--- a/gcc/doc/install.texi
-+++ b/gcc/doc/install.texi
-@@ -2213,6 +2213,14 @@ files, but these changed header paths may conflict with some compilation
- environments.  Enabled by default, and may be disabled using
- @option{--disable-canonical-system-headers}.
- 
-+@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 b370bc76b25..acc78273983 100644
--- a/gcc/doc/tm.texi
-+++ b/gcc/doc/tm.texi
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @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 2974dae2701..80e003a38ce 100644
--- a/gcc/doc/tm.texi.in
-+++ b/gcc/doc/tm.texi.in
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @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.c b/gcc/gcc.c
-index 22dbbf85850..90aa576037a 100644
--- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -980,13 +980,23 @@ proper position among the other output files.  */
- # define ASM_DEBUG_OPTION_SPEC ""
- #endif
- 
-+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
-+#  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.35.1
-
@@ -1,57 +0,0 @@
-From 5010fa237897bca92291ba8835123125d4af933a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 29 Aug 2021 09:45:27 +0200
-Subject: [PATCH] configure: fix detection of atomic builtins in libatomic
- configure script
-
-Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
-default) causes the libatomic configure script to incorrectly detect
-which builtins are available on riscv64. This then causes incorrect code
-generation for libatomic since it assumes compiler builtins to be
-available which are not actually available on riscv64.
-
-This commit fixes this issue by disabling linking of libatomic configure
-test code entirely, thereby preventing linking against libatomic.
-
-See:
-
-* https://gitlab.alpinelinux.org/alpine/aports/-/issues/12948
-* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c6
---
- libatomic/configure.tgt | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
-index 670b0d72cfe..38c2cd9345f 100644
--- a/libatomic/configure.tgt
-+++ b/libatomic/configure.tgt
-@@ -30,6 +30,26 @@
- # on ${target_cpu}.  For example to allow proper use of multilibs.
- configure_tgt_pre_target_cpu_XCFLAGS="${XCFLAGS}"
- 
-+# The libatomic configure script performs several checks to determine
-+# whether builtins for atomic operations are available. When compiling
-+# with --enable-autolink-libatomic the test code compiled by the
-+# configure script is also linked against libatomic. This causes it
-+# to think that builtins are available, even if there are not, since
-+# the tested symbols are provided by libatomic.
-+#
-+# This is a hack to ensure that we don't link against libatomic by not
-+# linking any configure test code at all when --enable-autolink-libatomic
-+# is given.
-+#
-+# See:
-+#
-+#   * https://gitlab.alpinelinux.org/alpine/aports/-/issues/12817
-+#   * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c4
-+#
-+if test x$enable_autolink_libatomic = xyes; then
-+	gcc_no_link=yes
-+fi
-+
- case "${target_cpu}" in
-   alpha*)
- 	# fenv.c needs this option to generate inexact exceptions.
-- 
-2.35.1
-
@@ -1,84 +0,0 @@
-From 2d924c522dde7426afbb8096d9301b17d0e73121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 28 Nov 2021 00:54:37 +0100
-Subject: [PATCH] libgo: Recognize off64_t and loff_t definitions of musl libc
-
-Without this patch, both off64_t and loff_t are not recognized by
-fdump-go-spec which causes a variety Go-related compilation errors on
-musl libc since the gcc-go frontend expects both off64_t and loff_t to
-be present.
-
-Also make sure that autoconf recognizes support for loff_t on musl, by
-compiling the relevant feature test code with -D_GNU_SOURCE and making
-it include fcntl.h which defines loff_t on musl.
---
- libgo/configure    |  4 +++-
- libgo/configure.ac |  4 +++-
- libgo/sysinfo.c    | 21 +++++++++++++++++++++
- 3 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/configure b/libgo/configure
-index 70f64c974fd..69d15839e8c 100755
--- a/libgo/configure
-+++ b/libgo/configure
-@@ -15546,7 +15546,9 @@ _ACEOF
- 
- fi
- 
-ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+CFLAGS_hold=$CFLAGS
-+CFLAGS="$CFLAGS -D_GNU_SOURCE"
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "#include <fcntl.h>"
- if test "x$ac_cv_type_loff_t" = xyes; then :
- 
- cat >>confdefs.h <<_ACEOF
-diff --git a/libgo/configure.ac b/libgo/configure.ac
-index ebab9d9de3e..a3d9d309aba 100644
--- a/libgo/configure.ac
-+++ b/libgo/configure.ac
-@@ -602,7 +602,9 @@ AC_STRUCT_DIRENT_D_TYPE
- 
- AC_CHECK_FUNCS(accept4 dup3 epoll_create1 faccessat fallocate fchmodat fchownat futimesat getxattr inotify_add_watch inotify_init inotify_init1 inotify_rm_watch listxattr mkdirat mknodat open64 openat pipe2 removexattr renameat setxattr sync_file_range splice syscall tee unlinkat unshare utimensat)
- AC_TYPE_OFF_T
-AC_CHECK_TYPES([loff_t])
-+CFLAGS_hold=$CFLAGS
-+CFLAGS="$CFLAGS -D_GNU_SOURCE" # musl does not define loff_t without this
-+AC_CHECK_TYPES([loff_t], [], [], [[#include <fcntl.h>]])
- 
- LIBS_hold="$LIBS"
- LIBS="$LIBS -lm"
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 8ce061e2f5f..b85add15a7b 100644
--- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -343,6 +343,27 @@ enum {
- #endif
- };
- 
-+// musl libc has both off64_t and loff_t. However, both of these types
-+// are defined as CPP macros, not as C typedefs. Unfortunately, the GCC
-+// -fdump-go-spec option, which is responsible for generating type
-+// definitions for Go based on this file, only recognizes types defined
-+// through typedefs.
-+//
-+// For this reason, we check here if either off64_t or loff_t are
-+// defined as CPP macros and if so, we redefine them using a C typedef.
-+#if defined(HAVE_OFF64_T) && defined(off64_t)
-+typedef off64_t __musl_off64_t;
-+#undef off64_t
-+typedef __musl_off64_t off64_t;
-+#endif
-+
-+// See comment regarding musl libc above.
-+#if defined(HAVE_LOFF_T) && defined(loff_t)
-+typedef loff_t __musl_loff_t;
-+#undef loff_t
-+typedef __musl_loff_t loff_t;
-+#endif
-+
- // SIOCGIFMTU can't be added in the above enum as it might
- // be signed in some OSes.
- #ifdef SIOCGIFMTU
-- 
-2.35.1
-
@@ -1,80 +0,0 @@
-From 72f32e3383129ad139df76d9a063fac9b03079b1 Mon Sep 17 00:00:00 2001
-From: Alex McGrath <amk@amk.ie>
-Date: Wed, 13 Oct 2021 23:24:27 +0100
-Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit
-
-This moves usages of pthread.h to above any usage of system.h as it
-included #pragma GCC poison calloc
---
- gcc/jit/jit-playback.c  | 4 ++--
- gcc/jit/jit-recording.c | 4 ++--
- gcc/jit/libgccjit.c     | 3 ++-
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
-index cee9daa8220..a5600084933 100644
--- a/gcc/jit/jit-playback.c
-+++ b/gcc/jit/jit-playback.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "diagnostic.h"
- #include "stmt.h"
- 
-#include <pthread.h>
-
- #include "jit-playback.h"
- #include "jit-result.h"
- #include "jit-builtins.h"
-diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
-index 117ff70114c..d2634a546b1 100644
--- a/gcc/jit/jit-recording.c
-+++ b/gcc/jit/jit-recording.c
-@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
-@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
- #include "pretty-print.h"
- #include "toplev.h"
- 
-#include <pthread.h>
-
- #include "jit-builtins.h"
- #include "jit-recording.h"
- #include "jit-playback.h"
-diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
-index 0cc650f9810..2f44481eeb0 100644
--- a/gcc/jit/libgccjit.c
-+++ b/gcc/jit/libgccjit.c
-@@ -18,13 +18,14 @@ You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
- 
-+#include <pthread.h>
-+
- #include "config.h"
- #include "system.h"
- #include "coretypes.h"
- #include "timevar.h"
- #include "typed-splay-tree.h"
- #include "cppbuiltin.h"
-#include <pthread.h>
- 
- #include "libgccjit.h"
- #include "jit-recording.h"
-- 
-2.35.1
-
@@ -1,106 +0,0 @@
-From aeef0ee2aac43d89ae26c6a3559aae4f8a1d53da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Thu, 25 Nov 2021 17:44:04 +0100
-Subject: [PATCH] stddef.h: add support for musl typedef macro guards
-
-The stddef.h header checks/sets various hardcoded toolchain/os specific
-macro guards to prevent redefining types such as ptrdiff_t, wchar_t, or
-size_t. However, without this patch, the file does not check/set the
-typedef macro guards for musl libc. This causes types such as size_t to
-be defined twice for files which include both musl's stddef.h as well as
-GCC's ginclude/stddef.h. This is, for example, the case for
-libgo/sysinfo.c. If libgo/sysinfo.c has multiple typedefs for size_t
-this confuses -fdump-go-spec and causes size_t not to be included in the
-generated type definitions thereby causing a gcc-go compilation failure
-on musl with the following error message:
-
-	sysinfo.go:7765:13: error: use of undefined type '_size_t'
-	 7765 | type Size_t _size_t
-	      |             ^
-	libcall_posix.go:49:35: error: non-integer len argument in make
-	   49 |                 b := make([]byte, len)
-	      |
-
-This commit fixes this issue by ensuring that ptrdiff_t, wchar_t, and size_t
-are only defined once in the pre-processed libgo/sysinfo.c file by enhancing
-gcc/ginclude/stddef.h with musl-specific typedef macro guards.
---
- gcc/ginclude/stddef.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
-index 66619fe43b1..50d710a5ab9 100644
--- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -128,6 +128,7 @@ _TYPE_wchar_t;
- #ifndef ___int_ptrdiff_t_h
- #ifndef _GCC_PTRDIFF_T
- #ifndef _PTRDIFF_T_DECLARED /* DragonFly */
-+#ifndef __DEFINED_ptrdiff_t /* musl libc */
- #define _PTRDIFF_T
- #define _T_PTRDIFF_
- #define _T_PTRDIFF
-@@ -137,10 +138,12 @@ _TYPE_wchar_t;
- #define ___int_ptrdiff_t_h
- #define _GCC_PTRDIFF_T
- #define _PTRDIFF_T_DECLARED
-+#define __DEFINED_ptrdiff_t
- #ifndef __PTRDIFF_TYPE__
- #define __PTRDIFF_TYPE__ long int
- #endif
- typedef __PTRDIFF_TYPE__ ptrdiff_t;
-+#endif /* __DEFINED_ptrdiff_t */
- #endif /* _PTRDIFF_T_DECLARED */
- #endif /* _GCC_PTRDIFF_T */
- #endif /* ___int_ptrdiff_t_h */
-@@ -174,6 +177,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
- #ifndef _SIZE_T_DEFINED
- #ifndef _BSD_SIZE_T_DEFINED_	/* Darwin */
- #ifndef _SIZE_T_DECLARED	/* FreeBSD 5 */
-+#ifndef __DEFINED_size_t	/* musl libc */
- #ifndef ___int_size_t_h
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
-@@ -191,6 +195,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
- #define _SIZE_T_DEFINED
- #define _BSD_SIZE_T_DEFINED_	/* Darwin */
- #define _SIZE_T_DECLARED	/* FreeBSD 5 */
-+#define __DEFINED_size_t	/* musl libc */
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-@@ -215,6 +220,7 @@ typedef long ssize_t;
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
- #endif /* ___int_size_t_h */
-+#endif /* __DEFINED_size_t */
- #endif /* _SIZE_T_DECLARED */
- #endif /* _BSD_SIZE_T_DEFINED_ */
- #endif /* _SIZE_T_DEFINED */
-@@ -251,6 +257,7 @@ typedef long ssize_t;
- #ifndef _BSD_WCHAR_T_DEFINED_    /* Darwin */
- #ifndef _BSD_RUNE_T_DEFINED_	/* Darwin */
- #ifndef _WCHAR_T_DECLARED /* FreeBSD 5 */
-+#ifndef __DEFINED_wchar_t /* musl libc */
- #ifndef _WCHAR_T_DEFINED_
- #ifndef _WCHAR_T_DEFINED
- #ifndef _WCHAR_T_H
-@@ -272,6 +279,7 @@ typedef long ssize_t;
- #define __INT_WCHAR_T_H
- #define _GCC_WCHAR_T
- #define _WCHAR_T_DECLARED
-+#define __DEFINED_wchar_t
- 
- /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
-    instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
-@@ -326,6 +334,7 @@ typedef __WCHAR_TYPE__ wchar_t;
- #endif
- #endif
- #endif
-+#endif /* __DEFINED_wchar_t */
- #endif /* _WCHAR_T_DECLARED */
- #endif /* _BSD_RUNE_T_DEFINED_ */
- #endif
-- 
-2.35.1
-
@@ -1,63 +0,0 @@
-From 36c79820c1085590f272ef1afcad4744125d96d0 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sun, 30 Aug 2020 18:33:49 +0200
-Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without this patch, Go run-time memory allocation fails on 32-bit architectures:
-
-	fatal error: runtime: cannot allocate memory
-	runtime stack:
-	runtime.dopanic__m
-		:0
-	runtime.throw
-		:0
-		:0
-		:0
-	runtime.systemstack
-		:0
-	runtime.addrRanges.init
-		:0
-	runtime.pageAlloc.init
-		:0
-	runtime.mheap.init
-		:0
-	runtime.schedinit
-		:0
-		:0
-		:0
-
-Taken from Adélie Linux [1].
-
-[1]: https://git.adelielinux.org/adelie/packages/-/commit/63b5fb12c3d75e460799c672bbbdd5d29c3cc33c
---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d857e..57bed97c710 100644
--- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -15,7 +15,7 @@ import (
- //go:linkname sysFree
- 
- //extern mmap
-func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
- 
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -37,7 +37,7 @@ func init() {
- 	}
- }
- 
-func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- 	p := sysMmap(addr, n, prot, flags, fd, off)
- 	if uintptr(p) == _MAP_FAILED {
- 		return nil, errno()
-- 
-2.35.1
-
@@ -1,58 +0,0 @@
-From 353c8abdc34a294c89c24423ef0c4182189117f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
-Date: Sun, 2 Jan 2022 01:07:03 +0100
-Subject: [PATCH] libgo: include asm/ptrace.h for pt_regs definition on PowerPC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both glibc and musl libc declare pt_regs as an incomplete type. This
-type has to be completed by inclusion of another header. On Linux, the
-asm/ptrace.h header file provides this type definition. Without
-including this header file, it is not possible to access the regs member
-of the mcontext_t struct as done in libgo/runtime/go-signal.c. On glibc,
-other headers (e.g. sys/user.h) include asm/ptrace.h but on musl
-asm/ptrace.h is not included by other headers and thus the
-aforementioned files do not compile without an explicit include of
-asm/ptrace.h:
-
-	libgo/runtime/go-signal.c: In function 'getSiginfo':
-	libgo/runtime/go-signal.c:227:63: error: invalid use of undefined type 'struct pt_regs'
-	  227 |         ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip;
-	      |
-
-Instead of including the asm/ptrace.h header conditionally on PowerPC
-only it would alternatively also be possible to include it
-unconditionally.
-
-See also:
-
-* https://git.musl-libc.org/cgit/musl/commit/?id=c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
-* https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d57cb31910ca5c200e4172276749a7f8bd17ae3c
-* https://github.com/kaniini/libucontext/issues/36
-
-Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
---
- libgo/runtime/go-signal.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c
-index d30d1603adc..fc01e04e4a1 100644
--- a/libgo/runtime/go-signal.c
-+++ b/libgo/runtime/go-signal.c
-@@ -10,6 +10,12 @@
- #include <sys/time.h>
- #include <ucontext.h>
- 
-+// On PowerPC, ucontext.h uses a pt_regs struct as an incomplete
-+// type. This type must be completed by including asm/ptrace.h.
-+#ifdef __PPC__
-+#include <asm/ptrace.h>
-+#endif
-+
- #include "runtime.h"
- 
- #ifndef SA_RESTART
-- 
-2.35.1
-
@@ -1,115 +0,0 @@
-From 2c6bf28619c9b3bf713f7f5319c5d750a6c297ae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
-Date: Fri, 21 Jan 2022 19:22:46 +0000
-Subject: [PATCH] Disable -fsplit-stack support on non-glibc targets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The -fsplit-stack option requires the pthread_t TCB definition in the
-libc to provide certain struct fields at specific hardcoded offsets. As
-far as I know, only glibc provides these fields at the required offsets.
-Most notably, musl libc does not have these fields. However, since gcc
-accesses the fields using a fixed offset, this does not cause a
-compile-time error, but instead results in a silent memory corruption at
-run-time with musl libc. For example, on s390x libgcc's
-__stack_split_initialize CTOR will overwrite the cancel field in the
-pthread_t TCB on musl.
-
-The -fsplit-stack option is used within the gcc code base itself by
-gcc-go (if available). On musl-based systems with split-stack support
-(i.e. s390x or x86) this causes Go programs compiled with gcc-go to
-misbehave at run-time.
-
-This patch fixes gcc-go on musl by disabling -fsplit-stack in gcc itself
-since it is not supported on non-glibc targets anyhow. This is achieved
-by checking if gcc targets a glibc-based system. This check has been
-added for x86 and s390x, the rs6000 config already checks for
-TARGET_GLIBC_MAJOR. Other architectures do not have split-stack
-support. With this patch applied, the gcc-go configure script will
-detect that -fsplit-stack support is not available and will not use it.
-
-See https://www.openwall.com/lists/musl/2012/10/16/12
-
-This patch was written under the assumption that glibc is the only libc
-implementation which supports the required fields at the required
-offsets in the pthread_t TCB. The patch has been tested on Alpine Linux
-Edge on the s390x and x86 architectures by bootstrapping Google's Go
-implementation with gcc-go.
-
-Signed-off-by: SÃ¶ren Tempel <soeren@soeren-tempel.net>
-
-gcc/ChangeLog:
-
-	* common/config/s390/s390-common.c (s390_supports_split_stack):
-	Only support split-stack on glibc targets.
-	* config/i386/gnu-user-common.h (STACK_CHECK_STATIC_BUILTIN): Ditto.
-	* config/i386/gnu.h (defined): Ditto.
---
- gcc/common/config/s390/s390-common.c | 14 ++++++++++----
- gcc/config/i386/gnu-user-common.h    |  5 +++--
- gcc/config/i386/gnu.h                |  5 ++++-
- 3 files changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/common/config/s390/s390-common.c b/gcc/common/config/s390/s390-common.c
-index b6bc8501742..8c1e590322d 100644
--- a/gcc/common/config/s390/s390-common.c
-+++ b/gcc/common/config/s390/s390-common.c
-@@ -116,13 +116,19 @@ s390_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED,
- 
- /* -fsplit-stack uses a field in the TCB, available with glibc-2.23.
-    We don't verify it, since earlier versions just have padding at
-   its place, which works just as well.  */
-+   its place, which works just as well.  For other libc implementations
-+   we disable the feature entirely to avoid corrupting the TCB.  */
- 
- static bool
-s390_supports_split_stack (bool report ATTRIBUTE_UNUSED,
-			   struct gcc_options *opts ATTRIBUTE_UNUSED)
-+s390_supports_split_stack (bool report,
-+			   struct gcc_options *opts)
- {
-  return true;
-+  if (opts->x_linux_libc == LIBC_GLIBC)
-+    return true;
-+
-+  if (report)
-+    error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
-+  return false;
- }
- 
- #undef TARGET_DEFAULT_TARGET_FLAGS
-diff --git a/gcc/config/i386/gnu-user-common.h b/gcc/config/i386/gnu-user-common.h
-index 00226f5a455..6e13315b5a3 100644
--- a/gcc/config/i386/gnu-user-common.h
-+++ b/gcc/config/i386/gnu-user-common.h
-@@ -66,7 +66,8 @@ along with GCC; see the file COPYING3.  If not see
- #define STACK_CHECK_STATIC_BUILTIN 1
- 
- /* We only build the -fsplit-stack support in libgcc if the
-   assembler has full support for the CFI directives.  */
-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
-+   assembler has full support for the CFI directives and
-+   targets glibc.  */
-+#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && OPTION_GLIBC
- #define TARGET_CAN_SPLIT_STACK
- #endif
-diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
-index 25fbc07f58c..afd3e8e8841 100644
--- a/gcc/config/i386/gnu.h
-+++ b/gcc/config/i386/gnu.h
-@@ -35,7 +35,10 @@ along with GCC.  If not, see <http://www.gnu.org/licenses/>.
-    crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
- 
-#ifdef TARGET_LIBC_PROVIDES_SSP
-+/* -fsplit-stack uses a field in the TCB at a fixed offset. This
-+   field is only available for glibc.  Disable -fsplit-stack for
-+   other libc implementations to avoid silent TCB corruptions.  */
-+#if defined (TARGET_LIBC_PROVIDES_SSP) && OPTION_GLIBC
- 
- /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
- #define TARGET_THREAD_SSP_OFFSET        0x14
-- 
-2.35.1
-
@@ -1,94 +0,0 @@
-From 4ea687132408a7c662706c4a7eb3c61b7773d735 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Fri, 21 Jan 2022 13:24:00 -0800
-Subject: [PATCH] x86: Properly disable -fsplit-stack support on non-glibc
- targets
-
-Revert x86 changes in
-
-commit c163647ffbc9a20c8feb6e079dbecccfe016c82e
-Author: Soren Tempel <soeren@soeren-tempel.net>
-Date:   Fri Jan 21 19:22:46 2022 +0000
-
-    Disable -fsplit-stack support on non-glibc targets
-
-and change ix86_supports_split_stack to return true only on glibc.
-
-	PR bootstrap/104170
-	* common/config/i386/i386-common.c (ix86_supports_split_stack):
-	Return true only on glibc.
-	* config/i386/gnu-user-common.h (STACK_CHECK_STATIC_BUILTIN):
-	Revert commit c163647ffbc.
-	* config/i386/gnu.h (TARGET_LIBC_PROVIDES_SSP): Likewise.
---
- gcc/common/config/i386/i386-common.c | 17 +++++++++++------
- gcc/config/i386/gnu-user-common.h    |  5 ++---
- gcc/config/i386/gnu.h                |  5 +----
- 3 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c
-index 96549aa7d7e..a3b5258e828 100644
--- a/gcc/common/config/i386/i386-common.c
-+++ b/gcc/common/config/i386/i386-common.c
-@@ -1696,16 +1696,21 @@ ix86_option_init_struct (struct gcc_options *opts)
-    field in the TCB, so they cannot be used together.  */
- 
- static bool
-ix86_supports_split_stack (bool report ATTRIBUTE_UNUSED,
-+ix86_supports_split_stack (bool report,
- 			   struct gcc_options *opts ATTRIBUTE_UNUSED)
- {
-+#ifdef TARGET_THREAD_SPLIT_STACK_OFFSET
-+  if (opts->x_linux_libc != LIBC_GLIBC)
-+#endif
-+    {
-+      if (report)
-+	error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
-+      return false;
-+    }
-+
-   bool ret = true;
- 
-#ifndef TARGET_THREAD_SPLIT_STACK_OFFSET
-  if (report)
-    error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
-  ret = false;
-#else
-+#ifdef TARGET_THREAD_SPLIT_STACK_OFFSET
-   if (!HAVE_GAS_CFI_PERSONALITY_DIRECTIVE)
-     {
-       if (report)
-diff --git a/gcc/config/i386/gnu-user-common.h b/gcc/config/i386/gnu-user-common.h
-index 6e13315b5a3..00226f5a455 100644
--- a/gcc/config/i386/gnu-user-common.h
-+++ b/gcc/config/i386/gnu-user-common.h
-@@ -66,8 +66,7 @@ along with GCC; see the file COPYING3.  If not see
- #define STACK_CHECK_STATIC_BUILTIN 1
- 
- /* We only build the -fsplit-stack support in libgcc if the
-   assembler has full support for the CFI directives and
-   targets glibc.  */
-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && OPTION_GLIBC
-+   assembler has full support for the CFI directives.  */
-+#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
- #define TARGET_CAN_SPLIT_STACK
- #endif
-diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
-index afd3e8e8841..25fbc07f58c 100644
--- a/gcc/config/i386/gnu.h
-+++ b/gcc/config/i386/gnu.h
-@@ -35,10 +35,7 @@ along with GCC.  If not, see <http://www.gnu.org/licenses/>.
-    crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
- #endif
- 
-/* -fsplit-stack uses a field in the TCB at a fixed offset. This
-   field is only available for glibc.  Disable -fsplit-stack for
-   other libc implementations to avoid silent TCB corruptions.  */
-#if defined (TARGET_LIBC_PROVIDES_SSP) && OPTION_GLIBC
-+#ifdef TARGET_LIBC_PROVIDES_SSP
- 
- /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
- #define TARGET_THREAD_SSP_OFFSET        0x14
-- 
-2.35.1
-
@@ -1,26 +0,0 @@
-From e74e2946a534fbac7e8ec6c687c407761daef49a Mon Sep 17 00:00:00 2001
-From: Mathias LANG <pro.mathias.lang@gmail.com>
-Date: Mon, 17 Jan 2022 16:31:09 +0000
-Subject: [PATCH] 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 7e577ed3dbb..da40b61a8c5 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -51248,7 +51248,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.35.1
-
@@ -1,298 +0,0 @@
-From 7b5108375bb67532af30d1e7f553ac5f3b1096fe Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Mon, 24 Jan 2022 11:13:39 +0100
-Subject: [PATCH] properly disable -fsplit-stack on non-glibc targets
- [PR104170]
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On Sat, Jan 22, 2022 at 10:32:21AM +0100, Martin Liška wrote:
-> I've just noticed the patch broke a few cross compilers:
->
-> s390x-ibm-tpf:
->
-> /home/marxin/buildworker/zen2-cross-compilers/build/gcc/common/config/s390/s390-common.cc: In function ‘bool s390_supports_split_stack(bool, gcc_options*)’:
-> /home/marxin/buildworker/zen2-cross-compilers/build/gcc/common/config/s390/s390-common.cc:126:13: error: ‘struct gcc_options’ has no member named ‘x_linux_libc’
->   126 |   if (opts->x_linux_libc == LIBC_GLIBC)
->       |             ^~~~~~~~~~~~
->
-> i686-kopensolaris-gnu, i686-symbolics-gnu
->
-> /home/marxin/buildworker/zen2-cross-compilers/build/gcc/common/config/i386/i386-common.cc: In function ‘bool ix86_supports_split_stack(bool, gcc_options*)’:
-> /home/marxin/buildworker/zen2-cross-compilers/build/gcc/common/config/i386/i386-common.cc:1721:13: error: ‘struct gcc_options’ has no member named ‘x_linux_libc’
->  1721 |   if (opts->x_linux_libc != LIBC_GLIBC)
->       |             ^~~~~~~~~~~~
-> make[1]: *** [Makefile:2418: i386-common.o] Error 1
->
-> Can you please take a look? Btw. do you have a bugzilla account?
-
-I bet instead of opts->x_linux_libc != LIBC_GLIBC it needs to use
- #ifdef OPTION_GLIBC
-   if (!OPTION_GLIBC)
- #endif
-or so.  I think the first committed patch actually used that
-but used it in #if directive, which is wrong because it is something
-that needs to be evaluated at runtime.
-
-That doesn't work well either, because the *supports_split_stack
-hooks have opts argument and OPTION_GLIBC doesn't take that.
-
-So, here is a patch that introduces OPTION_*_P macros that take opts
-as an argument and redefines OPTION_* using those (similarly to how
-the option scripts create TARGET_*_P and TARGET_* macros).
-
-2022-01-24  Jakub Jelinek  <jakub@redhat.com>
-
-	PR bootstrap/104170
-	* config/linux.h (OPTION_GLIBC_P, OPTION_UCLIBC_P,
-	OPTION_BIONIC_P, OPTION_MUSL_P): Define.
-	(OPTION_GLIBC, OPTION_UCLIBC, OPTION_BIONIC, OPTION_MUSL): Redefine
-	using OPTION_*_P macros.
-	* config/alpha/linux.h (OPTION_GLIBC_P, OPTION_UCLIBC_P,
-	OPTION_BIONIC_P, OPTION_MUSL_P): Define.
-	(OPTION_GLIBC, OPTION_UCLIBC, OPTION_BIONIC, OPTION_MUSL): Redefine
-	using OPTION_*_P macros.
-	* config/rs6000/linux.h (OPTION_GLIBC_P, OPTION_UCLIBC_P,
-	OPTION_BIONIC_P, OPTION_MUSL_P): Define.
-	(OPTION_GLIBC, OPTION_UCLIBC, OPTION_BIONIC, OPTION_MUSL): Redefine
-	using OPTION_*_P macros.
-	* config/rs6000/linux64.h (OPTION_GLIBC_P, OPTION_UCLIBC_P,
-	OPTION_BIONIC_P, OPTION_MUSL_P): Define.
-	(OPTION_GLIBC, OPTION_UCLIBC, OPTION_BIONIC, OPTION_MUSL): Redefine
-	using OPTION_*_P macros.
-	* config/fuchsia.h (OPTION_MUSL_P): Redefine.
-	* config/glibc-stdint.h (OPTION_MUSL_P): Define if not defined.
-	* common/config/s390/s390-common.cc (s390_supports_split_stack): Re-add
-	ATTRIBUTE_UNUSED to opts parameter.  If OPTION_GLIBC_P is defined, use
-	OPTION_GLIBC_P (opts) as condition, otherwise assume if (false).
-	* common/config/i386/i386-common.cc (ix86_supports_split_stack): If
-	OPTION_GLIBC_P is defined use !OPTION_GLIBC_P (opts) as condition,
-	otherwise assume if (true).
---
- gcc/common/config/i386/i386-common.c |  4 ++--
- gcc/common/config/s390/s390-common.c |  6 ++++--
- gcc/config/alpha/linux.h             | 25 +++++++++++++++----------
- gcc/config/fuchsia.h                 |  2 ++
- gcc/config/glibc-stdint.h            |  3 +++
- gcc/config/linux.h                   | 25 +++++++++++++++----------
- gcc/config/rs6000/linux.h            | 25 +++++++++++++++----------
- gcc/config/rs6000/linux64.h          | 25 +++++++++++++++----------
- 8 files changed, 71 insertions(+), 44 deletions(-)
-
-diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c
-index a3b5258e828..864e68ab985 100644
--- a/gcc/common/config/i386/i386-common.c
-+++ b/gcc/common/config/i386/i386-common.c
-@@ -1699,8 +1699,8 @@ static bool
- ix86_supports_split_stack (bool report,
- 			   struct gcc_options *opts ATTRIBUTE_UNUSED)
- {
-#ifdef TARGET_THREAD_SPLIT_STACK_OFFSET
-  if (opts->x_linux_libc != LIBC_GLIBC)
-+#if defined(TARGET_THREAD_SPLIT_STACK_OFFSET) && defined(OPTION_GLIBC_P)
-+  if (!OPTION_GLIBC_P (opts))
- #endif
-     {
-       if (report)
-diff --git a/gcc/common/config/s390/s390-common.c b/gcc/common/config/s390/s390-common.c
-index 8c1e590322d..11116f131cb 100644
--- a/gcc/common/config/s390/s390-common.c
-+++ b/gcc/common/config/s390/s390-common.c
-@@ -121,10 +121,12 @@ s390_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED,
- 
- static bool
- s390_supports_split_stack (bool report,
-			   struct gcc_options *opts)
-+			   struct gcc_options *opts ATTRIBUTE_UNUSED)
- {
-  if (opts->x_linux_libc == LIBC_GLIBC)
-+#ifdef OPTION_GLIBC_P
-+  if (OPTION_GLIBC_P (opts))
-     return true;
-+#endif
- 
-   if (report)
-     error ("%<-fsplit-stack%> currently only supported on GNU/Linux");
-diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
-index bde7fb0d292..812ec8ecb31 100644
--- a/gcc/config/alpha/linux.h
-+++ b/gcc/config/alpha/linux.h
-@@ -58,18 +58,23 @@ along with GCC; see the file COPYING3.  If not see
- #define WCHAR_TYPE "int"
- 
- #ifdef SINGLE_LIBC
-#define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
-#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
-#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	(DEFAULT_LIBC == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	(DEFAULT_LIBC == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	(DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	(DEFAULT_LIBC == LIBC_MUSL)
- #else
-#define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
-#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
-#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	((opts)->x_linux_libc == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	((opts)->x_linux_libc == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	((opts)->x_linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	((opts)->x_linux_libc == LIBC_MUSL)
- #endif
-+#define OPTION_GLIBC		OPTION_GLIBC_P (&global_options)
-+#define OPTION_UCLIBC		OPTION_UCLIBC_P (&global_options)
-+#define OPTION_BIONIC		OPTION_BIONIC_P (&global_options)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL		OPTION_MUSL_P (&global_options)
- 
- /* Determine what functions are present at the runtime;
-    this includes full c99 runtime and sincos.  */
-diff --git a/gcc/config/fuchsia.h b/gcc/config/fuchsia.h
-index 54602dc300d..47c0dfd8b81 100644
--- a/gcc/config/fuchsia.h
-+++ b/gcc/config/fuchsia.h
-@@ -52,6 +52,8 @@ along with GCC; see the file COPYING3.  If not see
- /* We are using MUSL as our libc.  */
- #undef  OPTION_MUSL
- #define OPTION_MUSL 1
-+#undef  OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts) 1
- 
- #ifndef TARGET_SUB_OS_CPP_BUILTINS
- #define TARGET_SUB_OS_CPP_BUILTINS()
-diff --git a/gcc/config/glibc-stdint.h b/gcc/config/glibc-stdint.h
-index c8d7ba18d1c..f095197514f 100644
--- a/gcc/config/glibc-stdint.h
-+++ b/gcc/config/glibc-stdint.h
-@@ -27,6 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #ifndef OPTION_MUSL
- #define OPTION_MUSL 0
- #endif
-+#ifndef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts) 0
-+#endif
- 
- #define SIG_ATOMIC_TYPE "int"
- 
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index 7fcf402b416..ab62a1741f7 100644
--- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -29,18 +29,23 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- /* C libraries supported on Linux.  */
- #ifdef SINGLE_LIBC
-#define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
-#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
-#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	(DEFAULT_LIBC == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	(DEFAULT_LIBC == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	(DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	(DEFAULT_LIBC == LIBC_MUSL)
- #else
-#define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
-#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
-#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	((opts)->x_linux_libc == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	((opts)->x_linux_libc == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	((opts)->x_linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	((opts)->x_linux_libc == LIBC_MUSL)
- #endif
-+#define OPTION_GLIBC		OPTION_GLIBC_P (&global_options)
-+#define OPTION_UCLIBC		OPTION_UCLIBC_P (&global_options)
-+#define OPTION_BIONIC		OPTION_BIONIC_P (&global_options)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL		OPTION_MUSL_P (&global_options)
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-     do {							\
-diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
-index 47c9d9ac0b6..be04462d357 100644
--- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -27,18 +27,23 @@
- #define NO_PROFILE_COUNTERS 1
- 
- #ifdef SINGLE_LIBC
-#define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
-#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
-#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	(DEFAULT_LIBC == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	(DEFAULT_LIBC == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	(DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	(DEFAULT_LIBC == LIBC_MUSL)
- #else
-#define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
-#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
-#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	((opts)->x_linux_libc == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	((opts)->x_linux_libc == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	((opts)->x_linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	((opts)->x_linux_libc == LIBC_MUSL)
- #endif
-+#define OPTION_GLIBC		OPTION_GLIBC_P (&global_options)
-+#define OPTION_UCLIBC		OPTION_UCLIBC_P (&global_options)
-+#define OPTION_BIONIC		OPTION_BIONIC_P (&global_options)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL		OPTION_MUSL_P (&global_options)
- 
- /* Determine what functions are present at the runtime;
-    this includes full c99 runtime and sincos.  */
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 43499ed29cf..1d73a09a476 100644
--- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -267,18 +267,23 @@ extern int dot_symbols;
- #define OS_MISSING_POWERPC64 !TARGET_64BIT
- 
- #ifdef SINGLE_LIBC
-#define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
-#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
-#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	(DEFAULT_LIBC == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	(DEFAULT_LIBC == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	(DEFAULT_LIBC == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	(DEFAULT_LIBC == LIBC_MUSL)
- #else
-#define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
-#define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
-#define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-#undef OPTION_MUSL
-#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
-+#define OPTION_GLIBC_P(opts)	((opts)->x_linux_libc == LIBC_GLIBC)
-+#define OPTION_UCLIBC_P(opts)	((opts)->x_linux_libc == LIBC_UCLIBC)
-+#define OPTION_BIONIC_P(opts)	((opts)->x_linux_libc == LIBC_BIONIC)
-+#undef OPTION_MUSL_P
-+#define OPTION_MUSL_P(opts)	((opts)->x_linux_libc == LIBC_MUSL)
- #endif
-+#define OPTION_GLIBC		OPTION_GLIBC_P (&global_options)
-+#define OPTION_UCLIBC		OPTION_UCLIBC_P (&global_options)
-+#define OPTION_BIONIC		OPTION_BIONIC_P (&global_options)
-+#undef OPTION_MUSL
-+#define OPTION_MUSL		OPTION_MUSL_P (&global_options)
- 
- /* Determine what functions are present at the runtime;
-    this includes full c99 runtime and sincos.  */
-- 
-2.35.1
-
@@ -1,75 +0,0 @@
-From 400bae077d11c3a2ee9f4c8b96c31bbf39416a4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren@soeren-tempel.net>
-Date: Mon, 21 Feb 2022 04:13:47 +0100
-Subject: [PATCH] x86: Fix -fsplit-stack feature detection via
- TARGET_CAN_SPLIT_STACK
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit c163647ffbc9a20c8feb6e079dbecccfe016c82e -fsplit-stack
-is only supported on glibc targets. However, this original commit
-required some fixups. As part of the fixup, the changes to the
-gnu-user-common.h and gnu.h where partially reverted in commit
-60953a23d57b13a672f751bec0c6eefc059eb1ab thus causing TARGET_CAN_SPLIT_STACK
-to be defined for non-glibc targets even though -fsplit-stack is
-actually not supported and attempting to use it causes a runtime error.
-
-This causes gcc internal code, such as ./gcc/go/gospec.c to not
-correctly detect that -fsplit-stack is not supported and thus causes
-gccgo to fail compilation on non-glibc targets.
-
-This commit ensures that TARGET_CAN_SPLIT_STACK is set based on the
-changes performed in 2c31a8be4a5db11a0a0e97c366dded6362421086, i.e.
-the new OPTION_GLIBC_P macro is now used to detect if -fsplit-stack is
-supported in the x86 header files.
-
-The proposed changes have been tested on x86_64 Alpine Linux (which uses
-musl libc) and fix compilation of gccgo for this target.
-
-Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
-
-gcc/ChangeLog:
-
-	* config/i386/gnu-user-common.h (defined): Only define
-        TARGET_CAN_SPLIT_STACK for glibc targets.
-	* config/i386/gnu.h (defined): Ditto.
---
- gcc/config/i386/gnu-user-common.h | 5 +++--
- gcc/config/i386/gnu.h             | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/gnu-user-common.h b/gcc/config/i386/gnu-user-common.h
-index 00226f5a455..4e3fbb1de05 100644
--- a/gcc/config/i386/gnu-user-common.h
-+++ b/gcc/config/i386/gnu-user-common.h
-@@ -66,7 +66,8 @@ along with GCC; see the file COPYING3.  If not see
- #define STACK_CHECK_STATIC_BUILTIN 1
- 
- /* We only build the -fsplit-stack support in libgcc if the
-   assembler has full support for the CFI directives.  */
-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
-+   assembler has full support for the CFI directives.  Also
-+   we only support -fsplit-stack on glibc targets.  */
-+#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && defined(OPTION_GLIBC_P)
- #define TARGET_CAN_SPLIT_STACK
- #endif
-diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
-index 25fbc07f58c..41a6a37dfee 100644
--- a/gcc/config/i386/gnu.h
-+++ b/gcc/config/i386/gnu.h
-@@ -41,8 +41,9 @@ along with GCC.  If not, see <http://www.gnu.org/licenses/>.
- #define TARGET_THREAD_SSP_OFFSET        0x14
- 
- /* We only build the -fsplit-stack support in libgcc if the
-   assembler has full support for the CFI directives.  */
-#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
-+   assembler has full support for the CFI directives.  Also
-+   we only support -fsplit-stack on glibc targets.  */
-+#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE && defined(OPTION_GLIBC_P)
- #define TARGET_CAN_SPLIT_STACK
- #endif
- /* We steal the last transactional memory word.  */
-- 
-2.35.1
-
@@ -1,33 +0,0 @@
-From dba87d9796b61f4f3eea83c200a2d208564e2277 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Mon, 21 Feb 2022 10:04:47 +0000
-Subject: [PATCH] go/gospec: forcibly disable -fsplit-stack support
-
-for some reason, TARGET_CAN_SPLIT_STACK still gets defined on 32-bit x86,
-so hackfix it for now
---
- gcc/go/gospec.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/go/gospec.c b/gcc/go/gospec.c
-index cf8d0f2b60e..d5bfa57ea45 100644
--- a/gcc/go/gospec.c
-+++ b/gcc/go/gospec.c
-@@ -269,11 +269,12 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
-   /* Copy the 0th argument, i.e., the name of the program itself.  */
-   new_decoded_options[j++] = decoded_options[i++];
- 
-#ifdef TARGET_CAN_SPLIT_STACK
-+  /* Hackfix: we never support split stack on Alpine GCC */
-+#if 0
-   supports_split_stack = 1;
- #endif
- 
-#ifdef TARGET_CAN_SPLIT_STACK_64BIT
-+#if 0
-   if (is_m64)
-     supports_split_stack = 1;
- #endif
-- 
-2.35.1
-
@@ -1,772 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen gcc-armhf
-# Based on: main/gcc (from Alpine)
-
-CTARGET_ARCH=armhf
-CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-LANG_D=false
-LANG_OBJC=false
-LANG_JAVA=false
-LANG_GO=false
-LANG_FORTRAN=false
-LANG_ADA=false
-options="!strip !tracedeps"
-
-# abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
-# when this variable matches "no*"
-BOOTSTRAP="nobuildbase"
-
-# abuild will only cross compile when this variable is set, but it
-# needs to find a valid package database in there for dependency
-# resolving, so we set it to /.
-CBUILDROOT="/"
-
-_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
-
-pkgname=gcc-armhf
-_pkgbase=11.2.1
-pkgver=11.2.1_git20220219
-[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
-[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
-[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
-
-pkgname=gcc-armhf
-pkgrel=2
-pkgdesc="Stage2 cross-compiler for armhf"
-url="https://gcc.gnu.org"
-arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
-_gccrel=$pkgver-r$pkgrel
-depends="isl binutils-armhf mpc1"
-makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
-subpackages="g++-armhf:gpp"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
-replaces="libstdc++ binutils"
-
-: "${LANG_CXX:=true}"
-: "${LANG_D:=true}"
-: "${LANG_OBJC:=true}"
-: "${LANG_GO:=true}"
-: "${LANG_FORTRAN:=true}"
-: "${LANG_ADA:=true}"
-: "${LANG_JIT:=true}"
-
-_libgomp=true
-_libgcc=true
-_libatomic=true
-_libitm=true
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	if [ "$BOOTSTRAP" = nolibc ]; then
-		LANG_CXX=false
-		LANG_ADA=false
-		_libgcc=false
-		_builddir="$srcdir/build-cross-pass2"
-	else
-		_builddir="$srcdir/build-cross-final"
-	fi
-	LANG_OBJC=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-	LANG_D=false
-	LANG_JIT=false
-	_libgomp=false
-	_libatomic=false
-	_libitm=false
-
-	# reset target flags (should be set in crosscreate abuild)
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	STRIP_FOR_TARGET="$CTARGET-strip"
-elif [ "$CBUILD" != "$CHOST" ]; then
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-
-	# reset flags and cc for build
-	export CC_FOR_BUILD="gcc"
-	export CXX_FOR_BUILD="g++"
-	export CFLAGS_FOR_BUILD=" "
-	export CXXFLAGS_FOR_BUILD=" "
-	export LDFLAGS_FOR_BUILD=" "
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	# Languages that do not need bootstrapping
-	LANG_OBJC=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-	LANG_D=false
-	LANG_JIT=false
-
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build-cross-native"
-else
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build"
-fi
-
-# GDC hasn't been ported to PowerPC
-# See libphobos/configure.tgt in GCC sources for supported targets
-# riscv fails with: error: static assert  "unimplemented"
-case "$CARCH" in
-ppc64le|riscv64)	LANG_D=false ;;
-esac
-
-# libitm has TEXTRELs in ARM build, so disable for now
-case "$CTARGET_ARCH" in
-arm*)		_libitm=false ;;
-mips*)		_libitm=false ;;
-riscv64)	_libitm=false ;;
-esac
-
-# Internal libffi fails to build on MIPS at the moment, need to
-# investigate further.  We disable LANG_GO on mips64 as it requires
-# the internal libffi.
-case "$CTARGET_ARCH" in
-mips*)		LANG_GO=false ;;
-esac
-
-# Fortran uses libquadmath if toolchain has __float128
-# currently on x86, x86_64 and ia64
-_libquadmath=$LANG_FORTRAN
-case "$CTARGET_ARCH" in
-x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
-*)		_libquadmath=false ;;
-esac
-
-# libatomic is a dependency for openvswitch
-$_libatomic && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$_libgcc && subpackages="$subpackages libgcc::$CTARGET_ARCH"
-$_libquadmath && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
-if $_libgomp; then
-	depends="$depends libgomp=$_gccrel"
-	subpackages="$subpackages libgomp::$CTARGET_ARCH"
-fi
-
-case "$CARCH" in
-riscv64)
-LANG_ADA=false;;
-esac
-
-_languages=c
-if $LANG_CXX; then
-	_languages="$_languages,c++"
-fi
-if $LANG_D; then
-	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
-	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
-fi
-if $LANG_OBJC; then
-	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
-	_languages="$_languages,objc"
-fi
-if $LANG_GO; then
-	subpackages="$subpackages libgo::$CTARGET_ARCH gcc-go$_target:go"
-	_languages="$_languages,go"
-fi
-if $LANG_FORTRAN; then
-	subpackages="$subpackages libgfortran::$CTARGET_ARCH gfortran$_target:gfortran"
-	_languages="$_languages,fortran"
-fi
-if $LANG_ADA; then
-	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
-	_languages="$_languages,ada"
-	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-fi
-if $LANG_JIT; then
-	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
-	_languages="$_languages,jit"
-fi
-makedepends="$makedepends_build $makedepends_host"
-
-# when using upstream releases, use this URI template
-# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
-#
-# right now, we are using a git snapshot.
-#
-# PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
-# so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
-	0001-posix_memalign.patch
-	0002-gcc-poison-system-directories.patch
-	0003-specs-turn-on-Wl-z-now-by-default.patch
-	0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-	0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-	0006-Enable-Wformat-and-Wformat-security-by-default.patch
-	0007-Enable-Wtrampolines-by-default.patch
-	0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-	0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-	0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-	0011-libiberty-copy-PIC-objects-during-build-process.patch
-	0012-libitm-disable-FORTIFY.patch
-	0013-libgcc_s.patch
-	0014-nopie.patch
-	0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-	0016-dlang-update-zlib-binding.patch
-	0017-dlang-use-libucontext-on-mips64.patch
-	0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
-	0019-ada-fix-shared-linking.patch
-	0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0021-add-fortify-headers-paths.patch
-	0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0024-mips64-disable-multilib-support.patch
-	0025-aarch64-disable-multilib-support.patch
-	0026-s390x-disable-multilib-support.patch
-	0027-ppc64-le-disable-multilib-support.patch
-	0028-x86_64-disable-multilib-support.patch
-	0029-riscv-disable-multilib-support.patch
-	0030-always-build-libgcc_eh.a.patch
-	0031-ada-libgnarl-compatibility-for-musl.patch
-	0032-ada-musl-support-fixes.patch
-	0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-	0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-	0035-gcc-go-signal-34-is-special-on-musl-libc.patch
-	0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-	0037-gcc-go-link-to-libucontext.patch
-	0038-Use-generic-errstr.go-implementation-on-musl.patch
-	0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-	0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
-	0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
-	0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-	0045-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
-	0046-Disable-fsplit-stack-support-on-non-glibc-targets.patch
-	0047-x86-Properly-disable-fsplit-stack-support-on-non-gli.patch
-	0048-gdc-unconditionally-link-libgphobos-against-libucont.patch
-	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
-	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
-	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
-	"
-
-# we build out-of-tree
-_gccdir="$srcdir"/gcc-$pkgver
-_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
-
-prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
-}
-
-build() {
-	local _arch_configure=
-	local _libc_configure=
-	local _bootstrap_configure=
-	local _symvers=
-	local _jit_configure=
-
-	cd "$_gccdir"
-
-	case "$CTARGET" in
-	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
-	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
-	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";;
-	armv7-*-*-*eabihf)	_arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";;
-	mips-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-float=soft --with-abi=32";;
-	mips64-*-*-*)		_arch_configure="--with-arch=mips3 --with-tune=mips64 --with-mips-plt --with-float=soft --with-abi=64";;
-	mips64el-*-*-*)		_arch_configure="--with-arch=mips3 --with-tune=mips64 --with-mips-plt --with-float=soft --with-abi=64";;
-	mipsel-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-float=soft --with-abi=32";;
-	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
-	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no --enable-targets=powerpcle-linux";;
-	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
-	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
-	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
-	esac
-
-	case "$CTARGET_ARCH" in
-	mips*)	_hash_style_configure="--with-linker-hash-style=sysv" ;;
-	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
-	esac
-
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support mudflap, or libsanitizer
-		# libmpx uses secure_getenv and struct _libc_fpstate not present in musl
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libmpx --disable-libmudflap --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
-
-
-	case "$BOOTSTRAP" in
-	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
-	esac
-
-	$LANG_JIT && _jit_configure="--enable-host-shared"
-
-	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
-	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
-	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$_libquadmath	|| _arch_configure="$_arch_configure --disable-libquadmath"
-
-	msg "Building the following:"
-	echo ""
-	echo "  CBUILD=$CBUILD"
-	echo "  CHOST=$CHOST"
-	echo "  CTARGET=$CTARGET"
-	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
-	echo "  languages=$_languages"
-	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
-	echo "  cross_configure=$_cross_configure"
-	echo "  bootstrap_configure=$_bootstrap_configure"
-	echo "	hash_style_configure=$_hash_style_configure"
-	echo ""
-
-	export CFLAGS="$CFLAGS -O2"
-
-	mkdir -p "$_builddir"
-	cd "$_builddir"
-	"$_gccdir"/configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--with-pkgversion="Alpine $pkgver" \
-		--enable-checking=release \
-		--disable-fixed-point \
-		--disable-libstdcxx-pch \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		$_symvers \
-		--enable-__cxa_atexit \
-		--enable-default-pie \
-		--enable-default-ssp \
-		--enable-cloog-backend \
-		--enable-languages=$_languages \
-		$_arch_configure \
-		$_libc_configure \
-		$_cross_configure \
-		$_bootstrap_configure \
-		$_jit_configure \
-		--with-system-zlib \
-		$_hash_style_configure
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	ln -s gcc "$pkgdir"/usr/bin/cc
-
-	# we dont support gcj -static
-	# and saving 35MB is not bad.
-	find "$pkgdir" \( -name libgtkpeer.a \
-		-o -name libgjsmalsa.a \
-		-o -name libgij.a \) \
-		-delete
-
-	# strip debug info from some static libs
-	find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
-		-o -name libgphobos.a -o -name libgdruntime.a \
-		-o -name libmudflap.a -o -name libmudflapth.a \
-		-o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \
-		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
-		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
-		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
-
-	if $_libgomp; then
-		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
-	fi
-	if $_libitm; then
-		mv "$pkgdir"/usr/lib/libitm.spec "$pkgdir"/$_gcclibdir
-	fi
-
-	# remove ffi
-	rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi*
-	find "$pkgdir" -name 'ffi*.h' -delete
-
-	local gdblib=${_target:+$CTARGET/}lib
-	if [ -d "$pkgdir"/usr/$gdblib/ ]; then
-		for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py"); do
-			mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib
-			mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
-		done
-	fi
-
-	# move ada runtime libs
-	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
-	fi
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# cross-gcc: remove any files that would conflict with the
-		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "${pkgdir:?}"/usr/share
-		# libcc1 does not depend on target, don't ship it
-		rm -rf "$pkgdir"/usr/lib/libcc1.so*
-
-		# fixup gcc library symlinks to be linker scripts so
-		# linker finds the libs from relocated sysroot
-		for so in "$pkgdir"/usr/"$CTARGET"/lib/*.so; do
-			if [ -h "$so" ]; then
-				local _real=$(basename "$(readlink "$so")")
-				rm -f "$so"
-				echo "GROUP ($_real)" > "$so"
-			fi
-		done
-	else
-		# add c89/c99 wrapper scripts
-		cat >"$pkgdir"/usr/bin/c89 <<'EOF'
-#!/bin/sh
-_flavor="-std=c89"
-for opt; do
-	case "$opt" in
-	-ansi|-std=c89|-std=iso9899:1990) _flavor="";;
-	-std=*) echo "$(basename $0) called with non ANSI/ISO C option $opt" >&2
-		exit 1;;
-	esac
-done
-exec gcc $_flavor ${1+"$@"}
-EOF
-		cat >"$pkgdir"/usr/bin/c99 <<'EOF'
-#!/bin/sh
-_flavor="-std=c99"
-for opt; do
-	case "$opt" in
-	-std=c99|-std=iso9899:1999) _flavor="";;
-	-std=*) echo "$(basename $0) called with non ISO C99 option $opt" >&2
-		exit 1;;
-	esac
-done
-exec gcc $_flavor ${1+"$@"}
-EOF
-		chmod 755 "$pkgdir"/usr/bin/c?9
-
-		# install lto plugin so regular binutils may use it
-		mkdir -p "$pkgdir"/usr/lib/bfd-plugins
-		ln -s /$_gcclibexec/liblto_plugin.so "$pkgdir/usr/lib/bfd-plugins/"
-	fi
-}
-
-libatomic() {
-	pkgdesc="GCC Atomic library"
-	depends=
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
-}
-
-libcxx() {
-	pkgdesc="GNU C++ standard runtime library"
-	depends=
-
-	if [ "$CHOST" = "$CTARGET" ]; then
-		# verify that we are using clock_gettime rather than doing direct syscalls
-		# so we dont break 32 bit arches due to time64.
-		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
-	fi
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
-}
-
-gpp() {
-	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel gcc=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
-
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_target:+$CTARGET/}lib/
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_target:+$CTARGET/}include/
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
-}
-
-jit() {
-	pkgdesc="GCC JIT Library"
-	depends=
-	amove usr/lib/libgccjit.so*
-}
-
-jitdev() {
-	pkgdesc="GCC JIT Library (development files)"
-	depends="libgccjit"
-	amove usr/include/libgccjit*.h
-}
-
-libobjc() {
-	pkgdesc="GNU Objective-C runtime"
-	replaces="objc"
-	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
-}
-
-objc() {
-	pkgdesc="GNU Objective-C"
-	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
-
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
-}
-
-libgcc() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
-}
-
-libgomp() {
-	pkgdesc="GCC shared-memory parallel programming API library"
-	depends=
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
-}
-
-libgphobos() {
-	pkgdesc="D programming language standard library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgdruntime.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so.*  "$subpkgdir"/usr/lib/
-}
-
-gdc() {
-	pkgdesc="GCC-based D language compiler"
-	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
-	depends="$depends libucontext-dev"
-
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/$_gcclibdir/include/d/ \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	# Copy: The installed '.d' files, the static lib, the binary itself
-	# The shared libs are part of 'libgphobos' so one can run program
-	# without installing the compiler
-	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
-	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
-	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
-}
-
-
-libgo() {
-	pkgdesc="Go runtime library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
-}
-
-go() {
-	pkgdesc="Go support for GCC"
-	depends="gcc=$_gccrel libgo=$_gccrel !go"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$subpkgdir"/usr/lib/
-}
-
-libgfortran() {
-	pkgdesc="Fortran runtime library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
-}
-
-libquadmath() {
-	replaces="gcc"
-	pkgdesc="128-bit math library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
-}
-
-gfortran() {
-	pkgdesc="GNU Fortran Compiler"
-	depends="gcc=$_gccrel libgfortran=$_gccrel"
-	$_libquadmath && depends="$depends libquadmath=$_gccrel"
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
-	if $_libquadmath; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
-	fi
-	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
-}
-
-libgnat() {
-	pkgdesc="GNU Ada runtime shared libraries"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
-}
-
-libgnatstatic() {
-	pkgdesc="GNU Ada static libraries"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
-}
-
-gnat() {
-	pkgdesc="Ada support for GCC"
-	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
-}
-
-sha512sums="
-94d4d2e31f5a84455055d34cfbbcc63d5bd63e60345c2a4e30aa404724e65e5d14868ef50b7fcf5537dd12dc6f1381a27cede269801050e193b4bdb8f2919971  gcc-11.2.1_git20220219.tar.xz
-d46a87edb919697a37c15af99c9142c6ad8ec364fe9b5747f5808368e619766163d3d8b64e987b1155785ddc91b5b191b795857cd70118d64f978e46b476bfff  0001-posix_memalign.patch
-59fa772417c1d1baf8bd8477ef4e30975fbd616d949fbd72fa88cc72d9662f2e28214305a188d75e30c54a95be111c7998784f7d1499562490acbe194a3c2116  0002-gcc-poison-system-directories.patch
-556240f9888c24706694560ad3ba1a90d3ed6da1dd3d7eebb603f4e3551d5743908840d4b1f598d6d5dc3cc52bcfafbcd777282ec8864051c3c8aba623866d3e  0003-specs-turn-on-Wl-z-now-by-default.patch
-747a2ba2c0227471dd8a327bddd4699aa6aad5ddce2e523816e43e04fd5a4d8c2f1a69f02980632263ab1c23334d01e27d5df737a0ba9f6bd16b9c85112de82a  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-0fe2b802ce0b9c986d7ea5378df49899b028baad419ccd4071fd1a2dad90736e0f04eef29056f6c74c1fa2482359629b5e3747d58fcbf3520c6ed10c66c7b87e  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-7d37f31108cddfeb25ebf7e462d999873dc184bb26f74c9d7d6d32534a15070291661ab58be41ccedb44af20de0568e704b4152668c6bd803cf88f1ddfb6e35c  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-698893670d00df1ddbaa7dd970b17049f94d0cc2fec3225925bbad606e44c29288e38a7afa4b4cae3c9c26be35646c52e9eadc67022b89d7b4ce97ce64a5a2ac  0007-Enable-Wtrampolines-by-default.patch
-b549d45824d6b9f2ec830ed66ba192ebfe9d9c3db554bf0b51379e9b624de0f0a1a315520487a1a3bfbe9d65d41c41239b9461bc9f1b5059c51d5f4dc7581872  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-15089ea9465057f6897d5c570e79abd068b85f9fc77490668872397699025905aa065eaf7318ddb0847747da4397676242064f290b45e16f616bab86258be260  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-cc9aa31e3b4227f7887d9be470bb19cb3ccd8125155741721921b4c8f791710fabc279b492232454fda0a47bf98509bd2fd4bcdbf5a5aad8b8f476bc5aa74d07  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-c2c74411717e5bf6e261bde4d5c50b12645de2d556b3eb898600e7629772f7d9d213e32f5a0b81d8ee2ba2e4bc55ea64ee60119d9d9a03045574016d94b76f61  0011-libiberty-copy-PIC-objects-during-build-process.patch
-d92fe356d745fbc858cbb338b0027b814a2f7812fc7bb6147d641e7319d4ff09ac4ade766b419566e70e6250847ec56e95fd74617a82069dc93f669d827dd48e  0012-libitm-disable-FORTIFY.patch
-2e5c0845581c92573fc2e60f7771d9f99e23fd32bf4da7c09bc1738f69174f8becfe9f0c9ee96fbc87b3264dcf2d4b801d051606bd528b43e76cd1fb9ddf6b40  0013-libgcc_s.patch
-2a79fd03fe9b98cca3cdbed368969304f9ebcedb7701703740c30a1fe70bfdeceaddac4cbf796f60ee080f0d62a926da6c48042c563b081d9116691c4531a68c  0014-nopie.patch
-4a1d53c120047702ea51df3c611af3e4ae82b9cf63dc8244ac38042de44b24afe98578e70aa964884b22ef76ee65d1d703355defc613637acf52d580ce86f17c  0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch
-64065ec9243eb12424cb75822219376e7829f1e1d206d93c4b4cbe18eb4e538019361cc1b5b7d88da4d2d5c891d9e282d579902db534d09b7d58ec91bfada6b5  0016-dlang-update-zlib-binding.patch
-35ffecaa8ec56b64c73df93530d858632f0429de007d70869432c183610d344711a1552b1bb00f2180ae952c66a66e1c6285139a8818d656691a121cd7abdba7  0017-dlang-use-libucontext-on-mips64.patch
-f78fc1bc99669a90bd68051f9d17bfc25065e49c7d4e853cda293be3a9f17b08867de31e73b90a82b948005f5e17020ccf55dfa4a1b0b9b0cba707c0ed635a46  0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch
-463ce54bb32d9ba52ed7f0d7df99011f17543e80f6aca9a61b747e074662b283c563434b96a0bc8ae4636e154f1033c5720f3c8113bc6ad095592a1d5584981c  0019-ada-fix-shared-linking.patch
-194647e5a87fb7ebd7602eee9ffa5d3e713dc26baa5f8fa50ada513ca5d28898d1fcee5e9db0d3af6d5b774961426fc1e2f9b5155992ead9981412c627967219  0020-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-d707e47a10c866c0e6d085f9a2bfa1b21eff8e6a1b222840abbbe1b2f21cc4a50f4fa45f7dbbb1ad86dc2eb7c88160c715e69039d3de7f7784de7d5f2a87d6e4  0021-add-fortify-headers-paths.patch
-e746e250451eb76726a9de8f42de5eb1d23a228fd3d8961cd2a6c6f691a5418fcd32a817998e3a5aaf8d2d90cd03371aaf7912c9b834ed6c663c649f85f1d058  0022-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-c6d3a4b5d541b52f44641e59556c6312d785c4e12d47fac11a530ae0746170e891c0ed64ce6e9856e5581debfae0d5216753afaf87df1a2d40d50bdfa24ea7dc  0023-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-a29ad877662bbdbc6422456d32ed31aab3764edcc1eb3e1abe7be0f22d162da6d0f0d6565a25c7a43bf23151faba0492122ddcf832bdac57b3e47f89a6ab158d  0024-mips64-disable-multilib-support.patch
-18be870ec68865f4661ac73f9bf50765164711582b497beb852928e1d993bc257a0d2b015f435e93461c35edc1811505d31f3a46147bccb4764dcf9b8319c93a  0025-aarch64-disable-multilib-support.patch
-b2b830626396936be105361e87c82490b5cd3d26ce7b8dbccf156d53eb5d0db82a28167656aaa5e47b6a1315263abf070432db693c5ae10da892217ce2728728  0026-s390x-disable-multilib-support.patch
-094ed675ff5512829bbf7f2bd2632498300b7f15cec6b4a397b145f378a41c17c99f05ea0b94ed1408773a3e8b1fd713ba302c64dba00269df270d401b0e6443  0027-ppc64-le-disable-multilib-support.patch
-ee67238c66132f30fd00cc084d37012a927abe32ac48b4617779f22069d86384826c063b79626ab64f6adefdac0f00fcd5c18b95c8a2f11fb2cbee67babc9beb  0028-x86_64-disable-multilib-support.patch
-2ddf60a03db15c9c3e847001e300a54dfd9b5435da630e18379313e516fccbb8ea5e26571bb4f88baa6756cdb5c8ba7d059249c46a2f56e67bfca368750431eb  0029-riscv-disable-multilib-support.patch
-e7f9088809a4a4b87a6a5670227fb31766fb124ecdcea9936b00a7b98fdc06d7e7f27b6f67a575c434ba978623cb5f1183691dd63d6db98b180c4e08d62e5c5e  0030-always-build-libgcc_eh.a.patch
-653b2dbdf43ad336e75aa33ee3e520edd4c8cdb486bf8f5a30dbd8496b96451aa508e12e6a81dd16d36119f22fb9b0c46bcc39d731c89443c435fa4d1ca6fa08  0031-ada-libgnarl-compatibility-for-musl.patch
-9d46489087018366eea3b6537f6a86b0e183c7d49f8fecc2f50fbbcebf78727f5a1661ee6a50b5bddef0d54ebe47668ad61440784495194420b0896d5bd3f1aa  0032-ada-musl-support-fixes.patch
-63a2f9a81f94826dfac05073d6b7cb599c5b1d026c460edfd329f770c72208e369af1e427904528351aa78bce6e9445af9c59ca73ef5302f7362027757fa5d46  0033-gcc-go-Fix-handling-of-signal-34-on-musl.patch
-8d3a01d7e5e983eaabdf5c4a7e58ef33c55a794ed4cb5d438b41218ded367d3214b868a5c8d68f52ef74b0f83abb95d29b36ef8d0c7be68f7d1537a04e65d5c1  0034-There-are-more-than-one-st_-a-m-c-tim-fields-in-stru.patch
-56c7c1911fef05beaecfa1b41703d46d18c5e967430c79c719f8685f4c4971bb177f2de35b0a1631d5d3ed7292cb54c618e52fa859f483fafb5445511e5b226b  0035-gcc-go-signal-34-is-special-on-musl-libc.patch
-07921d5c30f3a23ba1c0540e106abe49e1675f183ffe2b326bdab80c59847b9ed5f39efd2836bc47d4ac1b3a3152f8de092c498ba91682e51c20548a65c0f105  0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
-ef8df8a047b4145f30884b052345e4e390fc1efb35a9c7da63899aa115c19b8cc04513a57b2340a6a58ed02dc6881b10f684da653734afe5acf69761e3d064e7  0037-gcc-go-link-to-libucontext.patch
-cf000459b493815bb0c9bccbbccc61ab8101f067b5b45d0f30cf49bf0ec6745f6ae360e4b5dccdb5c9bef1974835830efbb349c2ab38d1ee4dcc22385546873b  0038-Use-generic-errstr.go-implementation-on-musl.patch
-0baffb0d19c26a387d38525c87b3500c4486bf11aeb9d98cec559eb67db4b71d5bc580fa6aebb9a12295422edb53aea77101e521e91f5189c744749448b89b4a  0039-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-d80074e1fa09cf6f7047a4dac7acadcfb53fcc93667af3348c61b22390999d618f2b16107c30a0fc52b145e27f14d6fddbe43ea36e6a9089741cb3b0b64fd856  0040-configure-fix-detection-of-atomic-builtins-in-libato.patch
-04434b605d71b6d4e9dedd03a810f250725d31fc70a5ad28d69499a04436caf6b0ec69f5c7223cb511063cc18c350ffdd95b722de97467f827789006ebcb2c73  0041-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-a3dc43ba56f12f4243c186572b32809d47a9d29c7a40edcf7f6da34c7add65a271c77635a5b9ae325d167e24a2e6bbe883c63eccec3af5d6f925cb304f8ba92b  0042-Fix-attempt-to-use-poisoned-calloc-error-in-libgccji.patch
-04ebbf2143a2d4b6c6d768c3aeea2899e6261adf414e16faed1247bc94eeaf61e54f88a2ba7ffdca90e9c0ee87c6fd7e3746481d184c539b8e0130a14b215fa7  0043-stddef.h-add-support-for-musl-typedef-macro-guards.patch
-e47183b5a565bdc64a497e14124d767a3e889e9f9d77a92567b0047b285c5ca49897b46ba681e339a8982611b70583ae87a3472dae33f07becaeceb21b3cfe74  0044-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
-a5adab61de2d4b2c3ccb1a55c70384a8496c447f7727a6680fa29263c4f57599a3dfb85e1e322859797f86605491af0f68f9dd1141ab4bbbe8b5183f67f3b32e  0045-libgo-include-asm-ptrace.h-for-pt_regs-definition-on.patch
-9c0e461eeba709110ca88d60236190c9b71d57d4e13786e2f15521a902e37dacc08d466966764abce9bc84e27d06e2e8523a1a80325f8a16d6ec16d2bf89fa05  0046-Disable-fsplit-stack-support-on-non-glibc-targets.patch
-f62778ab53125a9ba5a8088e064c2182c014bc264a46fd3d28d1ee0142dd02a7ed2c684dc63e9768a56a6f8f65621bea20026cd6b65053c2ff9ee51568ee260d  0047-x86-Properly-disable-fsplit-stack-support-on-non-gli.patch
-c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef4f2327b5e5ca61ce00e92d415e0ed033e54bdffde345e6a9  0048-gdc-unconditionally-link-libgphobos-against-libucont.patch
-160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
-f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
-8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
-"
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -0,0 +1,17 @@
+Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
+
+The error was:
+
+.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
+
+--- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
+++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
+@@ -440,7 +440,7 @@
+ 
+   while (memory_address_p (QImode, tem))
+     {
+-      spill_indirect_levels++;
+      spill_indirect_levels = 1;
+       tem = gen_rtx_MEM (Pmode, tem);
+     }
+ 
@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-aarch64
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,6 +215,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
+
+	1001-fix-reload1-compile-error.patch
 	"

 # we build out-of-tree
@@ -432,7 +434,8 @@ package() {
 	done
 }

-sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="
+35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -480,4 +483,6 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
+6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
+"
@@ -1,156 +0,0 @@
-2013-12-30  Magnus Granberg <zorry@gentoo.org>
-
-	* gcc/configure.ac		Add --enable-esp and define ENABLE_ESP.
-	Check if we support crtbeginP and define ENABLE_CRTBEGINP.
-	* gcc/configure	Regenerated
-
-
--- a/gcc/configure.ac	2011-11-18 11:52:32.000000000 +0100
-+++ b/gcc/configure.ac	2012-10-02 17:39:15.649526241 +0200
-@@ -5130,6 +5237,55 @@ if test x"${LINKER_HASH_STYLE}" != x; th
-                                          [The linker hash style])
- fi
- 
-+# --------------
-+# Esp checks
-+# --------------
-+
-+# Check whether --enable-esp was given and target have the support.
-+AC_ARG_ENABLE([esp],
-+[AS_HELP_STRING([--enable-esp],
-+               [Enable Stack protector and Position independent executable as
-+                default if we have suppot for it when compiling
-+                and link with -z now as default.
-+                Linux targets supported i*86, x86_64, x32,
-+                powerpc, powerpc64, ia64, arm and mips.])],
-+  enable_esp=$enableval,
-+  enable_esp=no)
-+if test $enable_esp = yes ; then
-+  AC_MSG_CHECKING(if $target support esp)
-+  case "$target" in
-+    i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips-*-linux* | arm*-*-linux* | ia64-*-linux*)
-+      enable_esp=yes
-+      AC_DEFINE(ENABLE_ESP, 1,
-+        [Define if your target support esp and you have enable it.])
-+      ;;
-+    *)
-+      enable_esp=no
-+      ;;
-+  esac
-+AC_MSG_RESULT($enable_esp)
-+fi
-+AC_SUBST([enable_esp])
-+if test $enable_esp = yes ; then
-+  AC_MSG_CHECKING(checking for crtbeginP.o support)
-+    if test x$enable_esp = xyes ; then
-+      case "$target" in
-+        ia64*-*-linux*)
-+          enable_crtbeginP=no ;;
-+        *-*-linux*)
-+          if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
-+            enable_crtbeginP=yes
-+            AC_DEFINE(ENABLE_CRTBEGINP, 1,
-+              [Define if your compiler will support crtbeginP.])
-+          fi
-+          ;;
-+        *) enable_crtbeginP=no ;;
-+      esac
-+    fi
-+  AC_MSG_RESULT($enable_crtbeginP)
-+fi
-+AC_SUBST([enable_crtbeginP])
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
- 
--- a/gcc/configure	2013-02-01 21:26:24.000000000 +0100
-+++ b/gcc/configure	2013-02-12 01:59:20.000000000 +0100
-@@ -600,6 +600,8 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- PICFLAG
-+enable_crtbeginP
-+enable_esp
- enable_host_shared
- enable_plugin
- pluginlibs
-@@ -920,6 +922,7 @@
- enable_plugin
- enable_libquadmath_support
- with_linker_hash_style
-+enable_esp
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1633,6 +1636,11 @@
-   --enable-plugin         enable plugin support
-   --disable-libquadmath-support
-                           disable libquadmath support for Fortran
-+  --enable-esp            Enable Stack protector and Position independent
-+                          executable as default if we have suppot for it when
-+                          compiling and link with -z now as default.
-+                          Linux targets supported i*86, x86_64, x32,
-+                          powerpc, powerpc64, ia64, arm and mips.
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -27419,6 +27427,59 @@
- 
- fi
- 
-+# --------------
-+# Esp checks
-+# --------------
-+
-+# Check whether --enable-esp was given and target have the support.
-+# Check whether --enable-esp was given.
-+if test "${enable_esp+set}" = set; then :
-+  enableval=$enable_esp; enable_esp=$enableval
-+else
-+  enable_esp=no
-+fi
-+
-+if test $enable_esp = yes ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $target support esp" >&5
-+$as_echo_n "checking if $target support esp... " >&6; }
-+  case "$target" in
-+    i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips*-*-linux* | arm*-*-linux* | ia64-*-linux*)
-+      enable_esp=yes
-+
-+$as_echo "#define ENABLE_ESP 1" >>confdefs.h
-+
-+      ;;
-+    *)
-+      enable_esp=no
-+      ;;
-+  esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_esp" >&5
-+$as_echo "$enable_esp" >&6; }
-+fi
-+
-+if test $enable_esp = yes ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for crtbeginP.o support" >&5
-+$as_echo_n "checking checking for crtbeginP.o support... " >&6; }
-+    if test x$enable_esp = xyes ; then
-+      case "$target" in
-+        ia64*-*-linux*)
-+          enable_crtbeginP=no ;;
-+        *-*-linux*)
-+          if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then
-+            enable_crtbeginP=yes
-+
-+$as_echo "#define ENABLE_CRTBEGINP 1" >>confdefs.h
-+
-+          fi
-+          ;;
-+        *) enable_crtbeginP=no ;;
-+      esac
-+    fi
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_crtbeginP" >&5
-+$as_echo "$enable_crtbeginP" >&6; }
-+fi
-+
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
- 
@@ -1,32 +0,0 @@
-2013-02-13	Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/config.in	Add ENABLE_CRTBEGINP, ENABLE_ESP
-
--- ./gcc/config.in	2009-04-21 11:08:08.000000000 +0200
-+++ ./gcc/config.in	2009-05-12 00:10:08.000000000 +0200
-@@ -46,6 +46,12 @@
- #endif
- 
- 
-+/* Define to 1 to enable crtbeginP.o. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_CRTBEGINP
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
-@@ -65,6 +65,12 @@
- #endif
- 
- 
-+/* Define to 1 to enable esp. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_ESP
-+#endif
-+
-+
- /* Define to 1 to enable fixed-point arithmetic extension to C. */
- #ifndef USED_FOR_TARGET
- #undef ENABLE_FIXED_POINT
@@ -1,96 +0,0 @@
-2012-01-17	Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/Makefile.in	Add -fno-PIE. to ALL_CFLAGS and
-			ALL_CXXFLAGS if enable_esp yes.
-			Echo enable_esp and enable_crtbeginP to tmp-libgcc.mvars.
-		* libgcc/Makefile.in	Add crtbeginP.o to EXTRA_PARTS if enable_crtbeginP yes
-			We add new file crtbeginP.o if enable_crtbeginP yes
-			Add -fno-PIE. to CRTSTUFF_CFLAGS.
-
--- a/gcc/Makefile.in	2011-11-09 02:20:14.000000000 +0100
-+++ b/gcc/Makefile.in	2011-12-24 22:28:08.864804375 +0100
-@@ -247,6 +247,14 @@ LINKER_FLAGS = $(CFLAGS)
- endif
- endif
- 
-+# We don't want to compile the compiler with -fPIE, it make PCH fail.
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOPIE_CFLAGS = -fno-PIE
-+else
-+ESP_NOPIE_CFLAGS=
-+endif
-+
- # -------------------------------------------
- # Programs which operate on the build machine
- # -------------------------------------------
-@@ -974,12 +982,13 @@ INTERNAL_CFLAGS = -DIN_GCC @CROSS@
- 
- # This is the variable actually used when we compile. If you change this,
- # you probably want to update BUILD_CFLAGS in configure.ac
-ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \
-+ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \
-   $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@
- 
- # The C++ version.
-ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) $(INTERNAL_CFLAGS) \
-  $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) $(WARN_CXXFLAGS) @DEFS@
-+ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) \
-+  $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) \
-+  $(WARN_CXXFLAGS) @DEFS@
- 
- # Likewise.  Put INCLUDES at the beginning: this way, if some autoconf macro
- # puts -I options in CPPFLAGS, our include files in the srcdir will always
-@@ -1814,6 +1823,8 @@ libgcc.mvars: config.status Makefile spe
- 	echo GCC_CFLAGS = '$(GCC_CFLAGS)' >> tmp-libgcc.mvars
- 	echo INHIBIT_LIBC_CFLAGS = '$(INHIBIT_LIBC_CFLAGS)' >> tmp-libgcc.mvars
- 	echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
-+	echo enable_esp = '$(enable_esp)' >> tmp-libgcc.mvars
-+	echo enable_crtbeginP = '@enable_crtbeginP@' >> tmp-libgcc.mvars
- 
- 	mv tmp-libgcc.mvars libgcc.mvars
- 
--- a/libgcc/Makefile.in	2011-11-22 04:01:02.000000000 +0100
-+++ b/libgcc/Makefile.in	2011-12-25 15:18:22.449610631 +0100
-@@ -219,6 +219,17 @@ else
- DECNUMINC =
- endif
- 
-+ifeq ($(enable_esp),yes)
-+ESP_NOPIE_CFLAGS = -fno-PIE
-+else
-+ESP_NOPIE_CFLAGS=
-+endif
-+
-+# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes
-+ifeq ($(enable_crtbeginP),yes)
-+EXTRA_PARTS += crtbeginP.o
-+endif
-+
- # Options to use when compiling libgcc2.a.
- #
- LIBGCC2_DEBUG_CFLAGS = -g
-@@ -279,7 +290,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF
- CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
-   -finhibit-size-directive -fno-inline -fno-exceptions \
-   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
-  -fno-stack-protector \
-+  -fno-stack-protector $(ESP_NOPIE_CFLAGS) \
-   $(INHIBIT_LIBC_CFLAGS)
- 
- # Extra flags to use when compiling crt{begin,end}.o.
-@@ -966,6 +977,13 @@ crtendS$(objext): $(srcdir)/crtstuff.c
- # This is a version of crtbegin for -static links.
- crtbeginT$(objext): $(srcdir)/crtstuff.c
- 	$(crt_compile) $(CRTSTUFF_T_CFLAGS) -c $< -DCRT_BEGIN -DCRTSTUFFT_O
-+
-+# This is a version of crtbegin for -static -fPIE links.
-+ifeq ($(enable_crtbeginP),yes)
-+crtbeginP$(objext): $(srcdir)/crtstuff.c
-+	$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
-+	  -c $< -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
-+endif
- 
- ifeq ($(enable_vtable_verify),yes)
- # These are used in vtable verification; see comments in source files for
- 
@@ -1,25 +0,0 @@
-2013-03-24	Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/gcc.c								include esp.h
-		static const char *cc1_spec 			We set that in esp.h if ENABLE_ESP.
-
--- ./gcc/gcc.c	2010-01-21 10:29:30.000000000 -0500
-+++ ./gcc/gcc.c	2010-01-29 23:29:16.000000000 -0500
-@@ -44,6 +44,7 @@
- #include "opts.h"
- #include "params.h"
- #include "vec.h"
-+#include "config/esp.h" /* for --enable-esp support */
- #include "filenames.h"
- 
- /* By default there is no special suffix for target executables.  */
-@@ -822,7 +823,9 @@
- 
- static const char *asm_debug;
- static const char *cpp_spec = CPP_SPEC;
-+#ifndef ENABLE_ESP
- static const char *cc1_spec = CC1_SPEC;
-+#endif
- static const char *cc1plus_spec = CC1PLUS_SPEC;
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
- static const char *link_ssp_spec = LINK_SSP_SPEC;
@@ -1,31 +0,0 @@
-Enable -D_FORTIFY_SOURCE=2 by default.
-
-Original patch from:
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/gcc/4.9.2/gentoo/10_all_default-fortify-source.patch
-
--- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -951,6 +951,9 @@ 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 w/optimization.  */
-+  cpp_define (pfile, "_FORTIFY_SOURCE=((defined __OPTIMIZE__ && __OPTIMIZE__ > 0) ? 2 : 0)");
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
--- a/gcc/doc/gcc.info
-+++ b/gcc/doc/gcc.info
-@@ -6255,6 +6255,11 @@ find out the exact set of optimizations that are enabled at each level.
-      Please note the warning under '-fgcse' about invoking '-O2' on
-      programs that use computed gotos.
- 
-+     NOTE: In Alpine Linux, `-D_FORTIFY_SOURCE=2' is set by default, and is
-+     activated when `-Os' or `-O1' or higher is used.  This enables additional
-+     compile-time and run-time checks for several libc functions.  To disable,
-+     specify either `-U_FORTIFY_SOURCE' or `-D_FORTIFY_SOURCE=0'.
-+
- '-O3'
-      Optimize yet more.  '-O3' turns on all optimizations specified by
-      '-O2' and also turns on the '-finline-functions',
@@ -1,24 +0,0 @@
-Enable -Wtrampolines by default.
-
--- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -640,7 +640,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
- 
- Wtype-limits
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -4007,6 +4007,8 @@ headers---for that, @option{-Wunknown-pragmas} must also be used.
-  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.
- 
-+ This warning is enabled by default in Gentoo.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
@@ -1,17 +0,0 @@
-libgfortran does not respect --disable-werror
-
-https://bugs.gentoo.org/433435
-http://gcc.gnu.org/PR54724
-
-
--- a/libgfortran/configure
-+++ b/libgfortran/configure
-@@ -5764,7 +5764,7 @@ fi
- 
- # Add -Wall -fno-repack-arrays -fno-underscoring if we are using GCC.
- if test "x$GCC" = "xyes"; then
-  AM_FCFLAGS="-I . -Wall -Werror -fimplicit-none -fno-repack-arrays -fno-underscoring"
-+  AM_FCFLAGS="-I . -Wall -fimplicit-none -fno-repack-arrays -fno-underscoring"
-   ## We like to use C99 routines when available.  This makes sure that
-   ## __STDC_VERSION__ is set such that libc includes make them available.
-   AM_CFLAGS="-std=gnu99 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -Wextra -Wwrite-strings"
@@ -1,16 +0,0 @@
-2012-01-24	Magnus Granberg	<zorry@gentoo.org>
-
-		* gcc/common.opt		Add -nopie
-
--- a/gcc/common.opt	2011-11-23 19:51:17.000000000 +0100
-+++ b//gcc/common.opt	2012-01-24 16:56:24.302224357 +0100
-@@ -2280,6 +2280,9 @@ Driver
- nodefaultlibs
- Driver
- 
-+nopie
-+Driver
-+
- nostartfiles
- Driver
- 
@@ -1,17 +0,0 @@
-libgomp does not respect --disable-werror
-
-https://bugs.gentoo.org/229059
-http://gcc.gnu.org/PR38436
-
-
--- a/libgomp/configure
-+++ b/libgomp/configure
-@@ -4282,7 +4282,7 @@ save_CFLAGS="$CFLAGS"
- 
- # Add -Wall -Werror if we are using GCC.
- if test "x$GCC" = "xyes"; then
-  XCFLAGS="$XCFLAGS -Wall -Werror"
-+  XCFLAGS="$XCFLAGS -Wall"
- fi
- 
- # Find other programs we need.
@@ -1,40 +0,0 @@
-2014-04-23		Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/config/gnu-user.h			If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o.
-		* gcc/config/rs6000/sysv4.h		If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o.
-
--- a/gcc/config/gnu-user.h	2014-01-02 23:23:26.000000000 +0100
-+++ b/gcc/config/gnu-user.h	2014-04-23 00:55:06.390265454 +0200
-@@ -40,7 +40,15 @@ see the files COPYING3 and COPYING.RUNTI
-    provides part of the support for getting C++ file-scope static
-    object constructed before entering `main'.  */
- 
-#if defined HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINP)
-+#define GNU_USER_TARGET_STARTFILE_SPEC \
-+  "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+   crti.o%s %{static:%{pie:crtbeginP.o%s;:crtbeginT.o%s}; \
-+   shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
-+   %{fvtable-verify=none:%s; \
-+     fvtable-verify=preinit:vtv_start_preinit.o%s; \
-+     fvtable-verify=std:vtv_start.o%s}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINP)
- #define GNU_USER_TARGET_STARTFILE_SPEC \
-   "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-    crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
--- a/gcc/config/rs6000/sysv4.h	2009-04-10 01:23:07.000000000 +0200
-+++ b/gcc/config/rs6000/sysv4.h	2009-09-08 04:41:50.000000000 +0200
-@@ -883,7 +883,12 @@
- %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
- %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
- 
-#ifdef HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINP)
-+#define STARTFILE_LINUX_SPEC "\
-+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+%{mnewlib:ecrti.o%s;:crti.o%s} \
-+%{static:%{pie:crtbeginP.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINP)
- #define	STARTFILE_LINUX_SPEC "\
- %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
@@ -1,44 +0,0 @@
-2014-04-24  Magnus Granberg  <zorry@gentoo.org>
-
-		* gcc/doc/invoke.texi	Add NOTES about -fstack-protector-all, -pie and
-		-fPIE/-fpie when --enable-esp is enable, this options is on by default.
-
--- a/gcc/doc/invoke.texi	2009-04-01 09:18:47.000000000 +0200
-+++ b/gcc/doc/invoke.texi	2009-06-18 14:08:38.000000000 +0200
-@@ -9233,6 +9245,11 @@ If a guard check fails, an error message
- @opindex fstack-protector-all
- Like @option{-fstack-protector} except that all functions are protected.
- 
-+NOTE: NOTE: When --enable-esp this option is enabled by default 
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}, 
-+@option{-nostdlib}, @option{-ffreestanding}, @option{-fstack-protector}, 
-+@option{-fstack-protector-strong}or @option{-fstack-protector-all}are found.
-+
- @item -fstack-protector-strong
- @opindex fstack-protector-strong
- Like @option{-fstack-protector} but includes additional functions to
-@@ -7960,6 +7965,12 @@
- that were used to generate code (@option{-fpie}, @option{-fPIE},
- or model suboptions) when you specify this option.
- 
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
-+are found.
-+
- @item -rdynamic
- @opindex rdynamic
- Pass the flag @option{-export-dynamic} to the ELF linker, on targets
-@@ -15889,6 +15910,11 @@
- @code{__pie__} and @code{__PIE__}.  The macros have the value 1
- for @option{-fpie} and 2 for @option{-fPIE}.
- 
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} are found.
-+
- @item -fno-jump-tables
- @opindex fno-jump-tables
- Do not use jump tables for switch statements even where it would be
@@ -1,56 +0,0 @@
-2013-03-24  Magnus Granberg <zorry@gentoo.org>
-
-	* gcc/config/i386/gnu-user-common.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC.
-	* gcc/config/i386/gnu-user.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS.
-	* gcc/config/i386/i386.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS.
-
--- a/gcc/config/i386/gnu-user-common.h	2013-01-10 21:38:27.000000000 +0100
-+++ b/gcc/config/i386/gnu-user-common.h	2013-02-14 00:51:44.689637605 +0100
-@@ -70,3 +70,7 @@ along with GCC; see the file COPYING3.
-
- /* Static stack checking is supported by means of probes.  */
- #define STACK_CHECK_STATIC_BUILTIN 1
-+
-+#ifdef ENABLE_ESP
-+#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC
-+#endif
--- a/gcc/config/i386/gnu-user.h	2011-05-05 14:32:50.000000000 +0200
-+++ b/gcc/config/i386/gnu-user.h	2012-07-09 14:28:38.726289455 +0200
-@@ -93,9 +93,16 @@ along with GCC; see the file COPYING3.
-   "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
- 
- #undef  SUBTARGET_EXTRA_SPECS
-+#ifdef ENABLE_ESP
- #define SUBTARGET_EXTRA_SPECS \
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-  { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
-+  { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }, \
-+  ESP_EXTRA_SPECS
-+#else
-+#define SUBTARGET_EXTRA_SPECS \
-+  { "link_emulation", GNU_USER_LINK_EMULATION },\
-+  { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
-+#endif
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
--- a/gcc/config/i386/i386.h	2011-11-24 23:11:12.000000000 +0100
-+++ b/gcc/config/i386/i386.h	2012-07-09 14:21:24.575276517 +0200
-@@ -617,13 +617,16 @@ enum target_cpu_default
-    Do not define this macro if it does not need to do anything.  */
- 
- #ifndef SUBTARGET_EXTRA_SPECS
-+#ifdef ENABLE_ESP
-+#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS
-+#else
- #define SUBTARGET_EXTRA_SPECS
- #endif
-+#endif
- 
- #define EXTRA_SPECS							\
-   { "cc1_cpu",  CC1_CPU_SPEC },						\
-   SUBTARGET_EXTRA_SPECS
-
- 
- /* Set the value of FLT_EVAL_METHOD in float.h.  When using only the
-    FPU, assume that the fpcw is set to extended precision; when using
@@ -1,35 +0,0 @@
-2013-06-03  Magnus Granberg  <zorry@gentoo.org>
-
-	* gcc/config/arm/arm.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC.
-	* gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS.
-
--- a/gcc/config/arm/arm.h	2013-01-15 17:17:28.000000000 +0100
-+++ b/gcc/config/arm/arm.h	2013-02-18 22:45:18.327284928 +0100
-@@ -2326,6 +2326,11 @@ extern const char *host_detect_local_cpu
- # define MCPU_MTUNE_NATIVE_SPECS ""
- #endif
- 
-#define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS
-
-+#ifdef ENABLE_ESP
-+# define DRIVER_SELF_SPECS \
-+  MCPU_MTUNE_NATIVE_SPECS, \
-+  ESP_DRIVER_SELF_SPEC
-+#else
-+# define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS
-+#endif
- #endif /* ! GCC_ARM_H */
--- a/gcc/config/arm/elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ b/gcc/config/arm/elf.h	2013-05-19 02:15:49.595855825 +0200
-@@ -49,7 +49,11 @@
- #endif
- 
- #undef SUBSUBTARGET_EXTRA_SPECS
-+#ifdef ENABLE_ESP
-+#define SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS
-+#else
- #define SUBSUBTARGET_EXTRA_SPECS
-+#endif
- 
- #ifndef ASM_SPEC
- #define ASM_SPEC "\
@@ -1,135 +0,0 @@
-2014-05-12  Magnus Granberg  <zorry@gentoo.org>
-
-	* gcc/esp.h	New file to support --enable-esp
-	Version 20140512.1
-
--- a/gcc/config/esp.h	2010-04-09 16:14:00.000000000 +0200
-+++ b/gcc/config/esp.h	2012-06-23 01:00:31.248348491 +0200
-@@ -0,0 +1,127 @@
-+/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20140512.1
-+ * Magnus Granberg (Zorry) <zorry@gentoo.org>  */
-+#ifndef GCC_ESP_H
-+#define GCC_ESP_H
-+
-+/*	This file will add -fstack-protector-all, -fstack-check, -fPIE, -pie and -z now 
-+	as default if the defines and the spec allow it.
-+	Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
-+	to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
-+	This will add some unsupported upstream commands options as -nopie and -nonow.
-+	-D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all and -fstack-check when building kernels.
-+	ESP_CC1_SPEC is added to CC1_SPEC.
-+	ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check.
-+	ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static.
-+	ENABLE_CRTBEGINP add support for crtbeginP.o, build -static with -fPIE or -fpie.
-+*/
-+#ifdef ENABLE_ESP
-+	
-+	/* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass  */
-+	#define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
-+	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: %{!fno-stack-check: }}}"
-+	#else
-+		#define ESP_CC1_SSP_SPEC ""
-+	#endif
-+	#if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_CC1_PIE_SPEC "%{!nopie: }"
-+	#else
-+		#define ESP_CC1_PIE_SPEC ""
-+	#endif
-+	#define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
-+
-+	/*	ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
-+		-z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
-+		Don't remove the specs in the end  */
-+	#define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
-+	#define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
-+
-+	/*	We use ESP_DRIVER_SELF_SPEC to add pie and ssp command-line options.  */
-+	#define ESP_DRIVER_SELF_SPEC "%{D__KERNEL__:;:%{!nopie:%(esp_options_pie) \
-+		%(esp_link_pie)} %(esp_options_ssp) }"
-+	
-+	/*  This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
-+		-fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined.  */
-+	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_OPTIONS_SSP_SPEC \
-+			"%{nostdlib|ffreestanding|fno-stack-protector|fstack-protector| \
-+			fstack-protector-all|fstack-protector-strong:;:-fstack-protector-all} \
-+			%{fstack-check|fstack-check=*:;: -fstack-check}"
-+	#else
-+		#define ESP_OPTIONS_SSP_SPEC ""
-+	#endif
-+
-+	/* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie  */
-+	#if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+
-+		/*  This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
-+			-nostdlib -nostartfiles.  */
-+		/*  With ENABLE_CRTBEGINP we don't need to check for -static  */
-+		#ifdef ENABLE_CRTBEGINP
-+			#define ESP_OPTIONS_PIE_SPEC \
-+				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+				%{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
-+		#else
-+			#define ESP_OPTIONS_PIE_SPEC \
-+				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+				%{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
-+		#endif
-+
-+		/*  This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib 
-+			-nostartfiles  */
-+		/*  With ENABLE_CRTBEGINP we don't need to check for -static
-+			and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
-+		#ifdef ENABLE_CRTBEGINP
-+			#define ESP_LINK_PIE_SPEC \
-+				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
-+				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
-+		#else
-+			#define ESP_LINK_PIE_SPEC \
-+				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
-+				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
-+		#endif
-+		
-+		/*  This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out
-+			"-pie and (static)|pg|p|profile are incompatible when linking"  */
-+		/*  With ENABLE_CRTBEGINP we don't need to check for -static  */
-+		#ifdef ENABLE_CRTBEGINP
-+			#define ESP_LINK_PIE_CHECK_SPEC \
-+				"%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}"
-+		#else
-+			#define ESP_LINK_PIE_CHECK_SPEC \
-+				"%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}"
-+		#endif
-+
-+		/*  We don't pass -pie to the linker when -static.  */
-+		#ifdef ENABLE_CRTBEGINP
-+			#define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)"
-+		#else
-+			#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+		#endif
-+
-+	#else
-+		#define ESP_OPTIONS_PIE_SPEC ""
-+		#define ESP_LINK_PIE_CHECK_SPEC ""
-+		#define ESP_LINK_PIE_SPEC ""
-+		#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+	#endif
-+
-+	/*  We add extra spec name's to the EXTRA_SPECS list  */
-+	#define ESP_EXTRA_SPECS \
-+		{ "esp_cc1",								ESP_CC1_SPEC },					\
-+		{ "esp_cc1_pie",							ESP_CC1_PIE_SPEC },				\
-+		{ "esp_cc1_ssp",							ESP_CC1_SSP_SPEC },				\
-+		{ "esp_cc1_strict_overflow",					ESP_CC1_STRICT_OVERFLOW_SPEC },	\
-+		{ "esp_link",								ESP_LINK_SPEC },				\
-+		{ "esp_link_now",							ESP_LINK_NOW_SPEC },			\
-+		{ "esp_link_pie",							ESP_LINK_PIE_SPEC },			\
-+		{ "esp_link_pie_check",						ESP_LINK_PIE_CHECK_SPEC },		\
-+		{ "esp_driver_self",							ESP_DRIVER_SELF_SPEC },		\
-+		{ "esp_options_pie",						ESP_OPTIONS_PIE_SPEC },			\
-+		{ "esp_options_ssp",						ESP_OPTIONS_SSP_SPEC }
-+
-+	static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
-+
-+#endif
-+#endif /* End GCC_ESP_H */
@@ -1,67 +0,0 @@
-Apply Alpine Linux specific differences to Gentoo ESP configuration:
- default PIE and SSP by default without additional CFLAGS (to clean up APKBUILD)
- do not enable -fstack-check by default (caused failures in programs that setup
-  small stack in musl)
- enable -z relro by default
- enable -fstack-protector-strong instead of -fstack-protector-all by default
-
--- gcc-4.9.2/gcc/config/esp.h	2014-12-10 15:54:19.925060848 +0000
-+++ gcc-4.9.2/gcc/config/esp.h	2014-12-10 15:59:16.793850060 +0000
-@@ -4,7 +4,7 @@
- #ifndef GCC_ESP_H
- #define GCC_ESP_H
- 
-/*	This file will add -fstack-protector-all, -fstack-check, -fPIE, -pie and -z now 
-+/*	This file will add -fstack-protector-strong, -fPIE, -pie, -z relro and -z now 
- 	as default if the defines and the spec allow it.
- 	Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
- 	to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
-@@ -16,11 +16,14 @@
- 	ENABLE_CRTBEGINP add support for crtbeginP.o, build -static with -fPIE or -fpie.
- */
- #ifdef ENABLE_ESP
-+
-+	/* Enable by default on Alpine */
-+	#define EFAULT_PIE_SSP
- 	
- 	/* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass  */
- 	#define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
- 	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-		#define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: %{!fno-stack-check: }}}"
-+		#define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
- 	#else
- 		#define ESP_CC1_SSP_SPEC ""
- 	#endif
-@@ -34,20 +37,20 @@
- 	/*	ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
- 		-z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
- 		Don't remove the specs in the end  */
-	#define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
-+	#define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_relro) %(esp_link_pie_check) "
- 	#define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
-+	#define ESP_LINK_RELRO_SPEC "%{!norelro:-z relro}"
- 
- 	/*	We use ESP_DRIVER_SELF_SPEC to add pie and ssp command-line options.  */
- 	#define ESP_DRIVER_SELF_SPEC "%{D__KERNEL__:;:%{!nopie:%(esp_options_pie) \
- 		%(esp_link_pie)} %(esp_options_ssp) }"
- 	
-	/*  This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
-+	/*  This will add -fstack-protector-strong if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
- 		-fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined.  */
- 	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
- 		#define ESP_OPTIONS_SSP_SPEC \
- 			"%{nostdlib|ffreestanding|fno-stack-protector|fstack-protector| \
-			fstack-protector-all|fstack-protector-strong:;:-fstack-protector-all} \
-			%{fstack-check|fstack-check=*:;: -fstack-check}"
-+			fstack-protector-all|fstack-protector-strong:;:-fstack-protector-strong}"
- 	#else
- 		#define ESP_OPTIONS_SSP_SPEC ""
- 	#endif
-@@ -115,6 +118,7 @@
- 		{ "esp_cc1_strict_overflow",					ESP_CC1_STRICT_OVERFLOW_SPEC },	\
- 		{ "esp_link",								ESP_LINK_SPEC },				\
- 		{ "esp_link_now",							ESP_LINK_NOW_SPEC },			\
-+		{ "esp_link_relro",							ESP_LINK_RELRO_SPEC },			\
- 		{ "esp_link_pie",							ESP_LINK_PIE_SPEC },			\
- 		{ "esp_link_pie_check",						ESP_LINK_PIE_CHECK_SPEC },		\
- 		{ "esp_driver_self",							ESP_DRIVER_SELF_SPEC },		\
@@ -1,28 +0,0 @@
-libitm checks for AVX support in the assembler and adds -mavx to x86_avx.cc
-which defines the needed typedefs.  User CFLAGS can override -mavx however,
-so also use the fallback typedef if __AVX__ isn't defined.
-
-https://bugs.gentoo.org/417271
-http://gcc.gnu.org/PR53113
-
-
--- a/libitm/config/x86/x86_avx.cc
-+++ b/libitm/config/x86/x86_avx.cc
-@@ -29,7 +29,7 @@
- 
- extern "C" {
- 
-#ifndef HAVE_AS_AVX
-+#if !defined (HAVE_AS_AVX) || !defined(__AVX__)
- // If we don't have an AVX capable assembler, we didn't set -mavx on the
- // command-line either, which means that libitm.h defined neither this type
- // nor the functions in this file.  Define the type and unconditionally
-@@ -40,7 +40,7 @@ typedef float _ITM_TYPE_M256 __attribute__((vector_size(32), may_alias));
- // Re-define the memcpy implementations so that we can frob the
- // interface to deal with possibly missing AVX instruction set support.
- 
-#ifdef HAVE_AS_AVX
-+#if defined(HAVE_AS_AVX) && defined(__AVX__)
- #define RETURN(X)	return X
- #define STORE(X,Y)	X = Y
- #define OUTPUT(T)	_ITM_TYPE_##T
@@ -1,18 +0,0 @@
-2008-07-25  Magnus Granberg  <zorry@ume.nu>
-
-    * include/libiberty.h (asprintf): Don't declare if defined as a macro
-
--- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -609,8 +609,11 @@ extern int pwait (int, int *, int);
- /* 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
- 
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
@@ -1,10 +0,0 @@
--- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -246,6 +246,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
@@ -1,190 +0,0 @@
-From 160397ef3c3331099af028f1b8d3e085b07d88ad 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 16/35] gcc: poison-system-directories
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
---
- gcc/Makefile.in     |    2 +-
- gcc/common.opt      |    4 ++++
- gcc/config.in       |    6 ++++++
- gcc/configure       |   20 ++++++++++++++++++--
- gcc/configure.ac    |   10 ++++++++++
- gcc/doc/invoke.texi |    9 +++++++++
- gcc/gcc.c           |    2 ++
- gcc/incpath.c       |   19 +++++++++++++++++++
- 8 files changed, 69 insertions(+), 3 deletions(-)
-
-Index: gcc-4.9-20140316/gcc/common.opt
-===================================================================
--- gcc-4.9-20140316.orig/gcc/common.opt
-+++ gcc-4.9-20140316/gcc/common.opt
-@@ -603,6 +603,10 @@ Wpedantic
- Common Var(pedantic) Warning
- Issue warnings needed for strict compliance to the standard
- 
-+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 local variable shadows another
-Index: gcc-4.9-20140316/gcc/config.in
-===================================================================
--- gcc-4.9-20140316.orig/gcc/config.in
-+++ gcc-4.9-20140316/gcc/config.in
-@@ -138,6 +138,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. */
-Index: gcc-4.9-20140316/gcc/configure
-===================================================================
--- gcc-4.9-20140316.orig/gcc/configure
-+++ gcc-4.9-20140316/gcc/configure
-@@ -928,6 +928,7 @@ with_system_zlib
- enable_maintainer_mode
- enable_link_mutex
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1648,6 +1649,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
-@@ -27702,6 +27705,19 @@ if test "${enable_version_specific_runti
- 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
- 
- 
-Index: gcc-4.9-20140316/gcc/configure.ac
-===================================================================
--- gcc-4.9-20140316.orig/gcc/configure.ac
-+++ gcc-4.9-20140316/gcc/configure.ac
-@@ -5366,6 +5366,16 @@ AC_ARG_ENABLE(version-specific-runtime-l
-                 [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)
-Index: gcc-4.9-20140316/gcc/doc/invoke.texi
-===================================================================
--- gcc-4.9-20140316.orig/gcc/doc/invoke.texi
-+++ gcc-4.9-20140316/gcc/doc/invoke.texi
-@@ -260,6 +260,7 @@ Objective-C and Objective-C++ Dialects}.
- -Woverlength-strings  -Wpacked  -Wpacked-bitfield-compat  -Wpadded @gol
- -Wparentheses  -Wpedantic-ms-format -Wno-pedantic-ms-format @gol
- -Wpointer-arith  -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wredundant-decls  -Wno-return-local-addr @gol
- -Wreturn-type  -Wsequence-point  -Wshadow @gol
- -Wsign-compare  -Wsign-conversion -Wfloat-conversion @gol
-@@ -4230,6 +4231,14 @@ headers---for that, @option{-Wunknown-pr
-  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.
- 
-+@item -Wno-poison-system-directories
-+@opindex 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.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-Index: gcc-4.9-20140316/gcc/gcc.c
-===================================================================
--- gcc-4.9-20140316.orig/gcc/gcc.c
-+++ gcc-4.9-20140316/gcc/gcc.c
-@@ -764,6 +764,8 @@ proper position among the other output f
-    "%{fuse-ld=*:-fuse-ld=%*}\
-     %X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} " VTABLE_VERIFICATION_SPEC " \
-+    %{Wno-poison-system-directories:--no-poison-system-directories}\
-+    %{Werror=poison-system-directories:--error-poison-system-directories}\
-     %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\
-     %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\
-     %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\
-Index: gcc-4.9-20140316/gcc/incpath.c
-===================================================================
--- gcc-4.9-20140316.orig/gcc/incpath.c
-+++ gcc-4.9-20140316/gcc/incpath.c
-@@ -28,6 +28,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.  */
-@@ -382,6 +383,24 @@ merge_include_chains (const char *sysroo
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[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)))
-+            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
@@ -1,483 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen gcc4-armhf
-# Based on: main/gcc4 (from postmarketOS)
-
-CTARGET_ARCH=armhf
-CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
-LANG_D=false
-LANG_OBJC=false
-LANG_JAVA=false
-LANG_GO=false
-LANG_FORTRAN=false
-LANG_ADA=false
-options="!strip !tracedeps"
-
-# abuild doesn't try to tries to install "build-base-$CTARGET_ARCH"
-# when this variable matches "no*"
-BOOTSTRAP="nobuildbase"
-
-# abuild will only cross compile when this variable is set, but it
-# needs to find a valid package database in there for dependency
-# resolving, so we set it to /.
-CBUILDROOT="/"
-
-_cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
-
-pkgname=gcc4-armhf
-pkgver=9999
-_pkgver=4.9.2
-pkgrel=2
-pkgdesc="Stage2 cross-compiler for armhf"
-url="http://gcc.gnu.org"
-arch="x86_64"
-license="GPL LGPL"
-_gccrel=$_pkgver-r$pkgrel
-depends="isl binutils-armhf mpc1"
-makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
-options="!strip !tracedeps"
-
-# We only care about C, so we can compile old Linux kernels
-LANG_CXX=false
-LANG_OBJC=false
-LANG_JAVA=false
-LANG_GO=false
-LANG_FORTRAN=false
-LANG_ADA=false
-
-LIBGOMP="false"
-LIBGCC="false"
-LIBATOMIC="false"
-LIBITM="false"
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	if [ "$BOOTSTRAP" = nolibc ]; then
-		LANG_CXX=false
-		LANG_ADA=false
-		LIBGCC=false
-		_builddir="$srcdir/build-cross-pass2"
-	else
-		_builddir="$srcdir/build-cross-final"
-	fi
-	LANG_OBJC=false
-	LANG_JAVA=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-	LIBGOMP=false
-	LIBATOMIC=false
-	LIBITM=false
-
-	# reset target flags (should be set in crosscreate abuild)
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	STRIP_FOR_TARGET="$CTARGET-strip"
-elif [ "$CBUILD" != "$CHOST" ]; then
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-
-	# reset flags and cc for build
-	export CC_FOR_BUILD="gcc"
-	export CXX_FOR_BUILD="g++"
-	export CFLAGS_FOR_BUILD=" "
-	export CXXFLAGS_FOR_BUILD=" "
-	export LDFLAGS_FOR_BUILD=" "
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	# Languages that do not need bootstrapping
-	LANG_OBJC=false
-	LANG_JAVA=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build-cross-native"
-else
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build"
-fi
-
-# Go needs {set,make,swap}context, unimplemented in musl
-[ "$CTARGET_LIBC" = musl ] && LANG_GO=false
-
-# libitm has TEXTRELs in ARM build, so disable for now
-case "$CTARGET_ARCH" in
-arm*)		LIBITM=false ;;
-mips*)		LIBITM=false ;;
-esac
-
-# Fortran uses libquadmath if toolchain has __float128
-# currently on x86, x86_64 and ia64
-LIBQUADMATH=$LANG_FORTRAN
-case "$CTARGET_ARCH" in
-x86 | x86_64)	LIBQUADMATH=$LANG_FORTRAN ;;
-*)		LIBQUADMATH=false ;;
-esac
-
-# libatomic is a dependency for openvswitch
-$LIBATOMIC && subpackages="$subpackages libatomic::$CTARGET_ARCH"
-$LIBGCC && subpackages="$subpackages libgcc::$CTARGET_ARCH"
-$LIBQUADMATH && subpackages="$subpackages libquadmath::$CTARGET_ARCH"
-if $LIBGOMP; then
-	depends="$depends libgomp=$_gccrel"
-	subpackages="$subpackages libgomp::$CTARGET_ARCH"
-fi
-
-_languages=c
-if $LANG_CXX; then
-	_languages="$_languages,c++"
-fi
-if $LANG_OBJC; then
-	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
-	_languages="$_languages,objc"
-fi
-if $LANG_JAVA; then
-	subpackages="$subpackages libgcj::$CTARGET_ARCH gcc-java$_target:java"
-	_languages="$_languages,java"
-fi
-if $LANG_GO; then
-	subpackages="$subpackages libgo::$CTARGET_ARCH gcc-go$_target:go"
-	_languages="$_languages,go"
-fi
-if $LANG_FORTRAN; then
-	subpackages="$subpackages libgfortran::$CTARGET_ARCH gfortran$_target:gfortran"
-	_languages="$_languages,fortran"
-fi
-if $LANG_ADA; then
-	subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
-	_languages="$_languages,ada"
-	makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-fi
-makedepends="$makedepends_build $makedepends_host"
-
-source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkgbase:-$_pkgver}.tar.gz
-	http://sourceware.org/pub/java/ecj-4.9.jar
-
-	01_all_gcc49_configure.patch
-	02_all_gcc48_config.in.patch
-	03_all_gcc49_Makefile.in.patch
-	05_all_gcc48_gcc.c.patch
-	16_all_gcc47_nopie_option.patch
-	20_all_gcc49_config_crtbeginp.patch
-	24_all_gcc49_invoke.texi.patch
-	34_all_gcc48_config_i386.patch
-	35_all_gcc48_config_arm.patch
-	40_all_gcc49_config_esp.patch
-	41_all_gcc49_config_esp_alpine.patch
-
-	10_all_default-fortify-source.patch
-	12_all_default-warn-trampolines.patch
-	15_all_libgfortran-Werror.patch
-	16_all_libgomp-Werror.patch
-	48_all_x86_pr53113_libitm-avx.patch
-	50_all_libiberty-asprintf.patch
-	51_all_libiberty-pic.patch
-	67_all_gcc-poison-system-directories.patch
-
-	gcc49-cloog-dl.patch
-	gcc-ice-hack.patch
-	gcc-spec-env.patch
-	libgcc-always-build-gcceh.a.patch
-	gcc-4.6-pr32219.patch
-	gcc-4.9-musl.patch
-	gcc-4.8-musl-fix-iteratephdr.patch
-	gcc-4.8-musl-libssp.patch
-	gcc-4.9-musl-fortify.patch
-	boehm-gc-uclibc.patch
-	boehm-gc-musl.patch
-	gcc-pure64.patch
-	fix-gcj-musl.patch
-	fix-gcj-iconv-musl.patch
-	musl-posix_memalign-c++.patch
-	pr63740.patch
-	pr64037.patch
-
-	gcc-4.8-build-args.patch
-	fix-cxxflags-passing.patch
-	fix-cxxflags-for-target.patch
-	ada-no-pie.patch
-	ada-fixes.patch
-	ada-shared.patch
-	ada-musl.patch
-
-	vanilla.specs
-	hardenednossp.specs
-	hardenednopie.specs
-	hardenednopiessp.specs
-	"
-
-# we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase:-$_pkgver}
-_gcclibdir=/usr/lib/gcc/${CTARGET}/$_pkgver
-_gcclibexec=/usr/libexec/gcc/${CTARGET}/$_pkgver
-
-prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -F3 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
-	mv "$srcdir"/ecj-*.jar ecj.jar
-
-	echo ${_pkgver} > gcc/BASE-VER
-}
-
-build() {
-	local _arch_configure=
-	local _libc_configure=
-	local _bootstrap_configure=
-	local _symvers=
-
-	cd "$_gccdir"
-
-	case "$CTARGET" in
-	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
-	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
-	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";;
-	armv7-*-*-*eabihf)	_arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";;
-	mips-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-float=soft --with-abi=32";;
-	mips64-*-*-*)		_arch_configure="--with-arch=mips3 --with-tune=mips64 --with-mips-plt --with-float=soft --with-abi=64";;
-	mips64el-*-*-*)		_arch_configure="--with-arch=mips3 --with-tune=mips64 --with-mips-plt --with-float=soft --with-abi=64";;
-	mipsel-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-float=soft --with-abi=32";;
-	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
-	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no --enable-targets=powerpcle-linux";;
-	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
-	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
-	esac
-
-	case "$CTARGET_ARCH" in
-	mips*)	_hash_style_configure="--with-linker-hash-style=sysv" ;;
-	*)	_hash_style_configure="--with-linker-hash-style=gnu" ;;
-	esac
-
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support mudflap, or libsanitizer
-		# libmpx uses secure_getenv and struct _libc_fpstate not present in musl
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libmpx --disable-libmudflap --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		;;
-	esac
-
-
-	case "$BOOTSTRAP" in
-	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
-	esac
-
-	$LIBGOMP	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
-	$LIBATOMIC	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
-	$LIBITM		|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$LIBQUADMATH	|| _arch_configure="$_arch_configure --disable-libquadmath"
-
-	msg "Building the following:"
-	echo ""
-	echo "  CBUILD=$CBUILD"
-	echo "  CHOST=$CHOST"
-	echo "  CTARGET=$CTARGET"
-	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
-	echo "  languages=$_languages"
-	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
-	echo "  cross_configure=$_cross_configure"
-	echo "  bootstrap_configure=$_bootstrap_configure"
-	echo "	hash_style_configure=$_hash_style_configure"
-	echo ""
-
-	mkdir -p "$_builddir"
-	cd "$_builddir"
-	"$_gccdir"/configure --prefix=/usr/gcc4 \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--with-pkgversion="postmarketOS ${_pkgver}" \
-		--enable-checking=release \
-		--disable-fixed-point \
-		--disable-libstdcxx-pch \
-		\
-		--disable-bootstrap \
-		--disable-libstdcxx \
-		\
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		$_symvers \
-		--enable-__cxa_atexit \
-		--enable-default-pie \
-		--enable-cloog-backend \
-		--enable-languages=$_languages \
-		$_arch_configure \
-		$_libc_configure \
-		$_cross_configure \
-		$_bootstrap_configure \
-		--with-system-zlib \
-		$_hash_style_configure
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="${pkgdir}" install
-
-	local prefix=/usr/gcc4
-	if [ "$CHOST" = "$CTARGET" ]; then
-		# gcc symlinks
-		ln -s gcc "$pkgdir$prefix"/bin/cc
-		ln -s gcc "$pkgdir$prefix"/bin/gcc4
-	fi
-
-	# remove docs
-	rm -r "$pkgdir/usr/share/"
-
-	# we don't support gcj -static
-	# and saving 35MB is not bad.
-	find "$pkgdir" -name libgcj.a -o -name libgtkpeer.a \
-		-o -name libgjsmalsa.a -o -name libgcj-tools.a \
-		-o -name libjvm.a -o -name libgij.a -o -name libgcj_bc.a \
-		-o -name libjavamath.a \
-		| xargs rm -f
-
-	# strip debug info from some static libs
-	${STRIP_FOR_TARGET} -g `find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
-		-o -name libmudflap.a -o -name libmudflapth.a \
-		-o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \
-		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
-		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
-		-a -type f`
-
-	if $LANG_JAVA; then
-		sed -i -e 's/lib: /&%{static:%eJava programs cannot be linked statically}/' \
-			"$pkgdir"/usr/lib/libgcj.spec
-	fi
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# cross-gcc: remove any files that would conflict with the
-		# native gcc package
-		rm -rf "$pkgdir$prefix"/bin/cc \
-				"$pkgdir$prefix"/include \
-				"$pkgdir$prefix"/share
-		# libcc1 does not depend on target, don't ship it
-		rm -rf "$pkgdir$prefix"/lib/libcc1.so*
-
-		# fixup gcc library symlinks to be linker scripts so
-		# linker finds the libs from relocated sysroot
-		for so in "$pkgdir$prefix"/$CTARGET/lib/*.so; do
-			if [ -h "$so" ]; then
-				local _real=$(basename $(readlink "$so"))
-				rm -f "$so"
-				echo "GROUP ($_real)" > "$so"
-			fi
-		done
-
-		# Link binutils binaries to /usr/gcc4
-		# This is the path GCC4 will look for them, if we don't create these
-		# symlinks, it will use the native binutils instead (which is of course
-		# failing and causes many headaches). See also: '-B' in 'man gcc'.
-		echo "Link binutils binaries to /usr/gcc4"
-		mkdir -p "$pkgdir$prefix/$CTARGET/bin"
-		for i in "as" "ld"; do
-			ln -sv "/usr/$CTARGET/bin/$i" \
-				"$pkgdir$prefix/$CTARGET/bin/$i"
-		done
-
-		# Link binutils to gcc4-* (so 'CROSS_COMPILE=gcc4-...' works)
-		echo "Link binutils to gcc4-*"
-		mkdir -p "$pkgdir/usr/bin"
-		for i in "elfedit" "gprof" "addr2line" "strings" "as" "ld" "size" "ld.bfd" \
-			"readelf" "nm" "ar" "strip" "dwp" "objdump" "objcopy" "c++filt" "ranlib"; do
-			ln -sv "/usr/bin/$CTARGET-$i" \
-				"$pkgdir/usr/bin/gcc4-$CTARGET-$i"
-		done
-	fi
-
-	# Link all binaries from /usr/gcc4/bin/* to /usr/bin/gcc4-*
-	echo "Link all gcc binaries to /usr/bin/gcc4-*"
-	mkdir -p "$pkgdir"/usr/bin
-	cd "$pkgdir$prefix/bin/"
-	for i in *; do
-		ln -sv "$prefix/bin/$i" "$pkgdir/usr/bin/gcc4-$i"
-	done
-}
-
-sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
-28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
-618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
-21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
-3afe2cc407b5440333d9517daca3257e08a7318695d20645a9186cafac53afa6d0c075af67398ff7abd06250567cc6c751e6dabb65a310eef9a5d981e910aa25  03_all_gcc49_Makefile.in.patch
-e98cc321d71e5bb62c6116b30ed6f11044bda440e238026a83dec63f04a0587440bdae50ec211b07976fcd9deb329f9dd1dac1317dae5003088a8a8bddbb97c1  05_all_gcc48_gcc.c.patch
-98a4da3137177c5cad7dd7d35ad39cd416aa36f07867714e09ab8c0d8b759d2659063aa87b16ac1b708a283afd2ac54e20b327a32d1147720996d7bc11dcbd63  16_all_gcc47_nopie_option.patch
-8fc6f2fd921c560fb1d7ba17b5cef4ea8071ee6909d372e41201667c011f948560fa543b1246cf55c0009622abf0dbc0bd79f718a853f2f0b59290e3df2c2968  20_all_gcc49_config_crtbeginp.patch
-32bfe9c1f6f566de72c93388622001ff4b95086ea6f476bdfc08403ea474f98212f7396bc75d88a79a053159f78dca922ec6f641f83d9959ad419b0d8901b504  24_all_gcc49_invoke.texi.patch
-dd5b9b30eb7716cb3c010ca79a83ed6219ff6e6f2557deb4e1d26cecac0f2b14c4ef7bf4dc5c2aec88aae5463763f5f64454b8a627ebd1d0a5c92984017025ad  34_all_gcc48_config_i386.patch
-8829f85323d8b11e26e3c19ced4a51875fc63f1483cfdc4d0f579a6cb37e1b6e23fcf33a87a574a6e0007250374ea46d117a136e73a40fbe43f0e39d9b2dd1a8  35_all_gcc48_config_arm.patch
-976994900d20a448b97fa91e1d758b6da6d8ad9121b3dbc2e8f66ff8006d8e496cd3dddc41394db6c4d20366d56fe12375b97f494d6fb9abb8e64ab626acc2ef  40_all_gcc49_config_esp.patch
-e2d027be2e76a64a607ae44566d163bcc2a03c9e14d5bd20cd8bb15c2e9e395d8964b747a6a9c49541a5d1613d721855b73d60cce7c834427b44788fa92d44dc  41_all_gcc49_config_esp_alpine.patch
-6cdac0741568b418af1e267a69b487e48a98e319f5ec8ab2bad293f2520ceced40c7df7ddef84963f5b101b94f34e441574c501ef3993ded097beb7c9d3b205f  10_all_default-fortify-source.patch
-5069e4b741488913a646a9b5d871af8e7f7a606158ea09305d0ddd46257c5b659770627bc2ca3abeaae039da1717b3ba6c9cd90554a441da74eb4ecf24c13074  12_all_default-warn-trampolines.patch
-c18a99b7303a734fe4dca9d4e90e21d18e5bd71c7d91e1a26c86b1354c73f567590a875941bfe64ce59f0393023b91c606c96b30885c55b98a790c3ab0c84ca7  15_all_libgfortran-Werror.patch
-433404fd9bfa172d69fff4a5505e8648cbbbf5f052d2b4235608ff7af0c4063d557d25d80c85c5bd0d1e1ed64b568e7bbc0cdbce11cc74db4c0189af3a01634a  16_all_libgomp-Werror.patch
-ff16f259fff8d78230593eee8641eab5a72c5c517c6ac5f09597edbc624d964b33f185a0dd5772d6029f757a5edb66431b3eab77dac71e76a0ef155bb7443d2c  48_all_x86_pr53113_libitm-avx.patch
-c6c314a2d24531b4286436dec7189f83e443c4cfa9b88339a4c324c2d40812d766ed44dcfd4a0c3b67695bb76969a4d8a9784ff95876ceba23def305ef8a48f8  50_all_libiberty-asprintf.patch
-0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca  51_all_libiberty-pic.patch
-9b623a0b00254326596a56fff23dacc97e560823ebdf35698799fc7ab5e98984c71b7ddfceeb1589bbbdd1ba89a742cd7becf8f70f0081dfc26bcef4198b1b5d  67_all_gcc-poison-system-directories.patch
-9c6aa6d7f096c3aaebbe21d52967872195aea130b51d60a1934255b00bf1b23d24ec598c7763152f987f7999da9e56f512d169958666a3133641de3780a75d3f  gcc49-cloog-dl.patch
-7242876e4bba34235f6f3ea960d72439638bd31547284ca96cb94c97a2d46dd7b38a3709fd159cf86efa1e8a44e3e9125fe82bc3a1cc71153591755827d6c9fd  gcc-ice-hack.patch
-ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48  gcc-spec-env.patch
-d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b  libgcc-always-build-gcceh.a.patch
-9fc5e32f2573ae67b6cf22119d636d10a47c42718635bceff7d457a93a3f664ae1ed10e154f70964ba2d26b0de04f879a8c05de6411112760d40433373dd0a80  gcc-4.6-pr32219.patch
-e2be926c0ed4d67587857652678253a2a4e42294009a0c4b9fc420e53b0e6d44d1a2c6c2c62db837bc010470e9e62eb4af1ba7f51ff507c41e40922cd022dd26  gcc-4.9-musl.patch
-b5b0210dfaccfe0b06f0a9090666b1fae2a3faa4140b7930146b29531f0da9beb1f2c1f7e7bc2bd29179f9fe05dc30e246e96220b8ff75a90f75e8350c9058a1  gcc-4.8-musl-fix-iteratephdr.patch
-e6d9b103c128e5d4eca515b1496d78b05708de770597c883daddd95ea41e77b5ef1be613b989357cc870a7efd9e43b011022c2d302e7056cff7b69e764906ff2  gcc-4.8-musl-libssp.patch
-600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d  gcc-4.9-musl-fortify.patch
-e1d6a450dfb40b134ad7f759c4c10174d2490b0093fe47cb33479245f26a3a8c54ebcf6255943c0ccfcb5095600d1c05e530baeed35609c8ffe75caac8e57c49  boehm-gc-uclibc.patch
-bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7  boehm-gc-musl.patch
-4a5aeff0399782c752e6e3f2f48d984b2056dfb5d229b23a24eee1562d241339989b2203f139821cfc03c9b25c9bd7da6ccbbdc7a09d242e4de7f0d606c6f63c  gcc-pure64.patch
-f89ddeb21bc8f97e6a850a6b70b4501a8f3e49a4bc8cc82897488decda5d98ad01cb7f6c8b392d452e9579924a523bc75da6e0648c1c976d42e40af48b10343b  fix-gcj-musl.patch
-54d67cc008b735e47771314171930c5d8b8f5f5dc97fcf4214824c105c808f3e75d22d5a4fdf5068ed0457fa0d46c60cfb442e276259a4a5e9b8722a027d18e6  fix-gcj-iconv-musl.patch
-7de81fc8c7eb36690949eb30082515454978440a8f389b12407ac5e9125ef6824d6059ffb5b063ab1ccc6c4827b1a6a0984b538f056b85e3171800a6f723ec8b  musl-posix_memalign-c++.patch
-095281d940ad7504ed7071cc9800d81db33eb4aa5465696ef7b12bf1213dbdfa701f4392095c5167b331c38219b19d25a0798524b319f1c77aa8522d76d8c92c  pr63740.patch
-efc04b179d41b484eddddc56d0e442634995d56c994e6295ae09b9856ab46649d5f45f51ea84494ab39df41c213772d0e68aee67e66fdf340f0a647b55629ced  pr64037.patch
-abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1ca7d49fd0b5e351532aa15a3b13362abbf1ca4266f54a687  gcc-4.8-build-args.patch
-35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282  fix-cxxflags-passing.patch
-c731f4aaaa65c8950e1b2bd9331410f92d378fd8c7e718532dccaa27ee11984d51d74216c3611e89a802325b81d7f184116839dce2dab50cae9b643c20a82fe7  fix-cxxflags-for-target.patch
-e80a08de4b43fb71f7699bcce360cd99bc525dab20b9109e7152bd211def5d8e728f88771ed59f15ed520cbf069364debc4f822c10a1abf7e2c7badd67e1c83c  ada-no-pie.patch
-b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc260cf813e58602617e9e629ea8177133bfdf5972398fe1c55  ada-fixes.patch
-3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19  ada-shared.patch
-76d7d35066534c332956a88da84a95c8c54c6e0742c3c46e6b256395bf67f7c167b5ecd47fbed697fb1c9d7a41016c99e7dcd06465516a0e963707a0eab8f8b6  ada-musl.patch
-83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
-e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
-b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
@@ -1,44 +0,0 @@
--- gcc-4.8.1/gcc/ada/terminals.c.orig
-+++ gcc-4.8.1/gcc/ada/terminals.c
-@@ -984,13 +984,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-/* On some system termio is either absent or including it will disable termios
-   (HP-UX) */
-#if ! defined (__hpux__) && ! defined (FREEBSD) && \
-    ! defined (__APPLE__) && ! defined(__rtems__)
-#   include <termio.h>
-#endif
-
- #include <sys/ioctl.h>
- #include <termios.h>
- #include <fcntl.h>
-@@ -1078,7 +1078,7 @@
-    char *slave_name = NULL;
- 
- #ifdef USE_GETPT
-  master_fd = getpt ();
-+  master_fd = posix_openpt (O_RDWR);
- #elif defined (USE_OPENPTY)
-   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
- #elif defined (USE_CLONE_DEVICE)
-@@ -1179,7 +1170,7 @@
-   int    status;
- 
-   /* ensure that s is filled with 0 */
-  bzero (&s, sizeof (&s));
-+  bzero (&s, sizeof (s));
- 
-   /* Get the current terminal settings */
-   status = tcgetattr (fd, &s);
--- gcc-4.8.1/gcc/ada/cal.c.orig
-+++ gcc-4.8.1/gcc/ada/cal.c
-@@ -65,6 +65,7 @@
- #include <time.h>
- #else
- #include <sys/time.h>
-+#include <time.h>
- #endif
- 
- #ifdef __MINGW32__
@@ -1,136 +0,0 @@
-diff -ru gcc-4.9.2/gcc/ada/adaint.c gcc-4.9.2/gcc/ada/adaint.c
--- gcc-4.9.2/gcc/ada/adaint.c	2014-02-24 18:51:58.000000000 -0200
-+++ gcc-4.9.2/gcc/ada/adaint.c	2014-12-10 12:05:44.621173474 -0200
-@@ -67,6 +67,11 @@
- #include <sys/pstat.h>
- #endif
- 
-+#if defined (linux)
-+#define _GNU_SOURCE 1
-+#include <sched.h>
-+#endif
-+
- #ifdef VMS
- #define _POSIX_EXIT 1
- #define HOST_EXECUTABLE_SUFFIX ".exe"
-@@ -3891,8 +3896,6 @@
-    return (void *) syscall (__NR_gettid);
- }
- 
-#include <sched.h>
-
- /* glibc versions earlier than 2.7 do not define the routines to handle
-    dynamically allocated CPU sets. For these targets, we use the static
-    versions. */
-@@ -3901,7 +3904,7 @@
- 
- /* Dynamic cpu sets */
- 
-cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count)
- {
-   return CPU_ALLOC (count);
-@@ -3914,33 +3917,33 @@
- }
- 
- void
-__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
-  CPU_FREE (set);
-+  CPU_FREE ((cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_zero (size_t count, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count, void *set)
- {
-  CPU_ZERO_S (count, set);
-+  CPU_ZERO_S (count, (cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
-  CPU_SET_S (cpu - 1, count, set);
-+  CPU_SET_S (cpu - 1, count, (cpu_set_t *) set);
- }
- 
- #else /* !CPU_ALLOC */
- 
- /* Static cpu sets */
- 
-cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED)
- {
-  return (cpu_set_t *) xmalloc (sizeof (cpu_set_t));
-+  return xmalloc (sizeof (cpu_set_t));
- }
- 
- size_t
-@@ -3950,23 +3953,23 @@
- }
- 
- void
-__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
-   free (set);
- }
- 
- void
-__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set)
- {
-  CPU_ZERO (set);
-+  CPU_ZERO ((cpu_set_t *) set);
- }
- 
- void
-__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
-  CPU_SET (cpu - 1, set);
-+  CPU_SET (cpu - 1, (cpu_set_t *) set);
- }
- #endif /* !CPU_ALLOC */
- #endif /* linux */
-diff -ru gcc-4.9.2/gcc/ada/adaint.h gcc-4.9.2/gcc/ada/adaint.h
--- gcc-4.9.2/gcc/ada/adaint.h	2014-02-24 18:51:58.000000000 -0200
-+++ gcc-4.9.2/gcc/ada/adaint.h	2014-12-10 12:03:48.377834174 -0200
-@@ -266,13 +266,11 @@
- 
- /* Routines for interface to required CPU set primitives */
- 
-#include <sched.h>
-
-extern cpu_set_t *__gnat_cpu_alloc                 (size_t);
-+extern void * __gnat_cpu_alloc                 (size_t);
- extern size_t __gnat_cpu_alloc_size                (size_t);
-extern void   __gnat_cpu_free                  (cpu_set_t *);
-extern void   __gnat_cpu_zero                      (size_t, cpu_set_t *);
-extern void   __gnat_cpu_set                       (int, size_t, cpu_set_t *);
-+extern void   __gnat_cpu_free                  (void *);
-+extern void   __gnat_cpu_zero                      (size_t, void *);
-+extern void   __gnat_cpu_set                       (int, size_t, void *);
- #endif
- 
- #if defined (_WIN32)
--- gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in.orig	2014-12-11 08:16:33.364902456 -0200
-+++ gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in	2014-12-11 08:16:51.998236755 -0200
-@@ -1948,7 +1948,7 @@
- endif
- 
- # ARM linux, GNU eabi
-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
-+ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-linux.ads \
-   s-inmaop.adb<s-inmaop-posix.adb \
@@ -1,66 +0,0 @@
--- gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in.orig	2014-05-17 13:13:12.000000000 -0300
-+++ gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in	2014-12-10 12:01:32.304493855 -0200
-@@ -2570,23 +2570,23 @@
- 	  gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
- 	  gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
- 	$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 
- ../../gnatsym$(exeext): ../stamp-tools
- 	$(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
-@@ -2608,7 +2608,7 @@
- 	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
- 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake
- 	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		--GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 
- # Note the use of the "mv" command in order to allow gnatlink to be linked with
- # with the former version of gnatlink itself which cannot override itself.
-@@ -2618,7 +2618,7 @@
- 	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
- 	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
- 	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
-		    --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+		    --GCC="$(GCC_LINK)" -fno-PIE $(TOOLS_LIBS)
- 	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
- 
- # Needs to be built with CC=gcc
-@@ -2627,10 +2627,10 @@
- 
- # Likewise for the tools
- ../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS)
-	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS)
-+	+$(GCC_LINK) $(ALL_CFLAGS) -fno-PIE -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS)
- 
- ../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS)
-	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
-+	+$(GCC_LINK) $(ALL_CFLAGS) -fno-PIE -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
- 
- ../stamp-gnatlib-$(RTSDIR):
- 	@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
@@ -1,30 +0,0 @@
-Index: b/gcc/ada/link.c
-===================================================================
--- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -105,9 +105,9 @@
- 
- #elif defined (__FreeBSD__)
- const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
-char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -127,9 +127,9 @@
- 
- #elif defined (linux) || defined(__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
-const char *__gnat_run_path_option = "-Wl,-rpath,";
-char __gnat_shared_libgnat_default = STATIC;
-char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
@@ -1,62 +0,0 @@
--- gcc-4.8.1/boehm-gc/os_dep.c.orig	2013-09-17 07:46:00.969884340 +0000
-+++ gcc-4.8.1/boehm-gc/os_dep.c	2013-09-17 06:53:53.629884946 +0000
-@@ -26,7 +26,7 @@
- #     define __KERNEL__
- #     include <asm/signal.h>
- #     undef __KERNEL__
-#   else
-+#   elif defined(__GLIBC__)
-       /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
-       /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
-       /* prototypes, so we have to include the top-level sigcontext.h to    */
--- gcc-4.8.2/boehm-gc/dyn_load.c.orig	2014-02-17 14:13:09.519850231 +0200
-+++ gcc-4.8.2/boehm-gc/dyn_load.c	2014-02-17 14:14:27.906093514 +0200
-@@ -459,9 +459,7 @@
- /* For glibc 2.2.4+.  Unfortunately, it doesn't work for older	*/
- /* versions.  Thanks to Jakub Jelinek for most of the code.	*/
- 
-# if (defined(LINUX) || defined (__GLIBC__)) /* Are others OK here, too? */ \
-     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
-         || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) 
-+# if (defined(LINUX) || defined (__GLIBC__))
- 
- /* We have the header files for a glibc that includes dl_iterate_phdr.	*/
- /* It may still not be available in the library on the target system.   */
--- gcc-4.8.2/boehm-gc/include/private/gcconfig.h.orig	2014-02-17 14:14:36.026049422 +0200
-+++ gcc-4.8.2/boehm-gc/include/private/gcconfig.h	2014-02-17 14:17:11.345207887 +0200
-@@ -684,7 +684,7 @@
- #       ifdef __ELF__
- #            define DYNAMIC_LOADING
- #	     include <features.h>
-#	     if defined(__GLIBC__)&& __GLIBC__>=2
-+#	     if 1
- #              define SEARCH_FOR_DATA_START
- #	     else /* !GLIBC2 */
-                extern char **__environ;
-@@ -1147,7 +1147,7 @@
- #              define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))
- #	     endif
- #	     include <features.h>
-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
-+#	     if 1
- #		 define SEARCH_FOR_DATA_START
- #	     else
-      	         extern char **__environ;
-@@ -1367,7 +1367,7 @@
- #       define HBLKSIZE 4096
- #     endif
- #     define USE_GENERIC_PUSH_REGS
-#     if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
-+#     if 1
- #        define LINUX_STACKBOTTOM
- #     else
- #        define STACKBOTTOM 0x80000000
-@@ -1858,7 +1858,7 @@
- #       ifdef __ELF__
- #            define DYNAMIC_LOADING
- #	     include <features.h>
-#	     if defined(__GLIBC__) && __GLIBC__ >= 2
-+#	     if 1
- #		 define SEARCH_FOR_DATA_START
- #	     else
-      	         extern char **__environ;
@@ -1,11 +0,0 @@
--- ./boehm-gc/include/gc.h.orig
-+++ ./boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
@@ -1,5 +0,0 @@
--- gcc-4.8.1/config/mt-gnu.orig
-+++ gcc-4.8.1/config/mt-gnu
-@@ -1 +1 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET := $(CXXFLAGS_FOR_TARGET) -D_GNU_SOURCE
@@ -1,10 +0,0 @@
--- gcc-4.8.1/Makefile.in.orig
-+++ gcc-4.8.1/Makefile.in
-@@ -169,6 +169,7 @@
- # built for the build system to override those in BASE_FLAGS_TO_PASSS.
- 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.
@@ -1,120 +0,0 @@
--- gcc-4.8.2/libjava/gnu/gcj/convert/natIconv.cc.orig	2014-02-18 18:46:14.897880526 +0200
-+++ gcc-4.8.2/libjava/gnu/gcj/convert/natIconv.cc	2014-02-18 18:50:08.766613550 +0200
-@@ -24,6 +24,13 @@
- 
- #ifdef HAVE_ICONV
- #include <iconv.h>
-+#include <endian.h>
-+
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define UCS2_CHARSET "UCS-2BE"
-+#else
-+#define UCS2_CHARSET "UCS-2LE"
-+#endif
- 
- template<typename T>
- static inline size_t
-@@ -45,7 +52,7 @@
-   _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
-   buffer[len] = '\0';
- 
-  iconv_t h = iconv_open ("UCS-2", buffer);
-+  iconv_t h = iconv_open (UCS2_CHARSET, buffer);
-   if (h == (iconv_t) -1)
-     throw new ::java::io::UnsupportedEncodingException (encoding);
- 
-@@ -99,18 +106,6 @@
- 	throw new ::java::io::CharConversionException ();
-     }
- 
-  if (iconv_byte_swap)
-    {
-      size_t max = (old_out - outavail) / sizeof (jchar);
-      for (size_t i = 0; i < max; ++i)
-	{
-	  // Byte swap.
-	  jchar c = (((out[outpos + i] & 0xff) << 8)
-		     | ((out[outpos + i] >> 8) & 0xff));
-	  outbuf[i] = c;
-	}
-    }
-
-   inpos += old_in - inavail;
-   return (old_out - outavail) / sizeof (jchar);
- #else /* HAVE_ICONV */
-@@ -145,7 +140,7 @@
-   _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer);
-   buffer[len] = '\0';
- 
-  iconv_t h = iconv_open (buffer, "UCS-2");
-+  iconv_t h = iconv_open (buffer, UCS2_CHARSET);
-   if (h == (iconv_t) -1)
-     throw new ::java::io::UnsupportedEncodingException (encoding);
- 
-@@ -187,20 +182,6 @@
-   char *inbuf = (char *) &chars[inpos];
-   char *outbuf = (char *) &out[count];
- 
-  if (iconv_byte_swap)
-    {
-      // Ugly performance penalty -- don't use losing systems!
-      temp_buffer = (jchar *) _Jv_Malloc (inlength * sizeof (jchar));
-      for (int i = 0; i < inlength; ++i)
-	{
-	  // Byte swap.
-	  jchar c = (((chars[inpos + i] & 0xff) << 8)
-		     | ((chars[inpos + i] >> 8) & 0xff));
-	  temp_buffer[i] = c;
-	}
-      inbuf = (char *) temp_buffer;
-    }
-
-   size_t loop_old_in = old_in;
-   while (1)
-     {
-@@ -252,44 +233,7 @@
- jboolean
- gnu::gcj::convert::IOConverter::iconv_init (void)
- {
-  // Some versions of iconv() always return their UCS-2 results in
-  // big-endian order, and they also require UCS-2 inputs to be in
-  // big-endian order.  For instance, glibc 2.1.3 does this.  If the
-  // UTF-8=>UCS-2 iconv converter has this feature, then we assume
-  // that all UCS-2 converters do.  (This might not be the best
-  // heuristic, but is is all we've got.)
-  jboolean result = false;
-#ifdef HAVE_ICONV
-  iconv_t handle = iconv_open ("UCS-2", "UTF-8");
-  if (handle != (iconv_t) -1)
-    {
-      jchar c;
-      unsigned char in[4];
-      char *inp, *outp;
-      size_t inc, outc, r;
-
-      // This is the UTF-8 encoding of \ufeff.  At least Tru64 UNIX libiconv
-      // needs the trailing NUL byte, otherwise iconv fails with EINVAL.
-      in[0] = 0xef;
-      in[1] = 0xbb;
-      in[2] = 0xbf;
-      in[3] = 0x00;
-
-      inp = (char *) in;
-      inc = 4;
-      outp = (char *) &c;
-      outc = 2;
-
-      r = iconv_adapter (iconv, handle, &inp, &inc, &outp, &outc);
-      // Conversion must be complete for us to use the result.
-      if (r != (size_t) -1 && inc == 0 && outc == 0)
-	result = (c != 0xfeff);
-
-      // Release iconv handle.
-      iconv_close (handle);
-    }
-#endif /* HAVE_ICONV */
-  return result;
-+  return false;
- }
- 
- void
Author	SHA1	Message	Date
Oliver Smith	2dddc6d224	temp/calamares-extensions: fork, increase timeout (MR 3280) Increase the timeout for the PartitionJob from 2 min to 10 min, so it works on the PinePhone Pro with its 128 GiB eMMC. Related: https://github.com/calamares/calamares-extensions/pull/20 [ci:skip-vercheck]: forked pkg intentionally not having pkgrel=0	2022-07-11 21:33:01 +02:00
Martijn Braam	cbb3def4f0	device-pine64-pinephonepro: backport to stable	2022-07-11 21:32:40 +02:00
Oliver Smith	496e9f57cf	main/postmarketos-release-upgrade: upgrade to 1.2.1 (MR 3237) (cherry picked from commit `f7b5c3bed2`)	2022-06-15 13:16:19 +02:00
Oliver Smith	7388f558e0	main/postmarketos-release-upgrade: upgrade to 1.2.0 (MR 3232) Most importantly, this fixes upgrading to edge. Related: https://gitlab.com/postmarketOS/postmarketos-release-upgrade/-/tags/1.2.0 (cherry picked from commit `01e348b3a5`)	2022-06-14 10:20:28 +02:00
Alexander Martinz	e38f26e382	community/linux-postmarketos-qcom-sdm845: upgrade to 5.18.3 (MR 3213) For a merge list, please see the merge commits: - 5.18.1 - (https://gitlab.com/sdm845-mainline/linux/-/commit/3d98cf52b5d07eeac01a03c86325c9c48f39e9c4) - 5.18.2 - (https://gitlab.com/sdm845-mainline/linux/-/commit/99cf0d285f5059176ab59b14b3b1dff8002f1407) - 5.18.3 - (https://gitlab.com/sdm845-mainline/linux/-/commit/b425b70a6379f3415ed349f5c5719d4a6f315523) ----- This also changes the following Kconfig options: - CONFIG_SCSI_UFS_BSG -> y Change-Id: I4406f381b48a894ea0bff3006fb3fa62683e61a0 Signed-off-by: Alexander Martinz <amartinz@shiftphones.com> [ci:skip-build]: already built successfully in CI (cherry picked from commit `cdc9bb564b`)	2022-06-14 10:15:13 +02:00
Oliver Smith	7afc86bdf4	main/postmarketos-release-upgrade: upgrade to 1.1.2 (MR 3227) (cherry picked from commit `b3a26d80b7`)	2022-06-12 14:10:47 +02:00
Oliver Smith	fb7de042f5	main/postmarketos-welcome: upgrade to 0.5.0 (MR 3226) (cherry picked from commit `bd5fe72ccf`)	2022-06-12 13:11:32 +02:00
Oliver Smith	7c1796a807	cross/busybox-static-*: upgrade to 1.35.0-r14	2022-06-12 12:30:19 +02:00
Martijn Braam	9791afbdd1	device-pine64-pinetab: fix alsa ucm (MR 3218) [ci:skip-build] already built successfully in CI (cherry picked from commit `f321581f12`)	2022-06-11 15:36:31 -07:00
Oliver Smith	7c39d25650	main/postmarketos-welcome: upgrade to 0.4.2 (MR 3208) (cherry picked from commit `8c933ef9a0`)	2022-06-10 10:07:02 +02:00
Pablo Correa Gómez	75a7939a20	main/postmarketos-welcome: version provides (MR 3208) There was lately a discussion upstream due to apk 2.12.10 breaking some packages in aports[1]. The conclusion in IRC is that provides were designed to be either versioned or have a provider_priority. Otherwise, the provides will be treated as a "virtual package". Which is not what we want here. [1] https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10847 (cherry picked from commit `bec9861ec4`)	2022-06-10 10:06:55 +02:00
Yassine Oudjana	4c6c34794b	community/device-xiaomi-scorpio: disable GPU binning pass (MR 3210) This is a workaround for a freedreno bug that causes some artifacts in GNOME and GTK4 apps. (cherry picked from commit `4da6031e8f`)	2022-06-09 08:55:35 +02:00
Syboxez Blank	ea3be30cf5	device: sdm845-{enchilada,fajita,beryllium,axolotl}: rename qcom_smb2 to qcom_pmi8998_charger (MR 3204) (cherry picked from commit `1770b37b60`)	2022-06-08 09:42:19 +02:00
Oliver Smith	89d65fd4ea	main/postmarketos-welcome: upgrade to 4.0.0 (MR 3207) [ci:skip-vercheck]: postmarketos-ui-phosh change in _pmb_recommends doesn't need a version bump (cherry picked from commit `5eeb86a419`)	2022-06-08 01:27:50 +02:00
Minecrell	0ae07e41e1	community/linux-asus-me176c: fix build by updating kernel config Run "pmbootstrap kconfig migrate asus-me176c" to update the kernel config for the new Linux version. Otherwise there is an interactive prompt that times out on BPO (although it succeeds on GitLab CI for some strange reason). (cherry picked from commit `dcfaa6acc2`)	2022-06-07 19:43:43 +02:00
Oliver Smith	a702d17dae	main/postmarketos-release-upgrade: new aport (MR 3197) [ci:skip-build]: already built successfully in CI (cherry picked from commit `8c4e11ab5b`)	2022-06-07 09:47:55 +02:00
Minecrell	b7ad0a121c	community/device-asus-me176c: install vulkan/libva driver if needed (MR 3195) Add subpackages that automatically cause installation of the Vulkan and libva driver if packages using them get installed. This reduces the size of a minimal rootfs but still ensures those are present if needed. [ci:skip-build]: already built successfully in CI (cherry picked from commit `62f0d60ef7`)	2022-06-07 08:28:24 +02:00
Minecrell	c22e73b1a8	community/linux-asus-me176c: upgrade to 5.4.197 (MR 3195) The new linux-edge / 5.18 kernel will likely not make it in time for the v22.06 release so let's upgrade the good old 5.4 kernel to the latest stable release at least. (cherry picked from commit `635906b9aa`)	2022-06-07 08:24:25 +02:00
Oliver Smith	a214fea54b	Revert "main/postmarketos-ui-phosh: add yelp to _pmb_recommends (MR 2832)" (MR 3196) The patch was meant well. But there are problems with yelp in its current form in postmarketOS: * It's practically empty. In the default install, there is only one application that has some sort of help text, which is Chatty. But when you click on the entry, there is only one line of generic information about the app. Not useful for users. * Yelp is not adapted for small screens, the one line of help text is cut off on the PinePhone. So let's not ship it by default in edge and v22.06 for now. This reverts commit `5ef50b12f2`. [ci:skip-vercheck]: modifying _pmb_recommends doesn't need a version bump. (cherry picked from commit `5be7308c82`)	2022-06-07 08:18:32 +02:00
Oliver Smith	b5d6e46309	CI: test_ui: get arches from pmaports.cfg (MR 3205) Don't assume that each branch has all arches that pmbootstrap supports, instead add them to pmaports.cfg and read them from there. This should allow the test to pass on v22.06. (cherry picked from commit `5d4d9c80cd`)	2022-06-07 08:06:35 +02:00
Martijn Braam	58d6bf64d0	device-pine64-pinebookpro: fix alsa ucm (MR 3203) [ci:skip-build]: already built successfully in CI (cherry picked from commit `bda72ea7fc`)	2022-06-07 07:44:44 +02:00
Martijn Braam	409a45159b	main/postmarketos-ui-gnome: autostart bluetooth service (MR 3202) (cherry picked from commit `1f3c16ca9c`)	2022-06-07 07:44:36 +02:00
Yassine Oudjana	87d1320846	community/linux-postmarketos-qcom-msm8996: upgrade to 5.18.1 (MR 3183) [ci:skip-build]: already built successfully in CI (cherry picked from commit `b47461fa75`)	2022-06-06 09:42:59 +02:00
Dylan Van Assche	32d55a8b8e	device-odroid-hc2: enable Samsung JPEG encoder (MR 3191) Add missing firmware from linux-firmware-other to enable Samsung JPEG hardware encoder [ci:skip-build]: already built successfully in CI (cherry picked from commit `8848527c22`)	2022-06-06 09:39:18 +02:00
Dylan Van Assche	756b6daa74	linux-odroid-hc2: upgrade to 5.18.1 (MR 3191) (cherry picked from commit `7a0e90c2fb`)	2022-06-06 09:39:08 +02:00
Minecrell	5eb4f4a306	community/linux-postmarketos-qcom-msm8916: upgrade to 5.18 (MR 3189) - Update to Linux 5.18 - Fix Bluetooth startup problem - Upstreamed not so many patches this time - Even more things I forgot than usual... pmOS kernel config: - Enable BNEP, RFCOMM for extra BT features Device changes: - samsung-j3ltetw/j5/j5x: - Now covered by a common device tree include - Add proper display driver (no brightness control yet) - Hall sensor (except j3ltetw) - Touchscreen (only j3ltetw and j5x, j5 is still WIP) - Sound/Modem for all of them New devices: - samsung-grandmax (Samsung Galaxy Grand Max) - eMMC, SD card, USB, Buttons, WiFi/BT, Vibrator - Display - Touchscreen - Sensors (Accelerometer) - Sound/Modem - Battery status [ci:skip-build]: already built successfully in CI (cherry picked from commit `fa93f361b5`)	2022-06-06 09:12:15 +02:00
Sicelo A. Mhlongo	ecac330696	nokia-n900: drop weston subpackage (MR 3174) Drop the weston config, as it was for fbdev which has not been supported in weston anymore for a while. Remove Martijn as Co-Maintainer, as both previous maintainers of the Nokia N900 stopped maintaining it when the device was briefly dropped from community. Co-Authored-By: Oliver Smith <ollieparanoid@postamrketos.org> [ci:skip-build]: already built successfully in CI (cherry picked from commit `ba3731956d`)	2022-06-03 10:01:54 +02:00
Sicelo A. Mhlongo	c21224419b	linux-nokia-n900: upgrade to 5.18.1 (MR 3174) Drop 0002-ARM-dts-n900-remove-rx51-battery.patch, because this wasn't needed for postmarketOS in the first place. The patch was created for Maemo Leste as upower quirk initially and they don't carry it anymore either. Drop other patches, as they have been upstreamed. Co-Authored-By: Oliver Smith <ollieparanoid@postmarketos.org> (cherry picked from commit `90c71ce639`)	2022-06-03 10:01:43 +02:00
Caleb Connolly	587043b8de	community/linux-postmarketos-qcom-sdm845: upgrade to 5.18.0 (MR 3143) [ci:skip-build]: already built successfully in CI (cherry picked from commit `e820b4171d`)	2022-06-03 09:25:43 +02:00
Uli Roth	7ecabe0679	device-xiaomi-beryllium: Fix touchscreen in initramfs for ebbg panels (MR 3184) [ci:skip-build] already built successfully in CI (cherry picked from commit `7b10f19396`)	2022-06-03 09:18:39 +02:00
Clayton Craft	86effa48c9	linux-postmarketos-rockchip: upgrade to 5.18 (MR 3170) Dropped the usb-c patches, because it looks like usb-c charging works now out of the box on 5.18, and that was the primary reason for me to include those patches here originally. [ci:skip-build] already built successfully in CI (cherry picked from commit `2dd5a5ab0f`)	2022-06-01 21:43:44 -07:00
Anjandev Momi	6466f14ab6	add pinephone-keyboard config (MR 3175) closes #1515 This patch HAS NOT been tested to see if it actually fixes #1515. I do not have my pinephone keyboard with me and will not till v22.06 is out. Can someone please test this patch before merging? Note: this is being merged upstream but needs a refactor of the Makefile. See: https://lists.sr.ht/~mil/sxmo-devel/patches/32630 Since we cannot get the refactor of the Makefile out before the next release, this is the next best thing [ci:skip-build] already built successfully in CI. (cherry picked from commit `620082575d`)	2022-06-01 21:15:43 -07:00
Minecrell	c083b913c6	community/firmware-qcom-db410c: upgrade to 1036.1 (except -wcnss) (MR 3163) While the newer "Linux board support package" has newer versions for the "modem" and "venus" firmware, the "wcnss" firmware is actually older than the one in the previous 1034.2.1 release. To avoid downgrading it, it is still packaged from the old release in a separate APKBUILD. (It is probably also better tested than the new release...) [ci:skip-vercheck]: non-zero pkgrel is intended to match old package [ci:skip-build] already built successfully in CI (cherry picked from commit `ac86b5e760`)	2022-06-01 21:13:27 -07:00
Bart Ribbers	01e6996a8e	temp/gtk4.0: fix Plasma Mobile virtual keyboard not opening on GTK apps (MR 3182) pmOS equivalent of https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/34970	2022-06-01 10:43:40 +02:00
Bart Ribbers	cce4bf986b	temp/gtk+3.0: fix Plasma Mobile virtual keyboard not opening on GTK apps (MR 3182) pmOS equivalent of https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/34970	2022-06-01 10:43:25 +02:00
Bart Ribbers	00b379773b	temp/i3blocks: backport to v22.06 (MR 3178) The i3 UI used by the N900 uses it but it's still in Alpine testing	2022-05-31 11:13:09 +02:00
Oliver Smith	de11eb1060	CI: remove x86 Remove CI for x86, as it's not supported on stable.	2022-05-31 08:43:30 +02:00
Newbyte	d37968c508	linux-postmarketos-exynos4: upgrade to 5.18.0 (MR 3168) Dropped patch was upstreamed. [ci:skip-build] Already built successfuly on CI in MR	2022-05-30 19:09:39 +02:00
Johannes Marbach	a0ba3764fb	main/postmarketos-mkinitfs: Correctly set up udev (MR 3146) This replaces the previous `udevadm test` hack with a combination of `udevd`, `udevadm trigger` and `udevadm settle` in order to coldplug all available devices and make them available for use via libinput / unl0kr. Relates to: #1411 [ci:skip-build] already built successfully in CI (cherry picked from commit `aa0f96edb9`)	2022-05-29 12:08:06 -07:00
Luca Weiss	d45bce7310	temp/xf86-video-opentegra: remove (MR 3165) Fails to build and not used by any device on v22.06.	2022-05-28 13:06:24 +02:00
Newbyte	7a56e9d162	main/postmarketos-ui-phosh: add karlender to _pmb_recommends (MR 3141) Karlender fits well into GNOME and fills the lack of a calendar app in Phosh. [ci:skip-vercheck] (cherry picked from commit `c528aba4ff`)	2022-05-27 20:05:20 +02:00
Martijn Braam	b68e0f9f35	device/pine64-pinephone: increase lima timeout (MR 3070) The lima timeout is increased to 2000ms to prevent an issue where the screen starts flickering between 2 frames when the CPU load is high. For details see https://gitlab.com/postmarketOS/pmaports/-/issues/805 Cherry picking note: we already had this in v22.06 and not in edge, since it's masking a bigger issue. applying the patch to v22.12 as well. Related: issue 805 (cherry picked from commit `606c55ed3c`)	2022-05-27 19:46:47 +02:00
Oliver Smith	d302ebf503	non-free/sgx-ddk-um: remove (MR 3162) Only makes sense with mesa-pvr-dri-classic, which was dropped in the previous commit. See the reasoning there. (cherry picked from commit `cecfb418c0`)	2022-05-27 19:12:38 +02:00
Oliver Smith	ac65f1ae4e	main/mesa-pvr-dri-classic: remove (MR 3162) We decided against pvr hacks, quoting craftyguy from issue 1316: > We discussed this in our team meeting, and ultimately decided that > supporting pvr in pmaports/pmOS has many of the same problems that > we saw when trying to support hallium/libhybris, something we > decided against. For much of the same reasons, we've decided that we > want to avoid adding the proprietary userspace components required to > support pvr in pmOS. No device port is using this package anymore, but we forgot to remove it. After branching v22.06 I realized that it doesn't build anymore and as stated in MR 2702, it's unmaintained. Related: https://builds.sr.ht/~postmarketos/job/767700 (cherry picked from commit `023f8cc1c3`)	2022-05-27 19:12:22 +02:00
Newbyte	574e6c5885	main/postmarketos-ui-lxqt: drop The entire LXQt stack is in testing.	2022-05-25 11:23:58 +02:00
Oliver Smith	001e77a9dc	temp/oil: remove	2022-05-25 09:28:49 +02:00
Oliver Smith	16fe34446d	temp/f_scripts: remove	2022-05-25 09:28:49 +02:00
Oliver Smith	3482f7da22	main/postmarketos-ui-framebufferphone: remove This depends on too many packages that are still in Alpine testing, so we decided to remove it. If somebody wants to bring it back to stable, create a MR with all missing dependencies to v22.06, and we can include it in a service pack. Related: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13857	2022-05-25 09:28:35 +02:00
Newbyte	4b16a4c44e	temp/evince: fix build with Meson 0.60 (MR 3155) [ci:skip-build]: already built successfully in CI (cherry picked from commit `c4838be834`)	2022-05-25 09:19:35 +02:00
Luca Weiss	ecaacb4b83	cross/gcc4-armv7: regenerate to fix build (MR 3156) [ci:skip-build]: already built successfully in CI (cherry picked from commit `b265acd927`)	2022-05-25 09:14:56 +02:00
Luca Weiss	2b38f9e25f	cross/gcc4-aarch64: regenerate to fix build (MR 3156) (cherry picked from commit `e0921b64c3`)	2022-05-25 09:14:49 +02:00
Oliver Smith	2c73d542d8	CI: remove build-armhf	2022-05-25 09:06:25 +02:00
Bart Ribbers	0bb85661d2	temp/f_scripts: fork from Alpine	2022-05-25 00:04:05 +02:00
Bart Ribbers	3bd96b82a8	temp/oil: fork from Alpine	2022-05-25 00:03:32 +02:00
Luca Weiss	980e9c1f2f	temp/gtk+3.0: fix build (MR 3154) Fix the build failure when built with newer gcc: ../gtk/gtktextsegment.c: In function '_gtk_toggle_segment_new': ../gtk/gtktextsegment.c:433:6: error: array subscript 'GtkTextLineSegment {aka struct _GtkTextLineSegment}[0]' is partly outside array bounds of 'unsigned char[40]' [-Werror=array-bounds] 433 \| seg->type = on ? &gtk_text_toggle_on_type : &gtk_text_toggle_off_type; \| ^~ Patch source: https://gitlab.gnome.org/GNOME/gtk/-/commit/b4e110920aa18e6cc149ccbbfcd90b5143526e6d (cherry picked from commit `f8b96744fa`)	2022-05-24 23:51:05 +02:00
Luca Weiss	987422520d	main/gcc6: fix build (MR 3153) Fix the build failure when built with newer gcc: /home/pmos/build/src/gcc-6.4.0/gcc/config/i386/i386.c: In function 'int function_arg_advance_32(CUMULATIVE_ARGS*, machine_mode, const_tree, long int, long int)': /home/pmos/build/src/gcc-6.4.0/gcc/config/i386/i386.c:8743:18: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive] 8743 \| bool error_p = NULL; \| ^~~~ Patch source: https://svnweb.freebsd.org/ports/head/lang/gcc7/files/patch-gcc_config_i386_i386.c?view=markup&pathrev=545751 (cherry picked from commit `d23fd662f2`)	2022-05-24 23:49:46 +02:00
Luca Weiss	ed9b6248e4	main/gcc4: fix build (MR 3152) Fix the build failure when built with newer gcc: /home/pmos/build/src/gcc-4.9.2/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 89 \| (this_target_reload->x_spill_indirect_levels) \| ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~ /home/pmos/build/src/gcc-4.9.2/gcc/reload1.c:444:7: note: in expansion of macro 'spill_indirect_levels' 444 \| spill_indirect_levels++; \| ^~~~~~~~~~~~~~~~~~~~~ Patch source: https://github.com/ChrisMacGregor/esp-open-sdk/blob/master/1001-fix-reload1-compile-error.patch (cherry picked from commit `19809ae262`)	2022-05-24 23:06:34 +02:00
Luca Weiss	07b1c92f61	temp/android-tools: remove (MR 3151) The bug that caused us to fork this package has been resolved upstream. Tested by downgrading FP2 bootloader to a version susceptible to this bug: ~ # ./fastboot-31.0.0p1-r2 flash boot boot.img fastboot: error: Couldn't parse partition size '0x'. ~ # ./fastboot-31.0.3p1-r4 flash boot boot.img Sending 'boot' (11666 KB) OKAY [ 0.367s] Writing 'boot' OKAY [ 0.276s] Finished. Total time: 0.670s (cherry picked from commit `f41e08f9e9`)	2022-05-24 23:04:44 +02:00
Bart Ribbers	ff835a5483	{device/{testing,unmaintained},cross,main/postmarketos-ui-asteroid}: drop	2022-05-24 09:36:47 +02:00
Bart Ribbers	b2eb3ad213	main/postmarketos-base: update os-release to v22.06	2022-05-24 09:35:43 +02:00
Bart Ribbers	83b4e0e1b8	Create v22.06 branch [skip-ci]	2022-05-24 08:52:45 +02:00