main/postmarketos-base-ui: show EOL notice

Newbyte:
In preperation for tomorrow's EOL:ing of v24.06.

See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3391

.ci/apkbuild-lint.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/commits.sh

@@ -11,7 +11,7 @@ if [ "$(id -u)" = 0 ]; then
 	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
 	# already downloads and runs install_pmbootstrap.sh.
 	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 		sh ./install_pmbootstrap.sh
 	fi
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"

.ci/grep.sh

@@ -57,7 +57,7 @@ fi
 
 POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
 # The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
+# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \

.ci/kconfig.sh

@@ -6,7 +6,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/build_changed_aports.sh

@@ -5,7 +5,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/lib/check_changed_aports_versions.py

@@ -16,8 +16,7 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
 
-
-def get_package_version(args, package, revision, check=True):
+def get_package_contents(args, package, revision, check=True):
     # Redirect stderr to /dev/null, so git doesn't complain about files not
     # existing in upstream branch for new packages
     stderr = None
@@ -40,6 +39,15 @@ def get_package_version(args, package, revision, check=True):
             handle.write(apkbuild_content)
         parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
 
+    return parsed
+
+
+def get_package_version(args, package, revision, check=True):
+    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
+        matching package is found """
+    parsed = get_package_contents(args, package, revision, check)
+    if parsed is None:
+        return None
     return parsed["pkgver"] + "-r" + parsed["pkgrel"]
 
 
@@ -112,6 +120,40 @@ def check_versions(args, packages):
                 print(f"- {package}: {head} (HEAD) (new package)")
             continue
 
+        # Check pkgver follows expected format for device packages
+        pkgver = head.rpartition('-r')[0]
+        if package.startswith('device-') and not pkgver.isdigit():
+            print(f" - {package}: invalid pkgver \"{pkgver}\""
+                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+            error = True
+
+        # Additional checks for device packages
+        if package.startswith('device-'):
+            head_parsed = get_package_contents(args, package, "HEAD", False)
+            upstream_parsed = get_package_contents(args, package, commit, False)
+
+            # checksums did not change
+            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
+                # Check that pkgver did not change
+                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should not change when package source checksums did not change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # We do not check for a bumped pkgrel, because not everything
+                # needs it, e.g: pmb_recommends
+            # checksums changed
+            else:
+                # Check that pkgrel was reset to 0
+                if head_parsed["pkgrel"] != "0":
+                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # Check that pkgver was changed
+                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should change when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+
         # Compare head and upstream versions
         result = pmb.parse.version.compare(head, upstream)
         if result != 1:

.ci/lib/check_devices_in_wiki.py

@@ -106,7 +106,7 @@ def main():
     # Ask to adjust the wiki
     if error:
         print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \o/")
+        print("Thank you for porting postmarketOS to a new device! \\o/")
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")

.ci/lib/common.py

@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
     """ Add a remote pointing to postmarketOS/pmaports. """
     run_git(["remote", "add", "upstream",
-             "https://gitlab.com/postmarketOS/pmaports.git"], False)
+             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
     run_git(["fetch", "-q", "upstream"])
 
 
@@ -59,6 +59,11 @@ def get_upstream_branch():
         channels.cfg from master to retrieve the upstream branch.
 
         :returns: branch name, e.g. "v20.05" """
+
+    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
+    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
+        return target_branch
+
     global cache
     if "upstream_branch" in cache:
         return cache["upstream_branch"]
@@ -130,27 +135,28 @@ def get_changed_packages_sanity_check(count):
         return
 
     branch = get_upstream_branch()
-    print()
-    print("ERROR: Too many packages have changed!")
-    print()
-    print("This is a sanity check, so we don't end up building packages that")
-    print("have not been modified. CI won't run for more than three hours")
-    print("anyway.")
-    print()
-    print("Your options:")
-    print("a) If you *did not* modify everything listed above, then rebase")
-    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
-    print("   branch. Feel free to ask in the chat for help if you need any.")
-    print("b) If you *did* modify all these packages, and you assume that")
-    print("   they will build within one hour: skip this sanity check by")
-    print("   adding '[ci:ignore-count]' to the commit message (then force")
-    print("   push).")
-    print("c) If you *did* modify all these packages, and you are sure that")
-    print("   they won't build in time, please add '[ci:skip-build]' to the")
-    print("   commit message (then force push). Make sure that all packages")
-    print("   build with 'pmbootstrap build --strict'!")
-    print()
-    print("Thank you and sorry for the inconvenience.")
+    print(f"""
+ERROR: Too many packages have changed!
+
+This is a sanity check, so we don't end up building packages that
+have not been modified. CI won't run for more than three hours
+anyway.
+
+Your options:
+a) If you *did not* modify everything listed above, then rebase
+   your branch on the official postmarketOS/pmaports.git {branch}
+   branch. Feel free to ask in the chat for help if you need any.
+b) If you *did* modify all these packages, and you assume that
+   they will build within one hour: skip this sanity check by
+   adding '[ci:ignore-count]' to the commit message of the last
+   commit in the merge request (then force push).
+c) If you *did* modify all these packages, and you are sure that
+   they won't build in time, please add '[ci:skip-build]' to the
+   commit message (then force push). Make sure that all packages
+   build with 'pmbootstrap build --strict'!
+
+Thank you and sorry for the inconvenience.
+    """)
 
     sys.exit(1)
 

.ci/pytest.sh

@@ -8,7 +8,7 @@
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh pytest
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

.ci/ruff.sh

@@ -11,4 +11,4 @@ fi
 set -x
 
 # shellcheck disable=SC2046
-ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')

.ci/shellcheck.sh

@@ -23,7 +23,6 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
-	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -34,7 +34,7 @@ def path_pmbootstrap():
             return directory
 
     # Symlink not set up properly
-    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
+    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
     sys.exit(1)
 
 

.ci/testcases/test_device.py

@@ -61,14 +61,6 @@ def test_aports_device(args):
         if "!archcheck" not in apkbuild["options"]:
             raise RuntimeError("!archcheck missing in options= line: " + path)
 
-        if deviceinfo["flash_kernel_on_update"] == "true" \
-                and "postmarketos-update-kernel" not in apkbuild["depends"]:
-            raise RuntimeError(
-                "Deviceinfo indicates this device supports automatic kernel"
-                " flashing on update, but doesn't depend on"
-                " 'postmarketos-update-kernel'. Please add the missing"
-                " dependency.")
-
 
 def test_aports_device_kernel(args):
     """

.ci/testcases/test_directory_structure.py

@@ -6,10 +6,10 @@ import stat
 
 expected_directories = [
     "cross",
+    "device/archived",
     "device/community",
     "device/main",
     "device/testing",
-    "device/unmaintained",
     "main",
     "modem",
     "non-free",
@@ -28,7 +28,7 @@ def test_directories():
 
 
 # Ensure no file in pmaports are executable.
-# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
+# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
     for file in glob.iglob("[!temp]**/**/*", recursive=True):
         if os.path.isdir(file) or os.path.islink(file):

.gitlab-ci.yml

@@ -1,36 +1,37 @@
 ---
 
 # global settings
-image: alpine:edge
+image: alpine:latest
+before_script: &global_before_scripts
+  - apk upgrade -U
 after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
+variables:
+  PMBOOTSTRAP_TAG: 2.3.x
 
-# defaults for "only"
-# We need to run the CI jobs in a "merge request specific context", if CI is
-# running in a merge request. Otherwise the environment variable that holds the
-# 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.
-# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
-.only-default: &only-default
-  only:
-    - master
-    - merge_requests
-    - tags
+# This defines the rules for when a pipeline should run.
+workflow:
+  rules:
+    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
+      when: never
+    # Run for merge requests
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # Run scheduled pipeline for autoupdate
+    - if: $CI_PIPELINE_SOURCE == "schedule"
 
 # device documentation
 wiki:
   stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/wiki.sh
@@ -38,16 +39,12 @@ wiki:
 # testcases linting
 ruff:
   stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - .ci/*
-      - .ci/*/*
-      - .gitlab-ci.yml
-  before_script:
-    - "echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/*
+        - .ci/*/*
+        - .gitlab-ci.yml
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ruff.sh
@@ -55,8 +52,9 @@ ruff:
 # shellcheck and various grep checks
 shellcheck-grep:
   stage: lint
-  <<: *only-default
   image: alpine:edge
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
@@ -65,8 +63,9 @@ shellcheck-grep:
 
 editor-config:
   stage: lint
-  <<: *only-default
   image: alpine:edge
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ec.sh
@@ -74,7 +73,8 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
   stage: lint
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
@@ -90,23 +90,21 @@ pytest-commits:
 # APKBUILD linting
 aport-lint:
   stage: lint
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/apkbuild-lint.sh
-  only:
-    - merge_requests
   allow_failure: true
 
 # kernel kconfig check
 kernel-kconfig:
   stage: lint
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - device/*/linux-*/config-*
+        - main/linux-*/config-*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
@@ -115,19 +113,22 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
   stage: lint
-  only:
-    - merge_requests
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
+    - *global_before_scripts
     - apk -q add python3
   script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
 # build changed aports
 .build:
   stage: build
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   before_script:
+    - *global_before_scripts
     - .ci/lib/gitlab_prepare_ci.sh
   after_script:
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
@@ -142,11 +143,6 @@ build-x86_64:
   script:
     - .ci/build-x86_64.sh
 
-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
 build-aarch64:
   extends: .build
   script:
@@ -156,13 +152,3 @@ build-armv7:
   extends: .build
   script:
     - .ci/build-armv7.sh
-
-build-armhf:
-  extends: .build
-  script:
-    - .ci/build-armhf.sh
-
-build-riscv64:
-  extends: .build
-  script:
-    - .ci/build-riscv64.sh

.gitlab/issue_templates/Default.md

@@ -1,6 +1,12 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following :
+	we would like you to fill in the following form.
+
+	*** NOTE FOR CONFIDENTIAL ISSUES: ***
+	A lot of people can read confidential pmaports issues! If you want to
+	submit something that only the postmarketOS Core Team can see, write to
+		team@postmarketos.org
+	instead of opening an issue here!
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -22,7 +28,6 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.12`
-* [ ] `v23.06` (supported until 2024-01-18)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 

CODEOWNERS

@@ -2,21 +2,26 @@
 # Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
 # Order lines alphabetically!
 
-device/*/*-amlogic-s905*/			@vitali64yt
+device/*/*-amlogic-s905*/			@funderscore
 device/*/*-arrow-db410c/			@Minecrell
 device/*/*-asus-me176c/				@Minecrell
+device/*/*-ayn-odin/				@jenneron
 device/*/*-bq-paella/				@Minecrell
+device/*/*-bq-tenshi/				@fossdd
 device/*/*-google-gru/				@jenneron
 device/*/*-google-kukui/			@jenneron @binarycraft
 device/*/*-google-oak/				@jenneron @adamthiede
 device/*/*-google-trogdor/			@jenneron
 device/*/*-google-veyron/			@jenneron
 device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
-device/*/*-htc-golfu/				@Newbyte
 device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-lenovo-21bx/				@craftyguy
+device/*/*-kobo-clara/				@akemnade
+device/*/*-lenovo-21bx/				@craftyguy @jane400
 device/*/*-lenovo-a6000/			@jenneron @Minecrell
 device/*/*-lenovo-a6010/			@jenneron @Minecrell
+device/*/*-librecomputer-lafrite/		@funderscore
+device/*/*-librecomputer-lepotato/		@funderscore
+device/*/*-librecomputer-solitude/		@Newbyte @funderscore
 device/*/*-motorola-harpia/			@Minecrell
 device/*/*-nokia-n900/				@sicelo @Danct12
 device/*/*-pine64-pinebookpro/			@QC8086
@@ -35,8 +40,11 @@ device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
 device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
+device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
+device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-serranove/			@Minecrell
-device/*/*-videostrong-kii-pro/			@vitali64yt
+device/*/*-tolino-shine2hd/			@akemnade
+device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
@@ -47,27 +55,29 @@ device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
+device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/device-fairphone-*/			@z3ntu
+device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
 device/*/device-google-snow/			@jenneron
-device/*/device-huawei-plank/			@gtrxAC
 device/*/device-lg-judyln/			@Newbyte
 device/*/device-lg-judyp/			@jenneron
 device/*/device-microsoft-surface-rt/		@jenneron @jethrob
-device/*/device-nvidia-tegra-armv7/		@clamor95 @okias @mschwalm @nokun
+device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
 device/*/device-odroid-xu4/			@Grimler
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
-device/*/device-qemu-riscv64/			@Minecrell @z3ntu
+device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/device-samsung-j5y17lte/	@andrisas
 device/*/device-samsung-klimtlte/		@Grimler
+device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
 device/*/device-samsung-manta/			@jenneron @alexmrqt
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
@@ -75,19 +85,19 @@ device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/firmware-powervr-gx6250/		@jenneron
+device/*/kobo-epdc-extractor/			@akemnade
 device/*/linux-google-nyan/			@jenneron
 device/*/linux-google-veyron/			@jenneron
-device/*/linux-huawei-plank/			@gtrxAC
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
-device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
+device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
+device/*/linux-postmarketos-imx-ereader/	@akemnade
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
-device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
-device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu
+device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
 device/*/linux-postmarketos-qcom-sc7180/	@jenneron
 device/*/linux-postmarketos-rockchip/		@QC8086
@@ -108,7 +118,6 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
-main/postmarketos-ui-plasma-mobile/		@bshah
-main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff

channels.cfg

@@ -1,57 +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
-
-[v23.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v23.12
-branch_aports=3.19-stable
-mirrordir_alpine=v3.19
-
-[v23.06]
-description=Old release (unsupported)
-branch_pmaports=v23.06
-branch_aports=3.18-stable
-mirrordir_alpine=v3.18
-
-[v22.12]
-description=Old release (unsupported)
-branch_pmaports=v22.12
-branch_aports=3.17-stable
-mirrordir_alpine=v3.17
-
-[v22.06]
-description=Old release (unsupported)
-branch_pmaports=v22.06
-branch_aports=3.16-stable
-mirrordir_alpine=v3.16
-
-[v21.12]
-description=Old release (unsupported)
-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

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=21
+pkgrel=29
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -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.20.apk::$_mirror/v3.20/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.20.apk
 	rm .PKGINFO .SIGN.*
 }
 
 sha512sums="
-0a234d00087f85ba8b21d014c38535947ae087df94c18a174717452c91f732489d258394bf616fecae94259e1c932edcf8ea1dcf4aacf6eb803064e3b3587a78  busybox-static-1.36.1-r21-aarch64-edge.apk
+a90e30c6d373665aa30c0fc3eb74a34180d5d56ddd5e296616baf46802addf39a243370987b43495ead70fe0ed47251b81e31c77dd3a4c309ae5e76b7c50f738  busybox-static-1.36.1-r29-aarch64-v3.20.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -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.36.1
-pkgrel=21
-
-_arch="armhf"
-_mirror="http://dl-4.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="
-0f8c600ff2fe1a176503e44924dfdd7520615b3be8e5e84b5fa869c543d43ee7a5307cdf7b8b46effbf8f393682566fa76a9368bcb228e4b44d800ef7c01b888  busybox-static-1.36.1-r21-armhf-edge.apk
-"

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=21
+pkgrel=29
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -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.20.apk::$_mirror/v3.20/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.20.apk
 	rm .PKGINFO .SIGN.*
 }
 
 sha512sums="
-441ff2d84e385408671c34f891dbe245a3b3c16668f6c985786067fad093c0d218e85695c0604d3f8364b750ff7e7eb4ee00af089ed198d419300b2d4e3edf61  busybox-static-1.36.1-r21-armv7-edge.apk
+a4a364d5957aa556c1660ea47e5e45fd882644bb468b6eea38fb1176f03f2106c14b7ac7b111d38a1c0df2e467a053d25efcab99b8c2c27a4a550286dbabeb02  busybox-static-1.36.1-r29-armv7-v3.20.apk
 "

cross/gcc-armhf/0001-posix_memalign.patch

@@ -1,42 +0,0 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
-
----
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3527283693b..c4071b64b53 100644
---- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
--   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
--extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
--extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
--  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
--- 
-2.41.0
-

cross/gcc-armhf/0002-gcc-poison-system-directories.patch

@@ -1,203 +0,0 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.cc          |  2 ++
- gcc/incpath.cc      | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 862c474d3c8..64c4277c991 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -711,6 +711,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one variable shadows another.  Same as -Wshadow=global.
-diff --git a/gcc/config.in b/gcc/config.in
-index 4cad077bfbe..0679fbbf4c6 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -236,6 +236,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index c7b26d1927d..8c46369f73f 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -1026,6 +1026,7 @@ enable_maintainer_mode
- enable_link_mutex
- enable_link_serialization
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1788,6 +1789,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 09082e8ccae..5504bf6eb01 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index af0e5933fdb..b6731a4673c 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
- -Wparentheses  -Wno-pedantic-ms-format
- -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
-+-Wno-poison-system-directories
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type
- -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
- 
-+@opindex Wno-poison-system-directories
-+@item -Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @opindex Wfloat-equal
- @opindex Wno-float-equal
- @item -Wfloat-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 16bb07f2cdc..33b56e721d2 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.cc b/gcc/incpath.cc
-index 4d44321183f..0f3f071b44c 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
--- 
-2.41.0
-

cross/gcc-armhf/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,44 +0,0 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
-
-Previously, we also used to turn on -z relro here, but we now build
-binutils with --enable-relro, which is functionally equivalent.
-
-Binutils does not appear to have a similar option for enabling -z
-now by default.
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b6731a4673c..f393c7846c6 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
- linker.  When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
-+
- @opindex u
- @item -u @var{symbol}
- Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 33b56e721d2..f82fae23c22 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
-    "%{flto|flto=*:%<fcompare-debug*} \
-     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-     %{Wno-poison-system-directories:--no-poison-system-directories} \
--- 
-2.41.0
-

cross/gcc-armhf/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch

@@ -1,46 +0,0 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
- ObjC, ObjC++, if the optimization level is > 0
-
----
- gcc/c-family/c-cppbuiltin.cc | 4 ++++
- gcc/doc/invoke.texi          | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
---- a/gcc/c-family/c-cppbuiltin.cc
-+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
-   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
-   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
- 
-+  /* Fortify Source enabled by default for optimization levels > 0 */
-+  if (optimize)
-+    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index f393c7846c6..ef3c14a189e 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
- 
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @opindex O3
- @item -O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
--- 
-2.41.0
-

cross/gcc-armhf/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch

@@ -1,272 +0,0 @@
-From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
- linker, but always link the sanitizer libraries with --no-as-needed.
-
----
- gcc/config/aarch64/aarch64-linux.h |  1 +
- gcc/config/alpha/linux-elf.h       |  2 +-
- gcc/config/arm/linux-elf.h         |  1 +
- gcc/config/gnu-user.h              |  6 +++---
- gcc/config/i386/gnu-user.h         |  2 +-
- gcc/config/i386/gnu-user64.h       |  1 +
- gcc/config/ia64/linux.h            |  2 +-
- gcc/config/mips/gnu-user.h         |  1 +
- gcc/config/riscv/linux.h           |  1 +
- gcc/config/rs6000/linux64.h        |  4 ++--
- gcc/config/rs6000/sysv4.h          |  2 +-
- gcc/config/s390/linux.h            |  2 +-
- gcc/config/sparc/linux.h           |  2 +-
- gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
- 14 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 4277f03da2a..b131983a546 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index 03f783f2ad1..d946e700dda 100644
---- a/gcc/config/alpha/linux-elf.h
-+++ b/gcc/config/alpha/linux-elf.h
-@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 7b7b7cbbe14..49c050c6f2c 100644
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index eda8010b133..b26b17f2f2a 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
-   "%{static-libasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBHWASAN_EARLY_SPEC
- #define LIBHWASAN_EARLY_SPEC "%{!shared:libhwasan_preinit%O%s} " \
-   "%{static-libhwasan:%{!shared:" \
-@@ -146,12 +146,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
- 
- #undef TARGET_F951_OPTIONS
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a79b739089d..e0752673dff 100644
---- a/gcc/config/i386/gnu-user.h
-+++ b/gcc/config/i386/gnu-user.h
-@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 3b63b99acf6..759bf0db86f 100644
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
-@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index 5dfd428aa17..02656dad7fc 100644
---- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index a4e5380b589..3cc61bce69f 100644
---- a/gcc/config/mips/gnu-user.h
-+++ b/gcc/config/mips/gnu-user.h
-@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 3e625e0f867..f8c2c351e5a 100644
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{mbig-endian:-EB} \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 9e457033d11..08016bf224d 100644
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -377,13 +377,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
--#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
--#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index ae932fc22f0..c8ff0c6dc8e 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
- #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 02aa1edaff8..64df5801134 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 0e33b3cac2c..c2f44546e62 100644
---- a/gcc/config/sparc/linux.h
-+++ b/gcc/config/sparc/linux.h
-@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index f82fae23c22..da6417dd0d1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -754,8 +754,11 @@ proper position among the other output files.  */
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
--		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -790,8 +793,11 @@ proper position among the other output files.  */
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
--		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -808,8 +814,11 @@ proper position among the other output files.  */
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
--		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -824,8 +833,11 @@ proper position among the other output files.  */
- #define STATIC_LIBUBSAN_LIBS \
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
--		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.41.0
-

cross/gcc-armhf/0006-Enable-Wformat-and-Wformat-security-by-default.patch

@@ -1,34 +0,0 @@
-From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
-
----
- gcc/c-family/c.opt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index a75038930ae..b98726f33ed 100644
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.  Same as -Wformat-overflow=1.
- 
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions.
- 
- Wformat-signedness
-@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
- Warn about zero-length formats.
- 
- Wformat=
--C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
- Warn about printf/scanf/strftime/strfmon format string anomalies.
- 
- Wformat-overflow=
--- 
-2.41.0
-

cross/gcc-armhf/0007-Enable-Wtrampolines-by-default.patch

@@ -1,25 +0,0 @@
-From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/35] Enable -Wtrampolines by default.
-
----
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 64c4277c991..c24839d32bc 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtrivial-auto-var-init
--- 
-2.41.0
-

cross/gcc-armhf/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch

@@ -1,53 +0,0 @@
-From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
- -ffreestanding Change the buffer size.
-
----
- gcc/gcc.cc     | 8 +++++++-
- gcc/params.opt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index da6417dd0d1..b5a6f200635 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -983,6 +983,12 @@ proper position among the other output files.  */
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1282,7 +1288,7 @@ static const char *cc1_options =
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
-- %{fsyntax-only:-o %j} %{-param*}\
-+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
-  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fprofile-generate*|coverage:\
-    %{!fprofile-update=single:\
-diff --git a/gcc/params.opt b/gcc/params.opt
-index 823cdb2ff85..5b096899b40 100644
---- a/gcc/params.opt
-+++ b/gcc/params.opt
-@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
- The maximum number of SSA_NAME assignments to follow in determining a value.
- 
- -param=ssp-buffer-size=
--Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
-+Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
- The lower bound for a buffer to be considered for stack smashing protection.
- 
- -param=stack-clash-protection-guard-size=
--- 
-2.41.0
-

cross/gcc-armhf/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

@@ -1,54 +0,0 @@
-From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
- gcc bootstrapping.
-
-Solves error messages like the following:
-
-msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
-
-The libgcc_s.so used during build doesn't satisfy the needs of the
-libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
-is used as a stand-alone application here, and what library it uses
-behind the scenes is of no concern to the gcc build process.
-Therefore, simply invoking it "as usual", i.e. without any special
-library path, will make it work as expected here.
-
-2011-09-19 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/372377
-https://bugs.gentoo.org/295480
----
- libstdc++-v3/po/Makefile.am | 1 +
- libstdc++-v3/po/Makefile.in | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index 12d34910830..61b13762b71 100644
---- a/libstdc++-v3/po/Makefile.am
-+++ b/libstdc++-v3/po/Makefile.am
-@@ -38,6 +38,7 @@ MSGFMT = msgfmt
- EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index 8e93445acd2..d6ff06e5ddb 100644
---- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -561,6 +561,7 @@ uninstall-am:
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
--- 
-2.41.0
-

cross/gcc-armhf/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch

@@ -1,28 +0,0 @@
-From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
-
----
- include/libiberty.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/libiberty.h b/include/libiberty.h
-index 1d5c779fcff..19e3cb1e31c 100644
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- /* Like asprintf but allocates memory without fail. This works like
-    xmalloc.  */
--- 
-2.41.0
-

cross/gcc-armhf/0011-libiberty-copy-PIC-objects-during-build-process.patch

@@ -1,24 +0,0 @@
-From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
-
----
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 72608f3e4a7..58356884728 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
--- 
-2.41.0
-

cross/gcc-armhf/0012-libgcc_s.patch

@@ -1,57 +0,0 @@
-From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/35] libgcc_s
-
----
- gcc/config/i386/i386-expand.cc | 4 ++--
- libgcc/config/i386/cpuinfo.c   | 6 +++---
- libgcc/config/i386/t-linux     | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
-index 0d817fc3f3b..2e99db00db9 100644
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init in libgcc.a.  */
- 	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 50b6d8248a2..724ced402a1 100644
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
- 			     __cpu_features2);
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
-diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 8506a635790..564296f788e 100644
---- a/libgcc/config/i386/t-linux
-+++ b/libgcc/config/i386/t-linux
-@@ -3,5 +3,5 @@
- # t-slibgcc-elf-ver and t-linux
- SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
- 
--HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
-+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
- CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--- 
-2.41.0
-

cross/gcc-armhf/0013-nopie.patch

@@ -1,75 +0,0 @@
-From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/35] nopie
-
----
- gcc/configure    | 27 +++++++++++++++++++++++++++
- gcc/configure.ac | 13 +++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/gcc/configure b/gcc/configure
-index 8c46369f73f..e59cbee1767 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -32268,6 +32268,33 @@ fi
- $as_echo "$gcc_cv_no_pie" >&6; }
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
-+$as_echo_n "checking for -nopie option... " >&6; }
-+if test "${gcc_cv_nopie+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int main(void) {return 0;}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  gcc_cv_nopie=yes
-+else
-+  gcc_cv_nopie=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LDFLAGS="$saved_LDFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
-+$as_echo "$gcc_cv_nopie" >&6; }
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 5504bf6eb01..57268319de1 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
-    LDFLAGS="$saved_LDFLAGS"])
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  AC_CACHE_CHECK([for -nopie option],
-+    [gcc_cv_nopie],
-+    [saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     AC_LINK_IFELSE([int main(void) {return 0;}],
-+       [gcc_cv_nopie=yes],
-+       [gcc_cv_nopie=no])
-+     LDFLAGS="$saved_LDFLAGS"])
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- AC_SUBST([NO_PIE_FLAG])
- 
--- 
-2.41.0
-

cross/gcc-armhf/0014-ada-fix-shared-linking.patch

@@ -1,42 +0,0 @@
-From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/35] 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 f2126441208..22cfa9c641f 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.41.0
-

cross/gcc-armhf/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,24 +0,0 @@
-From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
-
----
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 06a9398e172..6ff2b3f9925 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
- # built for the build system to override those in BASE_FLAGS_TO_PASS.
- EXTRA_BUILD_FLAGS = \
- 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
- 
- # This is the list of directories to built for the host system.
--- 
-2.41.0
-

cross/gcc-armhf/0016-add-fortify-headers-paths.patch

@@ -1,25 +0,0 @@
-From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/35] add fortify-headers paths
-
----
- gcc/config/linux.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index e3aca79cccc..b3537b8fbeb 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -159,6 +159,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- #ifdef NATIVE_SYSTEM_HEADER_DIR
- #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- #else
--- 
-2.41.0
-

cross/gcc-armhf/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,31 +0,0 @@
-From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
- link to it unconditionally, as otherwise we get link failures if some objects
- are -fstack-protector built and final link happens with -fno-stack-protector.
- This seems to be the common case when bootstrapping gcc, the piepatches do
- not seem to fully fix the crosstoolchain and bootstrap sequence wrt.
- stack-protector flag usage.
-
----
- gcc/gcc.cc | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index b5a6f200635..6cbb726599b 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -991,8 +991,7 @@ proper position among the other output files.  */
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
--- 
-2.41.0
-

cross/gcc-armhf/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch

@@ -1,69 +0,0 @@
-From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
- linking libtsan.
-
----
- gcc/gcc.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 6cbb726599b..59390fd39d6 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -755,10 +755,10 @@ proper position among the other output files.  */
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libasan:--push-state --no-as-needed}" \
- 		     " -lasan " \
- 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libasan:--pop-state}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -794,10 +794,10 @@ proper position among the other output files.  */
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libtsan:--push-state --no-as-needed}" \
- 		     " -ltsan " \
- 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libtsan:--pop-state}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -815,10 +815,10 @@ proper position among the other output files.  */
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-liblsan:--push-state --no-as-needed}" \
- 		     " -llsan " \
- 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-liblsan:--pop-state}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -834,10 +834,10 @@ proper position among the other output files.  */
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libubsan:--push-state --no-as-needed}" \
- 		     " -lubsan " \
- 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libubsan:--pop-state}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.41.0
-

cross/gcc-armhf/0019-aarch64-disable-multilib-support.patch

@@ -1,26 +0,0 @@
-From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/35] 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 57bf4100fcd..172894b57ef 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.41.0
-

cross/gcc-armhf/0020-s390x-disable-multilib-support.patch

@@ -1,25 +0,0 @@
-From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/35] 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.41.0
-

cross/gcc-armhf/0021-ppc64-le-disable-multilib-support.patch

@@ -1,81 +0,0 @@
-From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/35] 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 4e371255533..128c75c7d39 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 01a94242308..b3a76379c03 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.cc
- 	$(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.41.0
-

cross/gcc-armhf/0022-x86_64-disable-multilib-support.patch

@@ -1,26 +0,0 @@
-From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/35] 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 138956b0962..bc03dab874f 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.41.0
-

cross/gcc-armhf/0023-riscv-disable-multilib-support.patch

@@ -1,76 +0,0 @@
-From b26224acf342eacb33491f6ea0da1faf73d35715 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 23/35] 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 | 8 --------
- gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index f8c2c351e5a..8d9881eadeb 100644
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -61,11 +61,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/ "
--
--#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
-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.41.0
-

cross/gcc-armhf/0024-always-build-libgcc_eh.a.patch

@@ -1,51 +0,0 @@
-From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/35] 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 6c4dc79ab71..023cede18a7 100644
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -960,8 +960,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)
-@@ -1163,10 +1164,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))))
-@@ -1183,6 +1180,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.41.0
-

cross/gcc-armhf/0025-ada-libgnarl-compatibility-for-musl.patch

@@ -1,135 +0,0 @@
-From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/35] 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 a5e645d334d..32165347071 100644
---- a/gcc/ada/libgnarl/s-osinte__linux.ads
-+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -403,12 +403,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;
-@@ -470,11 +464,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 821ceef30e4..ae95b58e01e 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.41.0
-

cross/gcc-armhf/0026-ada-musl-support-fixes.patch

@@ -1,223 +0,0 @@
-From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/35] 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 96306f8cc9a..090b6770ae5 100644
---- a/gcc/ada/Makefile.rtl
-+++ b/gcc/ada/Makefile.rtl
-@@ -1549,7 +1549,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 \
-@@ -2174,7 +2174,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
-@@ -2205,7 +2205,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 \
-@@ -2420,7 +2420,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) \
-@@ -2524,7 +2524,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) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 8522094164e..92b230a462b 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
-@@ -3438,7 +3443,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
-@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
- 
- /* Dynamic cpu sets */
- 
--cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count)
- {
-   return CPU_ALLOC (count);
-@@ -3461,33 +3465,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
-@@ -3497,23 +3501,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 987432c9307..4d782f07de9 100644
---- a/gcc/ada/adaint.h
-+++ b/gcc/ada/adaint.h
-@@ -319,13 +319,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 c0ee4a16bb1..ed796a48c1b 100644
---- a/gcc/ada/terminals.c
-+++ b/gcc/ada/terminals.c
-@@ -1127,7 +1127,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
-@@ -1141,7 +1141,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)
-@@ -1190,8 +1190,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.41.0
-

cross/gcc-armhf/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch

@@ -1,256 +0,0 @@
-From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
-From: Drew DeVault <sir@cmpwn.com>
-Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
- LINK_GCC_C_SEQUENCE_SPEC [PR81358]
-
-This fixes issues with RISC-V.
----
- Makefile.in           |  1 +
- gcc/config.in         |  6 ++++++
- gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure         | 31 ++++++++++++++++++++++++++++++-
- gcc/configure.ac      | 21 +++++++++++++++++++++
- gcc/doc/install.texi  |  8 ++++++++
- gcc/doc/tm.texi       |  8 +++++++-
- gcc/doc/tm.texi.in    |  8 +++++++-
- gcc/gcc.cc            | 12 +++++++++++-
- 9 files changed, 102 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6ff2b3f9925..394b105b271 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -235,6 +235,7 @@ HOST_EXPORTS = \
- 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
- 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
- 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-+	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
- 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
- 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
- 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-diff --git a/gcc/config.in b/gcc/config.in
-index 0679fbbf4c6..ee81139b385 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -118,6 +118,12 @@
- #endif
- 
- 
-+/* Define if libatomic should always be linked. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_AUTOLINK_LIBATOMIC
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b26b17f2f2a..3f64ea46180 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
- #endif
- 
-+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
-+#  ifdef LD_AS_NEEDED_OPTION
-+#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
-+#  else
-+#    define LINK_LIBATOMIC_SPEC "-latomic"
-+#  endif
-+#elif !defined(LINK_LIBATOMIC_SPEC)
-+#  define LINK_LIBATOMIC_SPEC ""
-+#endif
-+
- #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
--  "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
-+  "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
-    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
- 
- #undef LINK_GCC_C_SEQUENCE_SPEC
-diff --git a/gcc/configure b/gcc/configure
-index e59cbee1767..787c35d4e25 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -984,6 +984,7 @@ with_changes_root_url
- enable_languages
- with_multilib_list
- with_multilib_generator
-+enable_autolink_libatomic
- with_zstd
- with_zstd_include
- with_zstd_lib
-@@ -1713,6 +1714,9 @@ Optional Features:
-   --disable-shared        don't provide a shared libgcc
-   --disable-gcov          don't provide libgcov and related host tools
-   --enable-languages=LIST specify which front-ends to build
-+  --enable-autolink-libatomic
-+                          enable automatic linking of libatomic (ignored if
-+                          not built)
-   --disable-rpath         do not hardcode runtime library paths
-   --enable-sjlj-exceptions
-                           arrange to use setjmp/longjmp exception handling
-@@ -8329,7 +8333,6 @@ else
- fi
- 
- 
--
- # Check whether --with-multilib-generator was given.
- if test "${with_multilib_generator+set}" = set; then :
-   withval=$with_multilib_generator; :
-@@ -8337,6 +8340,32 @@ else
-   with_multilib_generator=default
- fi
- 
-+# If libatomic is available, whether it should be linked automatically
-+# Check whether --enable-autolink-libatomic was given.
-+if test "${enable_autolink_libatomic+set}" = set; then :
-+  enableval=$enable_autolink_libatomic;
-+  case $enable_autolink_libatomic in
-+    yes | no) ;;
-+    *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
-+--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
-+  esac
-+
-+else
-+  enable_autolink_libatomic=''
-+fi
-+
-+
-+if test x$enable_autolink_libatomic = xyes; then
-+  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
-+
-+$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
-+$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
-+  fi
-+fi
-+
- 
- # -------------------------
- # Checks for other programs
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 57268319de1..56bcaa87620 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
- :,
- with_multilib_generator=default)
- 
-+# If libatomic is available, whether it should be linked automatically
-+AC_ARG_ENABLE(autolink-libatomic,
-+[AS_HELP_STRING([--enable-autolink-libatomic],
-+		[enable automatic linking of libatomic (ignored if not built)])],
-+[
-+  case $enable_autolink_libatomic in
-+    yes | no) ;;
-+    *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
-+--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'.]) ;;
-+  esac
-+], [enable_autolink_libatomic=''])
-+
-+if test x$enable_autolink_libatomic = xyes; then
-+  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
-+    AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
-+	[Define if libatomic should always be linked.])
-+  else
-+    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
-+  fi
-+fi
-+
- # -------------------------
- # Checks for other programs
- # -------------------------
-diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index b30d3691fe6..ccc8e5dbb00 100644
---- a/gcc/doc/install.texi
-+++ b/gcc/doc/install.texi
-@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
- environments.  Enabled by default, and may be disabled using
- @option{--disable-canonical-system-headers}.
- 
-+@item --enable-autolink-libatomic
-+@itemx --disable-autolink-libatomic
-+Tell GCC that it should automatically link libatomic; if supported by
-+the linker, the file is only linked as needed. This flag is ignored
-+when libatomic is not built. Note that this conigure flag is in particular
-+useful when building an offloading-target compiler; as for those, a
-+user had to specify @code{-foffload=target=-latomic} otherwise.
-+
- @item --with-glibc-version=@var{major}.@var{minor}
- Tell GCC that when the GNU C Library (glibc) is used on the target it
- will be version @var{major}.@var{minor} or later.  Normally this can
-diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index a660e33739b..6183c407a2b 100644
---- a/gcc/doc/tm.texi
-+++ b/gcc/doc/tm.texi
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @defmac LINK_GCC_C_SEQUENCE_SPEC
- The sequence in which libgcc and libc are specified to the linker.
--By default this is @code{%G %L %G}.
-+By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
-+@end defmac
-+
-+@defmac LINK_LIBATOMIC_SPEC
-+This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
-+libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
-+is set.
- @end defmac
- 
- @defmac POST_LINK_SPEC
-diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index f7ab5d48a63..281540aba68 100644
---- a/gcc/doc/tm.texi.in
-+++ b/gcc/doc/tm.texi.in
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @defmac LINK_GCC_C_SEQUENCE_SPEC
- The sequence in which libgcc and libc are specified to the linker.
--By default this is @code{%G %L %G}.
-+By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
-+@end defmac
-+
-+@defmac LINK_LIBATOMIC_SPEC
-+This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
-+libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
-+is set.
- @end defmac
- 
- @defmac POST_LINK_SPEC
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 59390fd39d6..dae1dd4cf79 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -974,13 +974,23 @@ proper position among the other output files.  */
- # define ASM_DEBUG_OPTION_SPEC ""
- #endif
- 
-+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
-+#  ifdef LD_AS_NEEDED_OPTION
-+#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
-+#  else
-+#    define LINK_LIBATOMIC_SPEC "-latomic"
-+#  endif
-+#elif !defined(LINK_LIBATOMIC_SPEC)
-+#  define LINK_LIBATOMIC_SPEC ""
-+#endif
-+
- /* Here is the spec for running the linker, after compiling all files.  */
- 
- /* This is overridable by the target in case they need to specify the
-    -lgcc and -lc order specially, yet not require them to override all
-    of LINK_COMMAND_SPEC.  */
- #ifndef LINK_GCC_C_SEQUENCE_SPEC
--#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
-+#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
- #endif
- 
- #ifdef ENABLE_DEFAULT_SSP
--- 
-2.41.0
-

cross/gcc-armhf/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch

@@ -1,57 +0,0 @@
-From 5bbbd320e54ab5341cfba83e8af98685131caba1 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 12:23:34 +0200
-Subject: [PATCH 28/35] 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 a92ae9e8309..90b579ca4d8 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.41.0
-

cross/gcc-armhf/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

@@ -1,27 +0,0 @@
-From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
- musl targets
-
----
- libstdc++-v3/config/locale/generic/c_locale.cc | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
-index 8849d78fdfa..aff467f98fe 100644
---- a/libstdc++-v3/config/locale/generic/c_locale.cc
-+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
-@@ -242,9 +242,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-     // Currently, the generic model only supports the "C" locale.
-     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
-     __cloc = 0;
--    if (strcmp(__s, "C"))
--      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
--			    "name not valid"));
-   }
- 
-   void
--- 
-2.41.0
-

cross/gcc-armhf/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch

@@ -1,27 +0,0 @@
-From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
-From: Mathias LANG <pro.mathias.lang@gmail.com>
-Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
- libucontext
-
-ref: alpine/aports#13422
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 394b105b271..bc4a77fc300 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52809,7 +52809,7 @@ configure-target-libphobos:
- 	esac; \
- 	module_srcdir=libphobos; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--- 
-2.41.0
-

cross/gcc-armhf/0031-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,54 +0,0 @@
-From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
-
-On musl-based Linux distributions, swapcontext etc. are not provided by
-musl but instead by libucontext. Hence, we _always_ need to link against
-an external library for these functions.
----
- libphobos/configure                | 8 --------
- libphobos/m4/druntime/libraries.m4 | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/libphobos/configure b/libphobos/configure
-index 925c53c5f5e..60c2a0c11c6 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -15216,14 +15216,6 @@ fi
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[34567]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
- $as_echo_n "checking for library containing swapcontext... " >&6; }
-diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
-index 45a56f6f76a..fef6e890b1e 100644
---- a/libphobos/m4/druntime/libraries.m4
-+++ b/libphobos/m4/druntime/libraries.m4
-@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[[34567]]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
-       AC_MSG_ERROR([swapcontext required but not found]))
--- 
-2.41.0
-

cross/gcc-armhf/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch

@@ -1,25 +0,0 @@
-From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
-
----
- gcc/ada/libgnat/s-parame.ads | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/ada/libgnat/s-parame.ads b/gcc/ada/libgnat/s-parame.ads
-index 3d6e345a1ba..cfe0b4d3ca6 100644
---- a/gcc/ada/libgnat/s-parame.ads
-+++ b/gcc/ada/libgnat/s-parame.ads
-@@ -102,7 +102,7 @@ package System.Parameters is
-    -- Characteristics of time_t type --
-    ------------------------------------
- 
--   time_t_bits : constant := Long_Integer'Size;
-+   time_t_bits : constant := Long_Long_Integer'Size;
-    --  Number of bits in type time_t
- 
-    ----------------------------------------------
--- 
-2.41.0
-

cross/gcc-armhf/0033-libphobos-do-not-use-LFS64-symbols.patch

@@ -1,44 +0,0 @@
-From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
-
-musl does not have these since 1.2.4, we can't use the compat interfaces.
----
- libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
- libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
-index ae6752f220e..6b80d1ff0e6 100644
---- a/libphobos/libdruntime/core/sys/posix/config.d
-+++ b/libphobos/libdruntime/core/sys/posix/config.d
-@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
-     enum __REDIRECT          = false;
- 
-     // Those three are irrelevant for Musl as it always uses 64 bits off_t
--    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
-+    enum __USE_FILE_OFFSET64 = false;
-     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
-     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
- 
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-index 0d3d517d69a..323aa0af72d 100644
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
--    static if (__USE_FILE_OFFSET64)
--        alias mmap = mmap64;
--    else
--        void* mmap(void*, size_t, int, int, int, off_t);
-+    void* mmap(void*, size_t, int, int, int, off_t);
-     int munmap(void*, size_t);
- }
- else version (CRuntime_UClibc)
--- 
-2.41.0
-

cross/gcc-armhf/0034-libgo-fix-lfs64-use.patch

@@ -1,195 +0,0 @@
-From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 10 Jul 2023 23:23:29 +0000
-Subject: [PATCH 34/35] libgo: fix lfs64 use
-
----
- .../go/internal/syscall/unix/at_largefile.go  |  2 +-
- libgo/go/os/dir_largefile.go                  |  2 +-
- libgo/go/syscall/libcall_glibc.go             |  2 +-
- libgo/go/syscall/libcall_linux.go             |  4 +--
- libgo/go/syscall/libcall_posix_largefile.go   | 26 +++++++++----------
- libgo/runtime/go-varargs.c                    |  2 +-
- libgo/sysinfo.c                               |  9 +++----
- 7 files changed, 22 insertions(+), 25 deletions(-)
-
-diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
-index 82e0dcfd074..16151ecad1b 100644
---- a/libgo/go/internal/syscall/unix/at_largefile.go
-+++ b/libgo/go/internal/syscall/unix/at_largefile.go
-@@ -10,5 +10,5 @@ import (
- 	"syscall"
- )
- 
--//extern fstatat64
-+//extern fstatat
- func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
-diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
-index 1fc5ee0771f..0c6dffe1a75 100644
---- a/libgo/go/os/dir_largefile.go
-+++ b/libgo/go/os/dir_largefile.go
-@@ -11,5 +11,5 @@ package os
- 
- import "syscall"
- 
--//extern readdir64
-+//extern readdir
- func libc_readdir(*syscall.DIR) *syscall.Dirent
-diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
-index 5c1ec483c75..5a1245ed44b 100644
---- a/libgo/go/syscall/libcall_glibc.go
-+++ b/libgo/go/syscall/libcall_glibc.go
-@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
- }
- 
- //sys	sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
--//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
-+//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
- 
- func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
- 	if race.Enabled {
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 03ca7261b59..ad21fd0b3ac 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
- //adjtimex(buf *Timex) _C_int
- 
- //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
--//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
-+//fstatfs(fd _C_int, buf *Statfs_t) _C_int
- 
- func Gettid() (tid int) {
- 	r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
-@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
- }
- 
- //sys	Statfs(path string, buf *Statfs_t) (err error)
--//statfs64(path *byte, buf *Statfs_t) _C_int
-+//statfs(path *byte, buf *Statfs_t) _C_int
- 
- //sysnb	Sysinfo(info *Sysinfo_t) (err error)
- //sysinfo(info *Sysinfo_t) _C_int
-diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
-index f90055bb29a..334212f0af1 100644
---- a/libgo/go/syscall/libcall_posix_largefile.go
-+++ b/libgo/go/syscall/libcall_posix_largefile.go
-@@ -10,40 +10,40 @@
- package syscall
- 
- //sys	Creat(path string, mode uint32) (fd int, err error)
--//creat64(path *byte, mode Mode_t) _C_int
-+//creat(path *byte, mode Mode_t) _C_int
- 
- //sys	Fstat(fd int, stat *Stat_t) (err error)
--//fstat64(fd _C_int, stat *Stat_t) _C_int
-+//fstat(fd _C_int, stat *Stat_t) _C_int
- 
- //sys	Ftruncate(fd int, length int64) (err error)
--//ftruncate64(fd _C_int, length Offset_t) _C_int
-+//ftruncate(fd _C_int, length Offset_t) _C_int
- 
- //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
--//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
-+//getrlimit(resource _C_int, rlim *Rlimit) _C_int
- 
- //sys	Lstat(path string, stat *Stat_t) (err error)
--//lstat64(path *byte, stat *Stat_t) _C_int
-+//lstat(path *byte, stat *Stat_t) _C_int
- 
- //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
--//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
-+//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
- 
- //sys	Open(path string, mode int, perm uint32) (fd int, err error)
--//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
-+//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
- 
- //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
--//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
-+//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
- 
- //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
--//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
-+//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
- 
- //sys	Seek(fd int, offset int64, whence int) (off int64, err error)
--//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
-+//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
- 
- //sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
--//setrlimit64(resource int, rlim *Rlimit) _C_int
-+//setrlimit(resource int, rlim *Rlimit) _C_int
- 
- //sys	Stat(path string, stat *Stat_t) (err error)
--//stat64(path *byte, stat *Stat_t) _C_int
-+//stat(path *byte, stat *Stat_t) _C_int
- 
- //sys	Truncate(path string, length int64) (err error)
--//truncate64(path *byte, length Offset_t) _C_int
-+//truncate(path *byte, length Offset_t) _C_int
-diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
-index f84860891e6..7efc9615985 100644
---- a/libgo/runtime/go-varargs.c
-+++ b/libgo/runtime/go-varargs.c
-@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
- int
- __go_open64 (char *path, int mode, mode_t perm)
- {
--  return open64 (path, mode, perm);
-+  return open (path, mode, perm);
- }
- 
- #endif
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 180f5c31d74..1d717d55c0e 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
- #endif
- 
- #if defined(HAVE_OFF64_T)
--typedef off64_t libgo_off_t_type;
-+typedef off_t libgo_off_t_type;
- #else
- typedef off_t libgo_off_t_type;
- #endif
-@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
- 
- // From dirent.h
- SREF(dirent);
--SREF(dirent64);
- OTREF(DIR);
- EREF(DT_UNKNOWN);
- 
- // From fcntl.h
- SREF(flock);
--SREF(flock64);
- 
- // From ffi headers
- SREF(_ffi_type);
-@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
- EREF(SEGV_MAPERR);
- 
- // From stat.h
--SREF(stat64);
-+SREF(stat);
- 
- // From statfs.h
- SREF(statfs);
--SREF(statfs64);
- 
- // From sysinfo.h
- SREF(sysinfo);
-@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
- 
- // From sys/resource.h
- SREF(rusage);
--SREF(rlimit64);
-+SREF(rlimit);
- EREF(RLIMIT_NOFILE);
- EREF(PRIO_USER);
- EREF(RUSAGE_SELF);
--- 
-2.41.0
-

cross/gcc-armhf/0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch

@@ -1,186 +0,0 @@
-https://gcc.gnu.org/PR110792
-https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=790c1f60a5662b16eb19eb4b81922995863c7571
-https://github.com/randombit/botan/issues/3637
-
-From 85628c5653ff40963158a24c60eeec6a3b5a8e56 Mon Sep 17 00:00:00 2001
-From: Roger Sayle <roger@nextmovesoftware.com>
-Date: Thu, 3 Aug 2023 07:12:04 +0100
-Subject: [PATCH] PR target/110792: Early clobber issues with
- rot32di2_doubleword on i386.
-
-This patch is a conservative fix for PR target/110792, a wrong-code
-regression affecting doubleword rotations by BITS_PER_WORD, which
-effectively swaps the highpart and lowpart words, when the source to be
-rotated resides in memory. The issue is that if the register used to
-hold the lowpart of the destination is mentioned in the address of
-the memory operand, the current define_insn_and_split unintentionally
-clobbers it before reading the highpart.
-
-Hence, for the testcase, the incorrectly generated code looks like:
-
-        salq    $4, %rdi		// calculate address
-        movq    WHIRL_S+8(%rdi), %rdi	// accidentally clobber addr
-        movq    WHIRL_S(%rdi), %rbp	// load (wrong) lowpart
-
-Traditionally, the textbook way to fix this would be to add an
-explicit early clobber to the instruction's constraints.
-
- (define_insn_and_split "<insn>32di2_doubleword"
-- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
-+ [(set (match_operand:DI 0 "register_operand" "=r,r,&r")
-        (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
-                       (const_int 32)))]
-
-but unfortunately this currently generates significantly worse code,
-due to a strange choice of reloads (effectively memcpy), which ends up
-looking like:
-
-        salq    $4, %rdi		// calculate address
-        movdqa  WHIRL_S(%rdi), %xmm0	// load the double word in SSE reg.
-        movaps  %xmm0, -16(%rsp)	// store the SSE reg back to the stack
-        movq    -8(%rsp), %rdi		// load highpart
-        movq    -16(%rsp), %rbp		// load lowpart
-
-Note that reload's "&" doesn't distinguish between the memory being
-early clobbered, vs the registers used in an addressing mode being
-early clobbered.
-
-The fix proposed in this patch is to remove the third alternative, that
-allowed offsetable memory as an operand, forcing reload to place the
-operand into a register before the rotation.  This results in:
-
-        salq    $4, %rdi
-        movq    WHIRL_S(%rdi), %rax
-        movq    WHIRL_S+8(%rdi), %rdi
-        movq    %rax, %rbp
-
-I believe there's a more advanced solution, by swapping the order of
-the loads (if first destination register is mentioned in the address),
-or inserting a lea insn (if both destination registers are mentioned
-in the address), but this fix is a minimal "safe" solution, that
-should hopefully be suitable for backporting.
-
-2023-08-03  Roger Sayle  <roger@nextmovesoftware.com>
-
-gcc/ChangeLog
-	PR target/110792
-	* config/i386/i386.md (<any_rotate>ti3): For rotations by 64 bits
-	place operand in a register before gen_<insn>64ti2_doubleword.
-	(<any_rotate>di3): Likewise, for rotations by 32 bits, place
-	operand in a register before gen_<insn>32di2_doubleword.
-	(<any_rotate>32di2_doubleword): Constrain operand to be in register.
-	(<any_rotate>64ti2_doubleword): Likewise.
-
-gcc/testsuite/ChangeLog
-	PR target/110792
-	* g++.target/i386/pr110792.C: New 32-bit C++ test case.
-	* gcc.target/i386/pr110792.c: New 64-bit C test case.
-
-(cherry picked from commit 790c1f60a5662b16eb19eb4b81922995863c7571)
----
- gcc/config/i386/i386.md                  | 18 ++++++++++++------
- gcc/testsuite/g++.target/i386/pr110792.C | 16 ++++++++++++++++
- gcc/testsuite/gcc.target/i386/pr110792.c | 18 ++++++++++++++++++
- 3 files changed, 46 insertions(+), 6 deletions(-)
- create mode 100644 gcc/testsuite/g++.target/i386/pr110792.C
- create mode 100644 gcc/testsuite/gcc.target/i386/pr110792.c
-
-diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
-index f3a3305..a71e837 100644
---- a/gcc/config/i386/i386.md
-+++ b/gcc/config/i386/i386.md
-@@ -14359,7 +14359,10 @@
-     emit_insn (gen_ix86_<insn>ti3_doubleword
- 		(operands[0], operands[1], operands[2]));
-   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 64)
--    emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
-+    {
-+      operands[1] = force_reg (TImode, operands[1]);
-+      emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
-+    }
-   else
-     {
-       rtx amount = force_reg (QImode, operands[2]);
-@@ -14394,7 +14397,10 @@
-     emit_insn (gen_ix86_<insn>di3_doubleword
- 		(operands[0], operands[1], operands[2]));
-   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 32)
--    emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
-+    {
-+      operands[1] = force_reg (DImode, operands[1]);
-+      emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
-+    }
-   else
-     FAIL;
- 
-@@ -14562,8 +14568,8 @@
- })
- 
- (define_insn_and_split "<insn>32di2_doubleword"
-- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
--       (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
-+ [(set (match_operand:DI 0 "register_operand" "=r,r")
-+       (any_rotate:DI (match_operand:DI 1 "register_operand" "0,r")
-                       (const_int 32)))]
-  "!TARGET_64BIT"
-  "#"
-@@ -14580,8 +14586,8 @@
- })
- 
- (define_insn_and_split "<insn>64ti2_doubleword"
-- [(set (match_operand:TI 0 "register_operand" "=r,r,r")
--       (any_rotate:TI (match_operand:TI 1 "nonimmediate_operand" "0,r,o")
-+ [(set (match_operand:TI 0 "register_operand" "=r,r")
-+       (any_rotate:TI (match_operand:TI 1 "register_operand" "0,r")
-                       (const_int 64)))]
-  "TARGET_64BIT"
-  "#"
-diff --git a/gcc/testsuite/g++.target/i386/pr110792.C b/gcc/testsuite/g++.target/i386/pr110792.C
-new file mode 100644
-index 0000000..ce21a7a
---- /dev/null
-+++ b/gcc/testsuite/g++.target/i386/pr110792.C
-@@ -0,0 +1,16 @@
-+/* { dg-do compile { target ia32 } } */
-+/* { dg-options "-O2" } */
-+
-+template <int ROT, typename T>
-+inline T rotr(T input)
-+{
-+   return static_cast<T>((input >> ROT) | (input << (8 * sizeof(T) - ROT)));
-+}
-+
-+unsigned long long WHIRL_S[256] = {0x18186018C07830D8};
-+unsigned long long whirl(unsigned char x0)
-+{
-+   const unsigned long long s4 = WHIRL_S[x0&0xFF];
-+   return rotr<32>(s4);
-+}
-+/* { dg-final { scan-assembler-not "movl\tWHIRL_S\\+4\\(,%eax,8\\), %eax" } } */
-diff --git a/gcc/testsuite/gcc.target/i386/pr110792.c b/gcc/testsuite/gcc.target/i386/pr110792.c
-new file mode 100644
-index 0000000..b65125c
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr110792.c
-@@ -0,0 +1,18 @@
-+/* { dg-do compile { target int128 } } */
-+/* { dg-options "-O2" } */
-+
-+static inline unsigned __int128 rotr(unsigned __int128 input)
-+{
-+   return ((input >> 64) | (input << (64)));
-+}
-+
-+unsigned __int128 WHIRL_S[256] = {((__int128)0x18186018C07830D8) << 64 |0x18186018C07830D8};
-+unsigned __int128 whirl(unsigned char x0)
-+{
-+   register int t __asm("rdi") = x0&0xFF;
-+   const unsigned __int128 s4 = WHIRL_S[t];
-+   register unsigned __int128 tt  __asm("rdi") = rotr(s4);
-+   asm("":::"memory");
-+   return tt;
-+}
-+/* { dg-final { scan-assembler-not "movq\tWHIRL_S\\+8\\(%rdi\\), %rdi" } } */
--- 
-2.41.0
-

cross/gcc-armhf/0037-loongarch-disable-multilib-support.patch

@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
----
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
---- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
--
--  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
--    #define ABI_LIBDIR "lib64"
--  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
--    #define ABI_LIBDIR "lib64/f32"
--  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
--    #define ABI_LIBDIR "lib64/sf"
--  #endif
--
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
---- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
--ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
--
--    MULTILIB_OSDIRNAMES = \
--      mabi.lp64d=../lib64$\
--      $(call if_multiarch,:loongarch64-linux-gnu)
--
--    MULTILIB_OSDIRNAMES += \
--      mabi.lp64f=../lib64/f32$\
--      $(call if_multiarch,:loongarch64-linux-gnuf32)
--
--    MULTILIB_OSDIRNAMES += \
--      mabi.lp64s=../lib64/sf$\
--      $(call if_multiarch,:loongarch64-linux-gnusf)
--
--endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
--- 
-2.41.0
-

cross/gcc-armhf/APKBUILD

@@ -1,833 +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"
-
-# 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
-pkgver=13.2.1_git20240309
-# i.e. 13.2.1, must match gcc/BASE-VER
-_pkgbase="${pkgver%%_git*}"
-# date component from snapshots
-_pkgsnap="${pkgver##*_git}"
-[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
-[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
-[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
-
-pkgname=gcc-armhf
-pkgrel=0
-pkgdesc="Stage2 cross-compiler for armhf"
-url="https://gcc.gnu.org"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
-_gccrel=$pkgver-r$pkgrel
-depends="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 libstdc++-dev-armhf:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
-replaces="libstdc++ binutils"
-options="!strip"
-
-: "${LANG_CXX:=true}"
-: "${LANG_D:=true}"
-: "${LANG_OBJC:=true}"
-: "${LANG_GO:=true}"
-: "${LANG_FORTRAN:=true}"
-: "${LANG_ADA:=true}"
-: "${LANG_JIT:=true}"
-
-_libgomp=true
-_libgcc=false
-_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
-
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# 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 -g0 ${CFLAGS/-Werror=format-security/}"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
-	unset CPPFLAGS
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	STRIP_FOR_TARGET="$CTARGET-strip"
-elif [ "$CBUILD" != "$CHOST" ]; then
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/}"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
-	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"
-
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# pass -g0 by default to bypass -g, since we don't do debug
-	# if -dbg added, the -g is appended and overrides this
-	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/} -O2"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/} -O2"
-	unset CPPFLAGS
-	# https://gcc.gnu.org/install/build.html
-	export CFLAGS_FOR_TARGET="$CFLAGS"
-	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
-	export LDFLAGS_FOR_TARGET="$LDFLAGS"
-	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
-	export BOOT_LDFLAGS="$LDFLAGS"
-fi
-
-case "$CARCH" in
-# GDC hasn't been ported to PowerPC
-# See libphobos/configure.tgt in GCC sources for supported targets
-# riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
-# GDC does currently not work on 32-bit musl architectures.
-# This is a known upstream issue.
-# See: https://github.com/dlang/druntime/pull/3383
-armhf|armv7|x86)	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 ;;
-loongarch64)	_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 ;;
-loongarch64)	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 | ppc64le)	_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
-
-case "$CTARGET_ARCH" in
-loongarch64)
-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 gcc-gdc-bootstrap"
-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 gcc-gnat$_target:gnat"
-	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
-fi
-if $LANG_JIT; then
-	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
-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. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
-# However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
-# mirrored on dev.alpinelinux.org. Please ensure that the snapshot Git commit (as stated in the
-# README) matches the base commit on the version-specific branch in the Git repository below.
-#
-# 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/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.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-libgcc_s.patch
-	0013-nopie.patch
-	0014-ada-fix-shared-linking.patch
-	0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0016-add-fortify-headers-paths.patch
-	0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0019-aarch64-disable-multilib-support.patch
-	0020-s390x-disable-multilib-support.patch
-	0021-ppc64-le-disable-multilib-support.patch
-	0022-x86_64-disable-multilib-support.patch
-	0023-riscv-disable-multilib-support.patch
-	0024-always-build-libgcc_eh.a.patch
-	0025-ada-libgnarl-compatibility-for-musl.patch
-	0026-ada-musl-support-fixes.patch
-	0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-	0031-druntime-link-against-libucontext-on-all-platforms.patch
-	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-	0033-libphobos-do-not-use-LFS64-symbols.patch
-	0034-libgo-fix-lfs64-use.patch
-	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
-	"
-
-# secfixes:
-#   13.2.1_git20231014-r0:
-#     - CVE-2023-4039
-
-# we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_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=armv6kz --with-tune=arm1176jzf-s --with-fpu=vfpv2 --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=pentium-m --with-fpmath=sse --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";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
-	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 libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --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 ""
-
-	local version="Alpine $pkgver"
-	local gccconfiguration="
-		--prefix=/usr
-		--mandir=/usr/share/man
-		--infodir=/usr/share/info
-		--build=$CBUILD
-		--host=$CHOST
-		--target=$CTARGET
-		--enable-checking=release
-		--disable-cet
-		--disable-fixed-point
-		--disable-libstdcxx-pch
-		--disable-multilib
-		--disable-nls
-		--disable-werror
-		$_symvers
-		--enable-__cxa_atexit
-		--enable-default-pie
-		--enable-default-ssp
-		--enable-languages=$_languages
-		--enable-link-serialization=2
-		--enable-linker-build-id
-		$_arch_configure
-		$_libc_configure
-		$_cross_configure
-		$_bootstrap_configure
-		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
-		--with-system-zlib
-		$_hash_style_configure
-		"
-
-	mkdir -p "$_builddir"
-	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
-		--with-pkgversion="$version"
-
-	msg "building gcc"
-	make
-
-	# we build gccjit separate to not build all of gcc with --enable-host-shared
-	# as doing so slows it down a few %, so for some quick if's here we gain
-	# free performance
-	if $LANG_JIT; then
-		mkdir -p "$_builddir"/libgccjit-build
-		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
-			--disable-bootstrap \
-			--enable-host-shared \
-			--enable-languages=jit \
-			--with-pkgversion="$version"
-
-		msg "building libgccjit"
-		make all-gcc
-	fi
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
-
-	if $LANG_JIT; then
-		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
-	fi
-
-	# 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 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
-		if [ "$CHOST" = "$CTARGET" ]; then
-			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
-	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/
-}
-
-libcxx_dev() {
-	pkgdesc="GNU C++ standard runtime library (development files)"
-	depends=
-	replaces="g++"
-
-	amove usr/${_target:+$CTARGET/}lib/libstdc++.a \
-		usr/${_target:+$CTARGET/}lib/libstdc++exp.a \
-		usr/${_target:+$CTARGET/}lib/libstdc++.so \
-		usr/${_target:+$CTARGET/}lib/libstdc++fs.a \
-		usr/${_target:+$CTARGET/}lib/libsupc++.a \
-		usr/${_target:+$CTARGET/}include/c++
-}
-
-gpp() {
-	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_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/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"
-	provides="gcc-gdc-bootstrap=$_gccrel"
-
-	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="GCC Go frontend (intended for bootstrapping community/go)"
-	depends="gcc=$_gccrel libgo=$_gccrel !go"
-	install="$pkgname-go.post-install"
-
-	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=$_gccrel"
-	[ "$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/
-}
-
-gdb() {
-	pkgdesc="$pkgdesc (gdb printers)"
-	install_if="$pkgname=$pkgver-r$pkgrel gdb"
-
-	amove \
-		usr/share/gdb/python/ \
-		usr/share/gcc-*/python/
-}
-
-sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
-1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
-163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
-3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
-17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
-7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
-9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
-b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
-0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
-00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
-0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
-a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
-f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
-44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
-e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
-ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
-8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  0026-ada-musl-support-fixes.patch
-3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
-c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
-cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
-"

cross/gcc-armhf/gcc-go.post-install

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cat 1>&2 <<EOF
-*
-* gcc-go is used in Alpine for bootstrapping Go.
-* It is currently discouraged to use it for other purposes.
-*
-EOF

cross/gcc-riscv64/0001-posix_memalign.patch

@@ -1,42 +0,0 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
-
----
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3527283693b..c4071b64b53 100644
---- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
--   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
--extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
--extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
--  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
--- 
-2.41.0
-

cross/gcc-riscv64/0002-gcc-poison-system-directories.patch

@@ -1,203 +0,0 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.cc          |  2 ++
- gcc/incpath.cc      | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 862c474d3c8..64c4277c991 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -711,6 +711,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one variable shadows another.  Same as -Wshadow=global.
-diff --git a/gcc/config.in b/gcc/config.in
-index 4cad077bfbe..0679fbbf4c6 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -236,6 +236,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index c7b26d1927d..8c46369f73f 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -1026,6 +1026,7 @@ enable_maintainer_mode
- enable_link_mutex
- enable_link_serialization
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1788,6 +1789,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 09082e8ccae..5504bf6eb01 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index af0e5933fdb..b6731a4673c 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
- -Wparentheses  -Wno-pedantic-ms-format
- -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
-+-Wno-poison-system-directories
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type
- -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
- 
-+@opindex Wno-poison-system-directories
-+@item -Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @opindex Wfloat-equal
- @opindex Wno-float-equal
- @item -Wfloat-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 16bb07f2cdc..33b56e721d2 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.cc b/gcc/incpath.cc
-index 4d44321183f..0f3f071b44c 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
--- 
-2.41.0
-

cross/gcc-riscv64/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,44 +0,0 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
-
-Previously, we also used to turn on -z relro here, but we now build
-binutils with --enable-relro, which is functionally equivalent.
-
-Binutils does not appear to have a similar option for enabling -z
-now by default.
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b6731a4673c..f393c7846c6 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
- linker.  When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
-+
- @opindex u
- @item -u @var{symbol}
- Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 33b56e721d2..f82fae23c22 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
-    "%{flto|flto=*:%<fcompare-debug*} \
-     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-     %{Wno-poison-system-directories:--no-poison-system-directories} \
--- 
-2.41.0
-

cross/gcc-riscv64/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch

@@ -1,46 +0,0 @@
-From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:22 +0000
-Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
- ObjC, ObjC++, if the optimization level is > 0
-
----
- gcc/c-family/c-cppbuiltin.cc | 4 ++++
- gcc/doc/invoke.texi          | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
-index 5d64625fcd7..868d69506e4 100644
---- a/gcc/c-family/c-cppbuiltin.cc
-+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
-   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
-   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
- 
-+  /* Fortify Source enabled by default for optimization levels > 0 */
-+  if (optimize)
-+    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index f393c7846c6..ef3c14a189e 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
- 
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @opindex O3
- @item -O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
--- 
-2.41.0
-

cross/gcc-riscv64/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch

@@ -1,272 +0,0 @@
-From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
- linker, but always link the sanitizer libraries with --no-as-needed.
-
----
- gcc/config/aarch64/aarch64-linux.h |  1 +
- gcc/config/alpha/linux-elf.h       |  2 +-
- gcc/config/arm/linux-elf.h         |  1 +
- gcc/config/gnu-user.h              |  6 +++---
- gcc/config/i386/gnu-user.h         |  2 +-
- gcc/config/i386/gnu-user64.h       |  1 +
- gcc/config/ia64/linux.h            |  2 +-
- gcc/config/mips/gnu-user.h         |  1 +
- gcc/config/riscv/linux.h           |  1 +
- gcc/config/rs6000/linux64.h        |  4 ++--
- gcc/config/rs6000/sysv4.h          |  2 +-
- gcc/config/s390/linux.h            |  2 +-
- gcc/config/sparc/linux.h           |  2 +-
- gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
- 14 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 4277f03da2a..b131983a546 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index 03f783f2ad1..d946e700dda 100644
---- a/gcc/config/alpha/linux-elf.h
-+++ b/gcc/config/alpha/linux-elf.h
-@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 7b7b7cbbe14..49c050c6f2c 100644
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index eda8010b133..b26b17f2f2a 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
-   "%{static-libasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBHWASAN_EARLY_SPEC
- #define LIBHWASAN_EARLY_SPEC "%{!shared:libhwasan_preinit%O%s} " \
-   "%{static-libhwasan:%{!shared:" \
-@@ -146,12 +146,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
- 
- #undef TARGET_F951_OPTIONS
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a79b739089d..e0752673dff 100644
---- a/gcc/config/i386/gnu-user.h
-+++ b/gcc/config/i386/gnu-user.h
-@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index 3b63b99acf6..759bf0db86f 100644
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
-@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index 5dfd428aa17..02656dad7fc 100644
---- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index a4e5380b589..3cc61bce69f 100644
---- a/gcc/config/mips/gnu-user.h
-+++ b/gcc/config/mips/gnu-user.h
-@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index 3e625e0f867..f8c2c351e5a 100644
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{mbig-endian:-EB} \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index 9e457033d11..08016bf224d 100644
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -377,13 +377,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
--#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
--#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index ae932fc22f0..c8ff0c6dc8e 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
- #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 02aa1edaff8..64df5801134 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 0e33b3cac2c..c2f44546e62 100644
---- a/gcc/config/sparc/linux.h
-+++ b/gcc/config/sparc/linux.h
-@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index f82fae23c22..da6417dd0d1 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -754,8 +754,11 @@ proper position among the other output files.  */
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
--		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -790,8 +793,11 @@ proper position among the other output files.  */
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
--		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -808,8 +814,11 @@ proper position among the other output files.  */
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
--		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -824,8 +833,11 @@ proper position among the other output files.  */
- #define STATIC_LIBUBSAN_LIBS \
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
--		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.41.0
-

cross/gcc-riscv64/0006-Enable-Wformat-and-Wformat-security-by-default.patch

@@ -1,34 +0,0 @@
-From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:47:43 +0000
-Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
-
----
- gcc/c-family/c.opt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index a75038930ae..b98726f33ed 100644
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
- of the destination region.  Same as -Wformat-overflow=1.
- 
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions.
- 
- Wformat-signedness
-@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
- Warn about zero-length formats.
- 
- Wformat=
--C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
- Warn about printf/scanf/strftime/strfmon format string anomalies.
- 
- Wformat-overflow=
--- 
-2.41.0
-

cross/gcc-riscv64/0007-Enable-Wtrampolines-by-default.patch

@@ -1,25 +0,0 @@
-From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH 07/35] Enable -Wtrampolines by default.
-
----
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 64c4277c991..c24839d32bc 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtrivial-auto-var-init
--- 
-2.41.0
-

cross/gcc-riscv64/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch

@@ -1,53 +0,0 @@
-From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:49:40 +0000
-Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
- -ffreestanding Change the buffer size.
-
----
- gcc/gcc.cc     | 8 +++++++-
- gcc/params.opt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index da6417dd0d1..b5a6f200635 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -983,6 +983,12 @@ proper position among the other output files.  */
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1282,7 +1288,7 @@ static const char *cc1_options =
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
-- %{fsyntax-only:-o %j} %{-param*}\
-+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
-  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fprofile-generate*|coverage:\
-    %{!fprofile-update=single:\
-diff --git a/gcc/params.opt b/gcc/params.opt
-index 823cdb2ff85..5b096899b40 100644
---- a/gcc/params.opt
-+++ b/gcc/params.opt
-@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
- The maximum number of SSA_NAME assignments to follow in determining a value.
- 
- -param=ssp-buffer-size=
--Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
-+Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
- The lower bound for a buffer to be considered for stack smashing protection.
- 
- -param=stack-clash-protection-guard-size=
--- 
-2.41.0
-

cross/gcc-riscv64/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

@@ -1,54 +0,0 @@
-From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:50:33 +0000
-Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
- gcc bootstrapping.
-
-Solves error messages like the following:
-
-msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
-
-The libgcc_s.so used during build doesn't satisfy the needs of the
-libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
-is used as a stand-alone application here, and what library it uses
-behind the scenes is of no concern to the gcc build process.
-Therefore, simply invoking it "as usual", i.e. without any special
-library path, will make it work as expected here.
-
-2011-09-19 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/372377
-https://bugs.gentoo.org/295480
----
- libstdc++-v3/po/Makefile.am | 1 +
- libstdc++-v3/po/Makefile.in | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
-index 12d34910830..61b13762b71 100644
---- a/libstdc++-v3/po/Makefile.am
-+++ b/libstdc++-v3/po/Makefile.am
-@@ -38,6 +38,7 @@ MSGFMT = msgfmt
- EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
-diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
-index 8e93445acd2..d6ff06e5ddb 100644
---- a/libstdc++-v3/po/Makefile.in
-+++ b/libstdc++-v3/po/Makefile.in
-@@ -561,6 +561,7 @@ uninstall-am:
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
--- 
-2.41.0
-

cross/gcc-riscv64/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch

@@ -1,28 +0,0 @@
-From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:52:07 +0000
-Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
-
----
- include/libiberty.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/include/libiberty.h b/include/libiberty.h
-index 1d5c779fcff..19e3cb1e31c 100644
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- /* Like asprintf but allocates memory without fail. This works like
-    xmalloc.  */
--- 
-2.41.0
-

cross/gcc-riscv64/0011-libiberty-copy-PIC-objects-during-build-process.patch

@@ -1,24 +0,0 @@
-From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:53:00 +0000
-Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
-
----
- libiberty/Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index 72608f3e4a7..58356884728 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
--- 
-2.41.0
-

cross/gcc-riscv64/0012-libgcc_s.patch

@@ -1,57 +0,0 @@
-From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 12/35] libgcc_s
-
----
- gcc/config/i386/i386-expand.cc | 4 ++--
- libgcc/config/i386/cpuinfo.c   | 6 +++---
- libgcc/config/i386/t-linux     | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
-index 0d817fc3f3b..2e99db00db9 100644
---- a/gcc/config/i386/i386-expand.cc
-+++ b/gcc/config/i386/i386-expand.cc
-@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc.  */
-+	/* Make it call __cpu_indicator_init in libgcc.a.  */
- 	tree call_expr, fndecl, type;
- 	type = build_function_type_list (integer_type_node, NULL_TREE);
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0);
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 50b6d8248a2..724ced402a1 100644
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
- 			     __cpu_features2);
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
-diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 8506a635790..564296f788e 100644
---- a/libgcc/config/i386/t-linux
-+++ b/libgcc/config/i386/t-linux
-@@ -3,5 +3,5 @@
- # t-slibgcc-elf-ver and t-linux
- SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
- 
--HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
-+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
- CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--- 
-2.41.0
-

cross/gcc-riscv64/0013-nopie.patch

@@ -1,75 +0,0 @@
-From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 13/35] nopie
-
----
- gcc/configure    | 27 +++++++++++++++++++++++++++
- gcc/configure.ac | 13 +++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/gcc/configure b/gcc/configure
-index 8c46369f73f..e59cbee1767 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -32268,6 +32268,33 @@ fi
- $as_echo "$gcc_cv_no_pie" >&6; }
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
-+$as_echo_n "checking for -nopie option... " >&6; }
-+if test "${gcc_cv_nopie+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int main(void) {return 0;}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  gcc_cv_nopie=yes
-+else
-+  gcc_cv_nopie=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LDFLAGS="$saved_LDFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
-+$as_echo "$gcc_cv_nopie" >&6; }
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 5504bf6eb01..57268319de1 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
-    LDFLAGS="$saved_LDFLAGS"])
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  AC_CACHE_CHECK([for -nopie option],
-+    [gcc_cv_nopie],
-+    [saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     AC_LINK_IFELSE([int main(void) {return 0;}],
-+       [gcc_cv_nopie=yes],
-+       [gcc_cv_nopie=no])
-+     LDFLAGS="$saved_LDFLAGS"])
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- AC_SUBST([NO_PIE_FLAG])
- 
--- 
-2.41.0
-

cross/gcc-riscv64/0014-ada-fix-shared-linking.patch

@@ -1,42 +0,0 @@
-From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH 14/35] 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 f2126441208..22cfa9c641f 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.41.0
-

cross/gcc-riscv64/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,24 +0,0 @@
-From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:43 +0000
-Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
-
----
- Makefile.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 06a9398e172..6ff2b3f9925 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
- # built for the build system to override those in BASE_FLAGS_TO_PASS.
- EXTRA_BUILD_FLAGS = \
- 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
- 
- # This is the list of directories to built for the host system.
--- 
-2.41.0
-

cross/gcc-riscv64/0016-add-fortify-headers-paths.patch

@@ -1,25 +0,0 @@
-From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:01:06 +0000
-Subject: [PATCH 16/35] add fortify-headers paths
-
----
- gcc/config/linux.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gcc/config/linux.h b/gcc/config/linux.h
-index e3aca79cccc..b3537b8fbeb 100644
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -159,6 +159,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 
- #ifdef NATIVE_SYSTEM_HEADER_DIR
- #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- #else
--- 
-2.41.0
-

cross/gcc-riscv64/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,31 +0,0 @@
-From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Aug 2020 07:03:00 +0000
-Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
- link to it unconditionally, as otherwise we get link failures if some objects
- are -fstack-protector built and final link happens with -fno-stack-protector.
- This seems to be the common case when bootstrapping gcc, the piepatches do
- not seem to fully fix the crosstoolchain and bootstrap sequence wrt.
- stack-protector flag usage.
-
----
- gcc/gcc.cc | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index b5a6f200635..6cbb726599b 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -991,8 +991,7 @@ proper position among the other output files.  */
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
--- 
-2.41.0
-

cross/gcc-riscv64/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch

@@ -1,69 +0,0 @@
-From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:03:42 +0000
-Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
- linking libtsan.
-
----
- gcc/gcc.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 6cbb726599b..59390fd39d6 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -755,10 +755,10 @@ proper position among the other output files.  */
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libasan:--push-state --no-as-needed}" \
- 		     " -lasan " \
- 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libasan:--pop-state}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -794,10 +794,10 @@ proper position among the other output files.  */
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libtsan:--push-state --no-as-needed}" \
- 		     " -ltsan " \
- 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libtsan:--pop-state}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -815,10 +815,10 @@ proper position among the other output files.  */
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-liblsan:--push-state --no-as-needed}" \
- 		     " -llsan " \
- 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-liblsan:--pop-state}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -834,10 +834,10 @@ proper position among the other output files.  */
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libubsan:--push-state --no-as-needed}" \
- 		     " -lubsan " \
- 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libubsan:--pop-state}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.41.0
-

cross/gcc-riscv64/0019-aarch64-disable-multilib-support.patch

@@ -1,26 +0,0 @@
-From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:12:55 +0000
-Subject: [PATCH 19/35] 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 57bf4100fcd..172894b57ef 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.41.0
-

cross/gcc-riscv64/0020-s390x-disable-multilib-support.patch

@@ -1,25 +0,0 @@
-From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:13:59 +0000
-Subject: [PATCH 20/35] 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.41.0
-

cross/gcc-riscv64/0021-ppc64-le-disable-multilib-support.patch

@@ -1,81 +0,0 @@
-From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:33 +0000
-Subject: [PATCH 21/35] 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 4e371255533..128c75c7d39 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 01a94242308..b3a76379c03 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.cc
- 	$(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.41.0
-

cross/gcc-riscv64/0022-x86_64-disable-multilib-support.patch

@@ -1,26 +0,0 @@
-From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:14:54 +0000
-Subject: [PATCH 22/35] 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 138956b0962..bc03dab874f 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.41.0
-

cross/gcc-riscv64/0023-riscv-disable-multilib-support.patch

@@ -1,76 +0,0 @@
-From b26224acf342eacb33491f6ea0da1faf73d35715 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 23/35] 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 | 8 --------
- gcc/config/riscv/t-linux | 7 +++++--
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index f8c2c351e5a..8d9881eadeb 100644
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -61,11 +61,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/ "
--
--#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
-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.41.0
-

cross/gcc-riscv64/0024-always-build-libgcc_eh.a.patch

@@ -1,51 +0,0 @@
-From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:05:41 +0000
-Subject: [PATCH 24/35] 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 6c4dc79ab71..023cede18a7 100644
---- a/libgcc/Makefile.in
-+++ b/libgcc/Makefile.in
-@@ -960,8 +960,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)
-@@ -1163,10 +1164,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))))
-@@ -1183,6 +1180,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.41.0
-

cross/gcc-riscv64/0025-ada-libgnarl-compatibility-for-musl.patch

@@ -1,135 +0,0 @@
-From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:06:30 +0000
-Subject: [PATCH 25/35] 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 a5e645d334d..32165347071 100644
---- a/gcc/ada/libgnarl/s-osinte__linux.ads
-+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
-@@ -403,12 +403,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;
-@@ -470,11 +464,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 821ceef30e4..ae95b58e01e 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.41.0
-

cross/gcc-riscv64/0026-ada-musl-support-fixes.patch

@@ -1,223 +0,0 @@
-From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 07:07:48 +0000
-Subject: [PATCH 26/35] 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 96306f8cc9a..090b6770ae5 100644
---- a/gcc/ada/Makefile.rtl
-+++ b/gcc/ada/Makefile.rtl
-@@ -1549,7 +1549,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 \
-@@ -2174,7 +2174,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
-@@ -2205,7 +2205,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 \
-@@ -2420,7 +2420,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) \
-@@ -2524,7 +2524,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) \
-   $(SIMD_PATH_TARGET_PAIRS) \
-diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 8522094164e..92b230a462b 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
-@@ -3438,7 +3443,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
-@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
- 
- /* Dynamic cpu sets */
- 
--cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count)
- {
-   return CPU_ALLOC (count);
-@@ -3461,33 +3465,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
-@@ -3497,23 +3501,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 987432c9307..4d782f07de9 100644
---- a/gcc/ada/adaint.h
-+++ b/gcc/ada/adaint.h
-@@ -319,13 +319,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 c0ee4a16bb1..ed796a48c1b 100644
---- a/gcc/ada/terminals.c
-+++ b/gcc/ada/terminals.c
-@@ -1127,7 +1127,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
-@@ -1141,7 +1141,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)
-@@ -1190,8 +1190,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.41.0
-

cross/gcc-riscv64/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch

@@ -1,256 +0,0 @@
-From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
-From: Drew DeVault <sir@cmpwn.com>
-Date: Wed, 9 Dec 2020 07:42:06 +0000
-Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
- LINK_GCC_C_SEQUENCE_SPEC [PR81358]
-
-This fixes issues with RISC-V.
----
- Makefile.in           |  1 +
- gcc/config.in         |  6 ++++++
- gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure         | 31 ++++++++++++++++++++++++++++++-
- gcc/configure.ac      | 21 +++++++++++++++++++++
- gcc/doc/install.texi  |  8 ++++++++
- gcc/doc/tm.texi       |  8 +++++++-
- gcc/doc/tm.texi.in    |  8 +++++++-
- gcc/gcc.cc            | 12 +++++++++++-
- 9 files changed, 102 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6ff2b3f9925..394b105b271 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -235,6 +235,7 @@ HOST_EXPORTS = \
- 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
- 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
- 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-+	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
- 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
- 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
- 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-diff --git a/gcc/config.in b/gcc/config.in
-index 0679fbbf4c6..ee81139b385 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -118,6 +118,12 @@
- #endif
- 
- 
-+/* Define if libatomic should always be linked. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_AUTOLINK_LIBATOMIC
-+#endif
-+
-+
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index b26b17f2f2a..3f64ea46180 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
- #endif
- 
-+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
-+#  ifdef LD_AS_NEEDED_OPTION
-+#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
-+#  else
-+#    define LINK_LIBATOMIC_SPEC "-latomic"
-+#  endif
-+#elif !defined(LINK_LIBATOMIC_SPEC)
-+#  define LINK_LIBATOMIC_SPEC ""
-+#endif
-+
- #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
--  "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
-+  "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
-    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
- 
- #undef LINK_GCC_C_SEQUENCE_SPEC
-diff --git a/gcc/configure b/gcc/configure
-index e59cbee1767..787c35d4e25 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -984,6 +984,7 @@ with_changes_root_url
- enable_languages
- with_multilib_list
- with_multilib_generator
-+enable_autolink_libatomic
- with_zstd
- with_zstd_include
- with_zstd_lib
-@@ -1713,6 +1714,9 @@ Optional Features:
-   --disable-shared        don't provide a shared libgcc
-   --disable-gcov          don't provide libgcov and related host tools
-   --enable-languages=LIST specify which front-ends to build
-+  --enable-autolink-libatomic
-+                          enable automatic linking of libatomic (ignored if
-+                          not built)
-   --disable-rpath         do not hardcode runtime library paths
-   --enable-sjlj-exceptions
-                           arrange to use setjmp/longjmp exception handling
-@@ -8329,7 +8333,6 @@ else
- fi
- 
- 
--
- # Check whether --with-multilib-generator was given.
- if test "${with_multilib_generator+set}" = set; then :
-   withval=$with_multilib_generator; :
-@@ -8337,6 +8340,32 @@ else
-   with_multilib_generator=default
- fi
- 
-+# If libatomic is available, whether it should be linked automatically
-+# Check whether --enable-autolink-libatomic was given.
-+if test "${enable_autolink_libatomic+set}" = set; then :
-+  enableval=$enable_autolink_libatomic;
-+  case $enable_autolink_libatomic in
-+    yes | no) ;;
-+    *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
-+--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
-+  esac
-+
-+else
-+  enable_autolink_libatomic=''
-+fi
-+
-+
-+if test x$enable_autolink_libatomic = xyes; then
-+  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
-+
-+$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
-+
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
-+$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
-+  fi
-+fi
-+
- 
- # -------------------------
- # Checks for other programs
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 57268319de1..56bcaa87620 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
- :,
- with_multilib_generator=default)
- 
-+# If libatomic is available, whether it should be linked automatically
-+AC_ARG_ENABLE(autolink-libatomic,
-+[AS_HELP_STRING([--enable-autolink-libatomic],
-+		[enable automatic linking of libatomic (ignored if not built)])],
-+[
-+  case $enable_autolink_libatomic in
-+    yes | no) ;;
-+    *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
-+--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'.]) ;;
-+  esac
-+], [enable_autolink_libatomic=''])
-+
-+if test x$enable_autolink_libatomic = xyes; then
-+  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
-+    AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
-+	[Define if libatomic should always be linked.])
-+  else
-+    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
-+  fi
-+fi
-+
- # -------------------------
- # Checks for other programs
- # -------------------------
-diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index b30d3691fe6..ccc8e5dbb00 100644
---- a/gcc/doc/install.texi
-+++ b/gcc/doc/install.texi
-@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
- environments.  Enabled by default, and may be disabled using
- @option{--disable-canonical-system-headers}.
- 
-+@item --enable-autolink-libatomic
-+@itemx --disable-autolink-libatomic
-+Tell GCC that it should automatically link libatomic; if supported by
-+the linker, the file is only linked as needed. This flag is ignored
-+when libatomic is not built. Note that this conigure flag is in particular
-+useful when building an offloading-target compiler; as for those, a
-+user had to specify @code{-foffload=target=-latomic} otherwise.
-+
- @item --with-glibc-version=@var{major}.@var{minor}
- Tell GCC that when the GNU C Library (glibc) is used on the target it
- will be version @var{major}.@var{minor} or later.  Normally this can
-diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index a660e33739b..6183c407a2b 100644
---- a/gcc/doc/tm.texi
-+++ b/gcc/doc/tm.texi
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @defmac LINK_GCC_C_SEQUENCE_SPEC
- The sequence in which libgcc and libc are specified to the linker.
--By default this is @code{%G %L %G}.
-+By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
-+@end defmac
-+
-+@defmac LINK_LIBATOMIC_SPEC
-+This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
-+libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
-+is set.
- @end defmac
- 
- @defmac POST_LINK_SPEC
-diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index f7ab5d48a63..281540aba68 100644
---- a/gcc/doc/tm.texi.in
-+++ b/gcc/doc/tm.texi.in
-@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
- 
- @defmac LINK_GCC_C_SEQUENCE_SPEC
- The sequence in which libgcc and libc are specified to the linker.
--By default this is @code{%G %L %G}.
-+By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
-+@end defmac
-+
-+@defmac LINK_LIBATOMIC_SPEC
-+This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
-+libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
-+is set.
- @end defmac
- 
- @defmac POST_LINK_SPEC
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 59390fd39d6..dae1dd4cf79 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -974,13 +974,23 @@ proper position among the other output files.  */
- # define ASM_DEBUG_OPTION_SPEC ""
- #endif
- 
-+#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
-+#  ifdef LD_AS_NEEDED_OPTION
-+#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
-+#  else
-+#    define LINK_LIBATOMIC_SPEC "-latomic"
-+#  endif
-+#elif !defined(LINK_LIBATOMIC_SPEC)
-+#  define LINK_LIBATOMIC_SPEC ""
-+#endif
-+
- /* Here is the spec for running the linker, after compiling all files.  */
- 
- /* This is overridable by the target in case they need to specify the
-    -lgcc and -lc order specially, yet not require them to override all
-    of LINK_COMMAND_SPEC.  */
- #ifndef LINK_GCC_C_SEQUENCE_SPEC
--#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
-+#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
- #endif
- 
- #ifdef ENABLE_DEFAULT_SSP
--- 
-2.41.0
-

cross/gcc-riscv64/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch

@@ -1,57 +0,0 @@
-From 5bbbd320e54ab5341cfba83e8af98685131caba1 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 12:23:34 +0200
-Subject: [PATCH 28/35] 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 a92ae9e8309..90b579ca4d8 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.41.0
-

cross/gcc-riscv64/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

@@ -1,27 +0,0 @@
-From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Thu, 30 Jun 2022 16:44:51 +0000
-Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
- musl targets
-
----
- libstdc++-v3/config/locale/generic/c_locale.cc | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
-index 8849d78fdfa..aff467f98fe 100644
---- a/libstdc++-v3/config/locale/generic/c_locale.cc
-+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
-@@ -242,9 +242,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-     // Currently, the generic model only supports the "C" locale.
-     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
-     __cloc = 0;
--    if (strcmp(__s, "C"))
--      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
--			    "name not valid"));
-   }
- 
-   void
--- 
-2.41.0
-

cross/gcc-riscv64/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch

@@ -1,27 +0,0 @@
-From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
-From: Mathias LANG <pro.mathias.lang@gmail.com>
-Date: Mon, 17 Jan 2022 03:49:21 +0000
-Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
- libucontext
-
-ref: alpine/aports#13422
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 394b105b271..bc4a77fc300 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52809,7 +52809,7 @@ configure-target-libphobos:
- 	esac; \
- 	module_srcdir=libphobos; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
--- 
-2.41.0
-

cross/gcc-riscv64/0031-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,54 +0,0 @@
-From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sat, 16 Jul 2022 09:21:11 +0200
-Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
-
-On musl-based Linux distributions, swapcontext etc. are not provided by
-musl but instead by libucontext. Hence, we _always_ need to link against
-an external library for these functions.
----
- libphobos/configure                | 8 --------
- libphobos/m4/druntime/libraries.m4 | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/libphobos/configure b/libphobos/configure
-index 925c53c5f5e..60c2a0c11c6 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -15216,14 +15216,6 @@ fi
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[34567]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
- $as_echo_n "checking for library containing swapcontext... " >&6; }
-diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
-index 45a56f6f76a..fef6e890b1e 100644
---- a/libphobos/m4/druntime/libraries.m4
-+++ b/libphobos/m4/druntime/libraries.m4
-@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
-   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
-   # "yes" for targets that have 'version = AsmExternal'.
-   druntime_fiber_asm_external=no
--  case "$target_cpu" in
--    aarch64* | \
--    arm* | \
--    i[[34567]]86|x86_64 | \
--    powerpc)
--      druntime_fiber_asm_external=yes
--      ;;
--  esac
-   if test "$druntime_fiber_asm_external" = no; then
-     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
-       AC_MSG_ERROR([swapcontext required but not found]))
--- 
-2.41.0
-

cross/gcc-riscv64/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch

@@ -1,25 +0,0 @@
-From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Tue, 19 Jul 2022 14:54:07 +0200
-Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
-
----
- gcc/ada/libgnat/s-parame.ads | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/ada/libgnat/s-parame.ads b/gcc/ada/libgnat/s-parame.ads
-index 3d6e345a1ba..cfe0b4d3ca6 100644
---- a/gcc/ada/libgnat/s-parame.ads
-+++ b/gcc/ada/libgnat/s-parame.ads
-@@ -102,7 +102,7 @@ package System.Parameters is
-    -- Characteristics of time_t type --
-    ------------------------------------
- 
--   time_t_bits : constant := Long_Integer'Size;
-+   time_t_bits : constant := Long_Long_Integer'Size;
-    --  Number of bits in type time_t
- 
-    ----------------------------------------------
--- 
-2.41.0
-

cross/gcc-riscv64/0033-libphobos-do-not-use-LFS64-symbols.patch

@@ -1,44 +0,0 @@
-From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 29 May 2023 15:33:11 +0000
-Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
-
-musl does not have these since 1.2.4, we can't use the compat interfaces.
----
- libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
- libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
-index ae6752f220e..6b80d1ff0e6 100644
---- a/libphobos/libdruntime/core/sys/posix/config.d
-+++ b/libphobos/libdruntime/core/sys/posix/config.d
-@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
-     enum __REDIRECT          = false;
- 
-     // Those three are irrelevant for Musl as it always uses 64 bits off_t
--    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
-+    enum __USE_FILE_OFFSET64 = false;
-     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
-     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
- 
-diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-index 0d3d517d69a..323aa0af72d 100644
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
-@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
--    static if (__USE_FILE_OFFSET64)
--        alias mmap = mmap64;
--    else
--        void* mmap(void*, size_t, int, int, int, off_t);
-+    void* mmap(void*, size_t, int, int, int, off_t);
-     int munmap(void*, size_t);
- }
- else version (CRuntime_UClibc)
--- 
-2.41.0
-

cross/gcc-riscv64/0034-libgo-fix-lfs64-use.patch

@@ -1,195 +0,0 @@
-From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Mon, 10 Jul 2023 23:23:29 +0000
-Subject: [PATCH 34/35] libgo: fix lfs64 use
-
----
- .../go/internal/syscall/unix/at_largefile.go  |  2 +-
- libgo/go/os/dir_largefile.go                  |  2 +-
- libgo/go/syscall/libcall_glibc.go             |  2 +-
- libgo/go/syscall/libcall_linux.go             |  4 +--
- libgo/go/syscall/libcall_posix_largefile.go   | 26 +++++++++----------
- libgo/runtime/go-varargs.c                    |  2 +-
- libgo/sysinfo.c                               |  9 +++----
- 7 files changed, 22 insertions(+), 25 deletions(-)
-
-diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
-index 82e0dcfd074..16151ecad1b 100644
---- a/libgo/go/internal/syscall/unix/at_largefile.go
-+++ b/libgo/go/internal/syscall/unix/at_largefile.go
-@@ -10,5 +10,5 @@ import (
- 	"syscall"
- )
- 
--//extern fstatat64
-+//extern fstatat
- func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
-diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
-index 1fc5ee0771f..0c6dffe1a75 100644
---- a/libgo/go/os/dir_largefile.go
-+++ b/libgo/go/os/dir_largefile.go
-@@ -11,5 +11,5 @@ package os
- 
- import "syscall"
- 
--//extern readdir64
-+//extern readdir
- func libc_readdir(*syscall.DIR) *syscall.Dirent
-diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
-index 5c1ec483c75..5a1245ed44b 100644
---- a/libgo/go/syscall/libcall_glibc.go
-+++ b/libgo/go/syscall/libcall_glibc.go
-@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
- }
- 
- //sys	sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
--//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
-+//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
- 
- func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
- 	if race.Enabled {
-diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
-index 03ca7261b59..ad21fd0b3ac 100644
---- a/libgo/go/syscall/libcall_linux.go
-+++ b/libgo/go/syscall/libcall_linux.go
-@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
- //adjtimex(buf *Timex) _C_int
- 
- //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
--//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
-+//fstatfs(fd _C_int, buf *Statfs_t) _C_int
- 
- func Gettid() (tid int) {
- 	r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
-@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
- }
- 
- //sys	Statfs(path string, buf *Statfs_t) (err error)
--//statfs64(path *byte, buf *Statfs_t) _C_int
-+//statfs(path *byte, buf *Statfs_t) _C_int
- 
- //sysnb	Sysinfo(info *Sysinfo_t) (err error)
- //sysinfo(info *Sysinfo_t) _C_int
-diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
-index f90055bb29a..334212f0af1 100644
---- a/libgo/go/syscall/libcall_posix_largefile.go
-+++ b/libgo/go/syscall/libcall_posix_largefile.go
-@@ -10,40 +10,40 @@
- package syscall
- 
- //sys	Creat(path string, mode uint32) (fd int, err error)
--//creat64(path *byte, mode Mode_t) _C_int
-+//creat(path *byte, mode Mode_t) _C_int
- 
- //sys	Fstat(fd int, stat *Stat_t) (err error)
--//fstat64(fd _C_int, stat *Stat_t) _C_int
-+//fstat(fd _C_int, stat *Stat_t) _C_int
- 
- //sys	Ftruncate(fd int, length int64) (err error)
--//ftruncate64(fd _C_int, length Offset_t) _C_int
-+//ftruncate(fd _C_int, length Offset_t) _C_int
- 
- //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
--//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
-+//getrlimit(resource _C_int, rlim *Rlimit) _C_int
- 
- //sys	Lstat(path string, stat *Stat_t) (err error)
--//lstat64(path *byte, stat *Stat_t) _C_int
-+//lstat(path *byte, stat *Stat_t) _C_int
- 
- //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
--//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
-+//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
- 
- //sys	Open(path string, mode int, perm uint32) (fd int, err error)
--//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
-+//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
- 
- //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
--//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
-+//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
- 
- //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
--//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
-+//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
- 
- //sys	Seek(fd int, offset int64, whence int) (off int64, err error)
--//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
-+//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
- 
- //sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
--//setrlimit64(resource int, rlim *Rlimit) _C_int
-+//setrlimit(resource int, rlim *Rlimit) _C_int
- 
- //sys	Stat(path string, stat *Stat_t) (err error)
--//stat64(path *byte, stat *Stat_t) _C_int
-+//stat(path *byte, stat *Stat_t) _C_int
- 
- //sys	Truncate(path string, length int64) (err error)
--//truncate64(path *byte, length Offset_t) _C_int
-+//truncate(path *byte, length Offset_t) _C_int
-diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
-index f84860891e6..7efc9615985 100644
---- a/libgo/runtime/go-varargs.c
-+++ b/libgo/runtime/go-varargs.c
-@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
- int
- __go_open64 (char *path, int mode, mode_t perm)
- {
--  return open64 (path, mode, perm);
-+  return open (path, mode, perm);
- }
- 
- #endif
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index 180f5c31d74..1d717d55c0e 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
- #endif
- 
- #if defined(HAVE_OFF64_T)
--typedef off64_t libgo_off_t_type;
-+typedef off_t libgo_off_t_type;
- #else
- typedef off_t libgo_off_t_type;
- #endif
-@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
- 
- // From dirent.h
- SREF(dirent);
--SREF(dirent64);
- OTREF(DIR);
- EREF(DT_UNKNOWN);
- 
- // From fcntl.h
- SREF(flock);
--SREF(flock64);
- 
- // From ffi headers
- SREF(_ffi_type);
-@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
- EREF(SEGV_MAPERR);
- 
- // From stat.h
--SREF(stat64);
-+SREF(stat);
- 
- // From statfs.h
- SREF(statfs);
--SREF(statfs64);
- 
- // From sysinfo.h
- SREF(sysinfo);
-@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
- 
- // From sys/resource.h
- SREF(rusage);
--SREF(rlimit64);
-+SREF(rlimit);
- EREF(RLIMIT_NOFILE);
- EREF(PRIO_USER);
- EREF(RUSAGE_SELF);
--- 
-2.41.0
-

cross/gcc-riscv64/0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch

@@ -1,186 +0,0 @@
-https://gcc.gnu.org/PR110792
-https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=790c1f60a5662b16eb19eb4b81922995863c7571
-https://github.com/randombit/botan/issues/3637
-
-From 85628c5653ff40963158a24c60eeec6a3b5a8e56 Mon Sep 17 00:00:00 2001
-From: Roger Sayle <roger@nextmovesoftware.com>
-Date: Thu, 3 Aug 2023 07:12:04 +0100
-Subject: [PATCH] PR target/110792: Early clobber issues with
- rot32di2_doubleword on i386.
-
-This patch is a conservative fix for PR target/110792, a wrong-code
-regression affecting doubleword rotations by BITS_PER_WORD, which
-effectively swaps the highpart and lowpart words, when the source to be
-rotated resides in memory. The issue is that if the register used to
-hold the lowpart of the destination is mentioned in the address of
-the memory operand, the current define_insn_and_split unintentionally
-clobbers it before reading the highpart.
-
-Hence, for the testcase, the incorrectly generated code looks like:
-
-        salq    $4, %rdi		// calculate address
-        movq    WHIRL_S+8(%rdi), %rdi	// accidentally clobber addr
-        movq    WHIRL_S(%rdi), %rbp	// load (wrong) lowpart
-
-Traditionally, the textbook way to fix this would be to add an
-explicit early clobber to the instruction's constraints.
-
- (define_insn_and_split "<insn>32di2_doubleword"
-- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
-+ [(set (match_operand:DI 0 "register_operand" "=r,r,&r")
-        (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
-                       (const_int 32)))]
-
-but unfortunately this currently generates significantly worse code,
-due to a strange choice of reloads (effectively memcpy), which ends up
-looking like:
-
-        salq    $4, %rdi		// calculate address
-        movdqa  WHIRL_S(%rdi), %xmm0	// load the double word in SSE reg.
-        movaps  %xmm0, -16(%rsp)	// store the SSE reg back to the stack
-        movq    -8(%rsp), %rdi		// load highpart
-        movq    -16(%rsp), %rbp		// load lowpart
-
-Note that reload's "&" doesn't distinguish between the memory being
-early clobbered, vs the registers used in an addressing mode being
-early clobbered.
-
-The fix proposed in this patch is to remove the third alternative, that
-allowed offsetable memory as an operand, forcing reload to place the
-operand into a register before the rotation.  This results in:
-
-        salq    $4, %rdi
-        movq    WHIRL_S(%rdi), %rax
-        movq    WHIRL_S+8(%rdi), %rdi
-        movq    %rax, %rbp
-
-I believe there's a more advanced solution, by swapping the order of
-the loads (if first destination register is mentioned in the address),
-or inserting a lea insn (if both destination registers are mentioned
-in the address), but this fix is a minimal "safe" solution, that
-should hopefully be suitable for backporting.
-
-2023-08-03  Roger Sayle  <roger@nextmovesoftware.com>
-
-gcc/ChangeLog
-	PR target/110792
-	* config/i386/i386.md (<any_rotate>ti3): For rotations by 64 bits
-	place operand in a register before gen_<insn>64ti2_doubleword.
-	(<any_rotate>di3): Likewise, for rotations by 32 bits, place
-	operand in a register before gen_<insn>32di2_doubleword.
-	(<any_rotate>32di2_doubleword): Constrain operand to be in register.
-	(<any_rotate>64ti2_doubleword): Likewise.
-
-gcc/testsuite/ChangeLog
-	PR target/110792
-	* g++.target/i386/pr110792.C: New 32-bit C++ test case.
-	* gcc.target/i386/pr110792.c: New 64-bit C test case.
-
-(cherry picked from commit 790c1f60a5662b16eb19eb4b81922995863c7571)
----
- gcc/config/i386/i386.md                  | 18 ++++++++++++------
- gcc/testsuite/g++.target/i386/pr110792.C | 16 ++++++++++++++++
- gcc/testsuite/gcc.target/i386/pr110792.c | 18 ++++++++++++++++++
- 3 files changed, 46 insertions(+), 6 deletions(-)
- create mode 100644 gcc/testsuite/g++.target/i386/pr110792.C
- create mode 100644 gcc/testsuite/gcc.target/i386/pr110792.c
-
-diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
-index f3a3305..a71e837 100644
---- a/gcc/config/i386/i386.md
-+++ b/gcc/config/i386/i386.md
-@@ -14359,7 +14359,10 @@
-     emit_insn (gen_ix86_<insn>ti3_doubleword
- 		(operands[0], operands[1], operands[2]));
-   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 64)
--    emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
-+    {
-+      operands[1] = force_reg (TImode, operands[1]);
-+      emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
-+    }
-   else
-     {
-       rtx amount = force_reg (QImode, operands[2]);
-@@ -14394,7 +14397,10 @@
-     emit_insn (gen_ix86_<insn>di3_doubleword
- 		(operands[0], operands[1], operands[2]));
-   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 32)
--    emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
-+    {
-+      operands[1] = force_reg (DImode, operands[1]);
-+      emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
-+    }
-   else
-     FAIL;
- 
-@@ -14562,8 +14568,8 @@
- })
- 
- (define_insn_and_split "<insn>32di2_doubleword"
-- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
--       (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
-+ [(set (match_operand:DI 0 "register_operand" "=r,r")
-+       (any_rotate:DI (match_operand:DI 1 "register_operand" "0,r")
-                       (const_int 32)))]
-  "!TARGET_64BIT"
-  "#"
-@@ -14580,8 +14586,8 @@
- })
- 
- (define_insn_and_split "<insn>64ti2_doubleword"
-- [(set (match_operand:TI 0 "register_operand" "=r,r,r")
--       (any_rotate:TI (match_operand:TI 1 "nonimmediate_operand" "0,r,o")
-+ [(set (match_operand:TI 0 "register_operand" "=r,r")
-+       (any_rotate:TI (match_operand:TI 1 "register_operand" "0,r")
-                       (const_int 64)))]
-  "TARGET_64BIT"
-  "#"
-diff --git a/gcc/testsuite/g++.target/i386/pr110792.C b/gcc/testsuite/g++.target/i386/pr110792.C
-new file mode 100644
-index 0000000..ce21a7a
---- /dev/null
-+++ b/gcc/testsuite/g++.target/i386/pr110792.C
-@@ -0,0 +1,16 @@
-+/* { dg-do compile { target ia32 } } */
-+/* { dg-options "-O2" } */
-+
-+template <int ROT, typename T>
-+inline T rotr(T input)
-+{
-+   return static_cast<T>((input >> ROT) | (input << (8 * sizeof(T) - ROT)));
-+}
-+
-+unsigned long long WHIRL_S[256] = {0x18186018C07830D8};
-+unsigned long long whirl(unsigned char x0)
-+{
-+   const unsigned long long s4 = WHIRL_S[x0&0xFF];
-+   return rotr<32>(s4);
-+}
-+/* { dg-final { scan-assembler-not "movl\tWHIRL_S\\+4\\(,%eax,8\\), %eax" } } */
-diff --git a/gcc/testsuite/gcc.target/i386/pr110792.c b/gcc/testsuite/gcc.target/i386/pr110792.c
-new file mode 100644
-index 0000000..b65125c
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr110792.c
-@@ -0,0 +1,18 @@
-+/* { dg-do compile { target int128 } } */
-+/* { dg-options "-O2" } */
-+
-+static inline unsigned __int128 rotr(unsigned __int128 input)
-+{
-+   return ((input >> 64) | (input << (64)));
-+}
-+
-+unsigned __int128 WHIRL_S[256] = {((__int128)0x18186018C07830D8) << 64 |0x18186018C07830D8};
-+unsigned __int128 whirl(unsigned char x0)
-+{
-+   register int t __asm("rdi") = x0&0xFF;
-+   const unsigned __int128 s4 = WHIRL_S[t];
-+   register unsigned __int128 tt  __asm("rdi") = rotr(s4);
-+   asm("":::"memory");
-+   return tt;
-+}
-+/* { dg-final { scan-assembler-not "movq\tWHIRL_S\\+8\\(%rdi\\), %rdi" } } */
--- 
-2.41.0
-

cross/gcc-riscv64/0037-loongarch-disable-multilib-support.patch

@@ -1,61 +0,0 @@
-From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
-From: Jingyun Hua <huajingyun@loongson.cn>
-Date: Mon, 7 Aug 2023 15:25:58 +0800
-Subject: [PATCH] loongarch disable multilib support
-
-Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
----
- gcc/config/loongarch/linux.h    | 10 +---------
- gcc/config/loongarch/t-linux    | 18 +++---------------
- 3 files changed, 5 insertions(+), 25 deletions(-)
-
-diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
-index 9059d2441..23eaff0cc 100644
---- a/gcc/config/loongarch/linux.h
-+++ b/gcc/config/loongarch/linux.h
-@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
-  * can work in a multilib environment.  */
- 
- #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
--
--  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
--    #define ABI_LIBDIR "lib64"
--  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
--    #define ABI_LIBDIR "lib64/f32"
--  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
--    #define ABI_LIBDIR "lib64/sf"
--  #endif
--
-+    #define ABI_LIBDIR "lib"
- #endif
- 
- #ifndef ABI_LIBDIR
-diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
-index e40da1792..f72c6e878 100644
---- a/gcc/config/loongarch/t-linux
-+++ b/gcc/config/loongarch/t-linux
-@@ -36,18 +36,6 @@ else
- endif
- 
- # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
--ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
--
--    MULTILIB_OSDIRNAMES = \
--      mabi.lp64d=../lib64$\
--      $(call if_multiarch,:loongarch64-linux-gnu)
--
--    MULTILIB_OSDIRNAMES += \
--      mabi.lp64f=../lib64/f32$\
--      $(call if_multiarch,:loongarch64-linux-gnuf32)
--
--    MULTILIB_OSDIRNAMES += \
--      mabi.lp64s=../lib64/sf$\
--      $(call if_multiarch,:loongarch64-linux-gnusf)
--
--endif
-+    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
-+    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
--- 
-2.41.0
-

cross/gcc-riscv64/APKBUILD

@@ -1,833 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen gcc-riscv64
-# Based on: main/gcc (from Alpine)
-
-CTARGET_ARCH=riscv64
-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"
-
-# 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-riscv64
-pkgver=13.2.1_git20240309
-# i.e. 13.2.1, must match gcc/BASE-VER
-_pkgbase="${pkgver%%_git*}"
-# date component from snapshots
-_pkgsnap="${pkgver##*_git}"
-[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
-[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
-[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
-
-pkgname=gcc-riscv64
-pkgrel=0
-pkgdesc="Stage2 cross-compiler for riscv64"
-url="https://gcc.gnu.org"
-arch="x86_64"
-license="GPL-2.0-or-later AND LGPL-2.1-or-later"
-_gccrel=$pkgver-r$pkgrel
-depends="binutils-riscv64 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-riscv64 binutils-riscv64"
-subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
-replaces="libstdc++ binutils"
-options="!strip"
-
-: "${LANG_CXX:=true}"
-: "${LANG_D:=true}"
-: "${LANG_OBJC:=true}"
-: "${LANG_GO:=true}"
-: "${LANG_FORTRAN:=true}"
-: "${LANG_ADA:=true}"
-: "${LANG_JIT:=true}"
-
-_libgomp=true
-_libgcc=false
-_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
-
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# 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 -g0 ${CFLAGS/-Werror=format-security/}"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
-	unset CPPFLAGS
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	STRIP_FOR_TARGET="$CTARGET-strip"
-elif [ "$CBUILD" != "$CHOST" ]; then
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/}"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
-	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"
-
-	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
-	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
-	# pass -g0 by default to bypass -g, since we don't do debug
-	# if -dbg added, the -g is appended and overrides this
-	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/} -O2"
-	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/} -O2"
-	unset CPPFLAGS
-	# https://gcc.gnu.org/install/build.html
-	export CFLAGS_FOR_TARGET="$CFLAGS"
-	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
-	export LDFLAGS_FOR_TARGET="$LDFLAGS"
-	export BOOT_CFLAGS="$CFLAGS"
-	export BOOT_CXXFLAGS="$CXXFLAGS"
-	export BOOT_LDFLAGS="$LDFLAGS"
-fi
-
-case "$CARCH" in
-# GDC hasn't been ported to PowerPC
-# See libphobos/configure.tgt in GCC sources for supported targets
-# riscv fails with: error: static assert  "unimplemented"
-ppc64le|riscv64|loongarch64)	LANG_D=false ;;
-# GDC does currently not work on 32-bit musl architectures.
-# This is a known upstream issue.
-# See: https://github.com/dlang/druntime/pull/3383
-armhf|armv7|x86)	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 ;;
-loongarch64)	_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 ;;
-loongarch64)	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 | ppc64le)	_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
-
-case "$CTARGET_ARCH" in
-loongarch64)
-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 gcc-gdc-bootstrap"
-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 gcc-gnat$_target:gnat"
-	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
-fi
-if $LANG_JIT; then
-	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
-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. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
-# However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
-# mirrored on dev.alpinelinux.org. Please ensure that the snapshot Git commit (as stated in the
-# README) matches the base commit on the version-specific branch in the Git repository below.
-#
-# 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/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.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-libgcc_s.patch
-	0013-nopie.patch
-	0014-ada-fix-shared-linking.patch
-	0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-	0016-add-fortify-headers-paths.patch
-	0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-	0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-	0019-aarch64-disable-multilib-support.patch
-	0020-s390x-disable-multilib-support.patch
-	0021-ppc64-le-disable-multilib-support.patch
-	0022-x86_64-disable-multilib-support.patch
-	0023-riscv-disable-multilib-support.patch
-	0024-always-build-libgcc_eh.a.patch
-	0025-ada-libgnarl-compatibility-for-musl.patch
-	0026-ada-musl-support-fixes.patch
-	0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-	0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-	0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-	0031-druntime-link-against-libucontext-on-all-platforms.patch
-	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-	0033-libphobos-do-not-use-LFS64-symbols.patch
-	0034-libgo-fix-lfs64-use.patch
-	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-	0037-loongarch-disable-multilib-support.patch
-	"
-
-# secfixes:
-#   13.2.1_git20231014-r0:
-#     - CVE-2023-4039
-
-# we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-_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=armv6kz --with-tune=arm1176jzf-s --with-fpu=vfpv2 --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=pentium-m --with-fpmath=sse --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";;
-	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
-	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 libsanitizer
-		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --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 ""
-
-	local version="Alpine $pkgver"
-	local gccconfiguration="
-		--prefix=/usr
-		--mandir=/usr/share/man
-		--infodir=/usr/share/info
-		--build=$CBUILD
-		--host=$CHOST
-		--target=$CTARGET
-		--enable-checking=release
-		--disable-cet
-		--disable-fixed-point
-		--disable-libstdcxx-pch
-		--disable-multilib
-		--disable-nls
-		--disable-werror
-		$_symvers
-		--enable-__cxa_atexit
-		--enable-default-pie
-		--enable-default-ssp
-		--enable-languages=$_languages
-		--enable-link-serialization=2
-		--enable-linker-build-id
-		$_arch_configure
-		$_libc_configure
-		$_cross_configure
-		$_bootstrap_configure
-		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
-		--with-system-zlib
-		$_hash_style_configure
-		"
-
-	mkdir -p "$_builddir"
-	cd "$_builddir"
-	"$_gccdir"/configure $gccconfiguration \
-		--with-pkgversion="$version"
-
-	msg "building gcc"
-	make
-
-	# we build gccjit separate to not build all of gcc with --enable-host-shared
-	# as doing so slows it down a few %, so for some quick if's here we gain
-	# free performance
-	if $LANG_JIT; then
-		mkdir -p "$_builddir"/libgccjit-build
-		cd "$_builddir"/libgccjit-build
-		"$_gccdir"/configure $gccconfiguration \
-			--disable-bootstrap \
-			--enable-host-shared \
-			--enable-languages=jit \
-			--with-pkgversion="$version"
-
-		msg "building libgccjit"
-		make all-gcc
-	fi
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	ln -s gcc "$pkgdir"/usr/bin/cc
-	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
-
-	if $LANG_JIT; then
-		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
-	fi
-
-	# 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 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
-		if [ "$CHOST" = "$CTARGET" ]; then
-			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
-	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/
-}
-
-libcxx_dev() {
-	pkgdesc="GNU C++ standard runtime library (development files)"
-	depends=
-	replaces="g++"
-
-	amove usr/${_target:+$CTARGET/}lib/libstdc++.a \
-		usr/${_target:+$CTARGET/}lib/libstdc++exp.a \
-		usr/${_target:+$CTARGET/}lib/libstdc++.so \
-		usr/${_target:+$CTARGET/}lib/libstdc++fs.a \
-		usr/${_target:+$CTARGET/}lib/libsupc++.a \
-		usr/${_target:+$CTARGET/}include/c++
-}
-
-gpp() {
-	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_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/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"
-	provides="gcc-gdc-bootstrap=$_gccrel"
-
-	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="GCC Go frontend (intended for bootstrapping community/go)"
-	depends="gcc=$_gccrel libgo=$_gccrel !go"
-	install="$pkgname-go.post-install"
-
-	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=$_gccrel"
-	[ "$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/
-}
-
-gdb() {
-	pkgdesc="$pkgdesc (gdb printers)"
-	install_if="$pkgname=$pkgver-r$pkgrel gdb"
-
-	amove \
-		usr/share/gdb/python/ \
-		usr/share/gcc-*/python/
-}
-
-sha512sums="
-2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
-1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
-163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
-3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
-17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
-7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
-93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
-9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
-b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
-0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
-00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
-0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
-a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
-f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
-44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
-e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
-ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
-8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
-30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  0026-ada-musl-support-fixes.patch
-3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
-2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
-d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
-b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
-c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
-cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
-d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
-"

cross/gcc-riscv64/gcc-go.post-install

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cat 1>&2 <<EOF
-*
-* gcc-go is used in Alpine for bootstrapping Go.
-* It is currently discouraged to use it for other purposes.
-*
-EOF

cross/gcc-x86_64/0001-posix_memalign.patch

@@ -1,42 +0,0 @@
-From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 01/35] posix_memalign
-
----
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index 3527283693b..c4071b64b53 100644
---- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
--   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
--extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
--extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
--  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
--- 
-2.41.0
-

cross/gcc-x86_64/0002-gcc-poison-system-directories.patch

@@ -1,203 +0,0 @@
-From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 02/35] gcc: poison-system-directories
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
----
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.cc          |  2 ++
- gcc/incpath.cc      | 21 +++++++++++++++++++++
- 7 files changed, 68 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 862c474d3c8..64c4277c991 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -711,6 +711,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one variable shadows another.  Same as -Wshadow=global.
-diff --git a/gcc/config.in b/gcc/config.in
-index 4cad077bfbe..0679fbbf4c6 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -236,6 +236,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index c7b26d1927d..8c46369f73f 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -1026,6 +1026,7 @@ enable_maintainer_mode
- enable_link_mutex
- enable_link_serialization
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1788,6 +1789,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 09082e8ccae..5504bf6eb01 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index af0e5933fdb..b6731a4673c 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
- -Wparentheses  -Wno-pedantic-ms-format
- -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
-+-Wno-poison-system-directories
- -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
- -Wrestrict  -Wno-return-local-addr  -Wreturn-type
- -Wno-scalar-storage-order  -Wsequence-point
-@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
- 
-+@opindex Wno-poison-system-directories
-+@item -Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @opindex Wfloat-equal
- @opindex Wno-float-equal
- @item -Wfloat-equal
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 16bb07f2cdc..33b56e721d2 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.cc b/gcc/incpath.cc
-index 4d44321183f..0f3f071b44c 100644
---- a/gcc/incpath.cc
-+++ b/gcc/incpath.cc
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
--- 
-2.41.0
-

cross/gcc-x86_64/0003-specs-turn-on-Wl-z-now-by-default.patch

@@ -1,44 +0,0 @@
-From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:45:49 +0000
-Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
-
-Previously, we also used to turn on -z relro here, but we now build
-binutils with --enable-relro, which is functionally equivalent.
-
-Binutils does not appear to have a similar option for enabling -z
-now by default.
----
- gcc/doc/invoke.texi | 3 +++
- gcc/gcc.cc          | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index b6731a4673c..f393c7846c6 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
- linker.  When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
-+
- @opindex u
- @item -u @var{symbol}
- Pretend the symbol @var{symbol} is undefined, to force linking of
-diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 33b56e721d2..f82fae23c22 100644
---- a/gcc/gcc.cc
-+++ b/gcc/gcc.cc
-@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
-    "%{flto|flto=*:%<fcompare-debug*} \
-     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-     %{Wno-poison-system-directories:--no-poison-system-directories} \
--- 
-2.41.0
-