temp/libssc: patch 103 threading

DO NOT MERGE

.ci/apkbuild-lint.sh

@@ -1,14 +1,12 @@
 #!/bin/sh -e
 # Description: run apkbuild-lint on modified APKBUILDs
-# Options: native
-# Use 'native' because it requires git commit history.
+# Options: with-dot-git
 # https://postmarketos.org/pmb-ci
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	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"
+	apk add atools git python3
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
 .ci/lib/apkbuild_linting.py

.ci/build-docs.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+# Copyright 2025 Pablo Correa Gomez
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Description: create documentation with antora
+# Options: with-dot-git
+# Artifacts: build/site
+# https://postmarketos.org/pmb-ci
+
+
+# Install dependencies
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add py3-pip make git
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+cd docs/
+make venv
+make

.ci/build-ppc64le.sh

@@ -0,0 +1 @@
+lib/build_changed_aports.sh

.ci/dint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -e
+# Description: Validate and lint deviceinfo files
+# Options: with-dot-git
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk add git python3
+	apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+.ci/lib/deviceinfo_linting.py

.ci/grep.sh

@@ -94,4 +94,20 @@ if grep -qEr '^deviceinfo_kernel_cmdline.*[\"\s]console=null' -- device/; then
 	exit_code=1
 fi
 
+# Disallow installation of files to /etc/modules-load.d and /etc/modprobe.d
+if grep -qr '/etc/modules-load.d' --exclude-dir='device-samsung-golden-downstream' -- *; then
+	echo "ERROR: Please replace '/etc/modules-load.d' with '/usr/lib/modules-load.d' in the following files:"
+	grep --color=always -r '/etc/modules-load.d' --exclude-dir='device-samsung-golden-downstream' -- *
+	exit_code=1
+fi
+# n900 is excluded because the string is in a comment linking to a repo.
+# No other non-archived devices should be excluded.
+if grep -qr '/etc/modprobe.d' --exclude-dir='archived' \
+		--exclude-dir='device-nokia-n900' -- *; then
+			echo "ERROR: Please replace '/etc/modprobe.d' with '/usr/lib/modprobe.d' in the following files:"
+			grep --color=always -r '/etc/modprobe.d' --exclude-dir='device-nokia-n900' \
+				--exclude-dir='archived' -- *
+	exit_code=1
+fi
+
 exit "$exit_code"

.ci/lib/apkbuild_linting.py

@@ -2,25 +2,62 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import common
-import os.path
+import os
 import sys
+import subprocess
+import tomllib
+
+
+custom_valid_options = [
+    "!pmb:crossdirect",
+    "!pmb:kconfigcheck",
+    "pmb:cross-native",
+    "pmb:cross-native2",
+    "pmb:drm",
+    "pmb:gpu-accel",  # deprecated
+    "pmb:strict",
+    "pmb:systemd",
+    "pmb:systemd-never",
+]
+
+
+def get_kconfigcheck_categories() -> list [str]:
+    with open("kconfigcheck.toml", "rb") as kconfigcheck_config:
+        kconfigcheck_data = tomllib.load(kconfigcheck_config)
+
+    kconfigcheck_categories = []
+
+    for category_name in kconfigcheck_data:
+        if category_name == "aliases":
+            for alias_name in kconfigcheck_data["aliases"]:
+                kconfigcheck_categories.append(f"pmb:kconfigcheck-{alias_name}")
+        else:
+            kconfigcheck_categories.append(category_name)
+
+    return [item.replace("category:", "pmb:kconfigcheck-") for item in kconfigcheck_categories]
+
 
 if __name__ == "__main__":
-    common.add_upstream_git_remote()
+    kconfigcheck_categories = get_kconfigcheck_categories()
+    custom_valid_options += kconfigcheck_categories
+    os.environ["CUSTOM_VALID_OPTIONS"] = " ".join(custom_valid_options)
+
     apkbuilds = {file for file in common.get_changed_files(removed=False)
                  if os.path.basename(file) == "APKBUILD"}
     if len(apkbuilds) < 1:
         print("No APKBUILDs to lint")
         sys.exit(0)
 
-    packages = []
+    apkbuilds_filtered = []
     for apkbuild in apkbuilds:
         if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
             print(f"NOTE: Skipping linting of {apkbuild}")
             continue
-        packages.append(os.path.basename(os.path.dirname(apkbuild)))
-    if len(packages) < 1:
+        apkbuilds_filtered.append(apkbuild)
+    if len(apkbuilds_filtered) < 1:
         print("No APKBUILDs to lint")
         sys.exit(0)
-
-    common.run_pmbootstrap(["-q", "lint"] + packages)
+    try:
+        subprocess.run(["apkbuild-lint", *apkbuilds_filtered], text=True, check=True)
+    except subprocess.CalledProcessError as exception:
+        sys.exit(exception.returncode)

.ci/lib/build_changed_aports.py

@@ -19,7 +19,11 @@ from pmb.core.context import get_context
 
 def build_strict(packages, arch):
     common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
+    # We set the timeout to 1 hour because linking the Linux kernel with
+    # ThinLTO on our aarch64 runners takes slightly over 30 minutes
+    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache",
+                            "--timeout", "3600",
+                            "build",
                             "--strict", "--force",
                             "--arch", arch, ] + list(packages))
 
@@ -32,11 +36,7 @@ if __name__ == "__main__":
     arch = sys.argv[1]
 
     # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Package count sanity check
-    common.get_changed_packages_sanity_check(len(packages))
+    packages = common.get_changed_packages(skip_archived=True)
 
     # Load context
     sys.argv = ["pmbootstrap.py", "chroot"]

.ci/lib/check_changed_aports_versions.py

@@ -46,7 +46,7 @@ def get_package_contents(package, revision, check=True):
 
 
 def get_package_version(package, revision, check=True):
-    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
+    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no
         matching package is found """
     parsed = get_package_contents(package, revision, check)
     if parsed is None:
@@ -104,6 +104,9 @@ def check_versions(packages):
     # desired here, since we already know what packages changed, and really
     # want to check if the version was increased towards *current* upstream
     # branch HEAD.
+    common.run_git(["remote", "add", "upstream",
+             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+    common.run_git(["fetch", "-q", "upstream"])
     commit = f"upstream/{common.get_upstream_branch()}"
     if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
                                                                 commit]):
@@ -180,19 +183,50 @@ def check_versions(packages):
     if error:
         exit_with_error_message()
 
+def check_package_count(count):
+    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
+        if common.commit_message_has_string(mark):
+            print("NOTE: package count sanity check skipped (" + mark + ").")
+            return
+    if count <= 10:
+        return
+
+    branch = common.get_upstream_branch()
+    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.
+    """)
+
+    exit(1)
 
 if __name__ == "__main__":
     # Get and print modified packages
-    common.add_upstream_git_remote()
     packages = common.get_changed_packages()
-    print(f"Changed packages: {packages}")
-
-    # Verify modified package count
-    common.get_changed_packages_sanity_check(len(packages))
     if len(packages) == 0:
         print("no aports changed in this branch")
         exit(0)
 
+    print(f"Changed packages: {packages}")
+    check_package_count(len(packages))
+
     # Potentially skip this check
     if common.commit_message_has_string("[ci:skip-vercheck]"):
         print("WARNING: not checking for changed package versions"

.ci/lib/check_changed_kernels.py

@@ -75,8 +75,6 @@ def show_error_all():
 
 
 if __name__ == "__main__":
-    common.add_upstream_git_remote()
-
     if "kconfigcheck.toml" in common.get_changed_files():
         print("kconfigcheck.toml changed -> checking all kernels")
         if not check_kconfig_all():
@@ -84,12 +82,15 @@ if __name__ == "__main__":
             exit(1)
         exit(0)
 
-    pkgnames = common.get_changed_kernels()
+    pkgnames = common.get_changed_kernels(skip_archived=True)
     print(f"Changed kernels: {pkgnames}")
 
     if len(pkgnames) == 0:
         print("No kernels changed in this branch")
         exit(0)
+    elif common.commit_message_has_string("[ci:skip-kconfigcheck]"):
+        print("WARNING: not checking kernel configs ([ci:skip-kconfigcheck])")
+        exit(0)
 
     last_failed = check_kconfig(pkgnames)
 

.ci/lib/check_devices_in_wiki.py

@@ -7,6 +7,8 @@ import argparse
 import sys
 import urllib.request
 
+# Same dir
+import common
 
 def get_devices() -> list[str]:
     """:returns: list of all devices"""
@@ -94,13 +96,23 @@ def main() -> int:
     parser.add_argument("--path", help="instead of downloading the devices"
                         " page from the wiki, use a local HTML file",
                         type=Path, default=None)
+    parser.add_argument("--all", help="check all devices (default: check only"
+                        " devices changed from branch point)",
+                        action="store_true")
     args = parser.parse_args()
 
-    # Check all devices
     html = get_wiki_devices_html(args.path)
     html["renamed"] = get_wiki_renamed_devices_html()
     error = False
-    for device in get_devices():
+    devices = []
+    if args.all:
+        devices = get_devices()
+    else:
+        devices = common.get_changed_devices()
+        # remove 'device-' prefix
+        devices = [d[7:] for d in devices]
+        devices = [d.removesuffix("-downstream") for d in devices]
+    for device in devices:
         if not check_device(device, html, args.booting):
             error = True
 

.ci/lib/common.py

@@ -7,7 +7,6 @@
 import configparser
 import os
 import subprocess
-import sys
 
 
 cache = {}
@@ -33,19 +32,19 @@ def run_git(parameters, check=True, stderr=None):
         return None
 
 
-def add_upstream_git_remote():
-    """ Add a remote pointing to postmarketOS/pmaports. """
-    run_git(["remote", "add", "upstream",
-             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
-    run_git(["fetch", "-q", "upstream"])
-
-
 def commit_message_has_string(needle):
     base_commit = get_base_commit()
 
     return needle in run_git(["log", "--pretty=format:%B", f"{base_commit}..HEAD"])
 
 
+def all_committed_by_merge_bot():
+    base_commit = get_base_commit()
+    commit_emails = run_git(["log", "--pretty=format:%ce", f"{base_commit}..HEAD"]).splitlines()
+    bot_email = os.getenv("PMOS_MERGE_BOT_EMAIL", "merge-bot@postmarketos.org")
+    return all(bot_email == ce for ce in commit_emails)
+
+
 def run_pmbootstrap(parameters):
     """ Run pmbootstrap with the pmaports dir as --aports """
     cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
@@ -92,6 +91,15 @@ def get_base_commit() -> str:
     """Get the base commit that can be compared with HEAD to get all commits in the
     given branch/merge request."""
 
+    commit = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA")
+    if commit is not None:
+        return commit
+
+    # Add a remote pointing to postmarketOS/pmaports
+    run_git(["remote", "add", "upstream",
+             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
+    run_git(["fetch", "-q", "upstream"])
+
     branch_upstream = f"upstream/{get_upstream_branch()}"
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
@@ -133,42 +141,7 @@ def get_changed_files(removed=True):
     return ret
 
 
-def get_changed_packages_sanity_check(count):
-    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
-        if commit_message_has_string(mark):
-            print("NOTE: package count sanity check skipped (" + mark + ").")
-            return
-    if count <= 10:
-        return
-
-    branch = get_upstream_branch()
-    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)
-
-
-def get_changed_packages():
+def get_changed_packages(skip_archived: bool = False):
     ret = set()
     for file in get_changed_files():
         dirname, filename = os.path.split(file)
@@ -176,7 +149,7 @@ def get_changed_packages():
         # Skip files:
         # * in the root dir of pmaports (e.g. README.md)
         # * path with a dot (e.g. .ci/, device/.shared-patches/)
-        if not dirname or file.startswith(".") or "/." in file:
+        if not dirname or file.startswith(".") or "/." in file or skip_archived and dirname.startswith("device/archived"):
             continue
 
         if filename != "APKBUILD":
@@ -205,9 +178,16 @@ def get_changed_packages():
     return ret
 
 
-def get_changed_kernels():
+def get_changed_kernels(skip_archived: bool = False):
     ret = []
-    for pkgname in get_changed_packages():
+    for pkgname in get_changed_packages(skip_archived):
         if pkgname.startswith("linux-"):
             ret += [pkgname]
     return ret
+
+def get_changed_devices():
+    ret = []
+    for pkgname in get_changed_packages():
+        if pkgname.startswith("device-"):
+            ret += [pkgname]
+    return ret

.ci/lib/deviceinfo_linting.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+# Copyright 2025 Stefan Hansson
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import common
+import os.path
+import subprocess
+import sys
+
+if __name__ == "__main__":
+    if common.commit_message_has_string("[ci:skip-dint]"):
+        print("WARNING: not linting deviceinfo files ([ci:skip-dint])")
+        exit(0)
+    deviceinfo_files = {file for file in common.get_changed_files(removed=False)
+                        if os.path.basename(file) == "deviceinfo"}
+
+    try:
+        subprocess.run(["dint", "check", *deviceinfo_files], text=True, check=True)
+    except subprocess.CalledProcessError as exception:
+        sys.exit(exception.returncode)

.ci/lib/generate_build_jobs.py

@@ -149,6 +149,7 @@ class ArchTagSet(set):
         Arch.armv7,
         Arch.armhf,
         Arch.riscv64,
+        Arch.ppc64le,
     ]
 
     def update(self, iterable):
@@ -184,7 +185,6 @@ if __name__ == "__main__":
     devices_under_test = set()
     packages_modified = set()
     # Get and print modified packages
-    common.add_upstream_git_remote()
     for file in common.get_changed_files():
         path = Path(file)
 
@@ -206,8 +206,14 @@ if __name__ == "__main__":
             if apkbuild['pkgname'] in device.dependencies:
                 devices_under_test.add(device)
 
+    skip = False
     if common.commit_message_has_string("[ci:skip-build]"):
-        print("User requested skipping build, not creating child pipeline file")
+        print("User requested skipping build, skipping build")
+        skip = True
+    if common.all_committed_by_merge_bot():
+        print("All commits in branch committed by merge bot, skipping build")
+        skip = True
+    if skip:
         archs = ArchTagSet()
         devices_under_test = set()
 
@@ -226,6 +232,7 @@ if __name__ == "__main__":
                 Arch.armv7: "qemu",
                 Arch.armhf: "qemu",
                 Arch.riscv64: "qemu",
+                Arch.ppc64le: "ppc64le",
             },
         )
         with open(child_pipeline, "w") as fw:

.ci/lib/testlib.sh

@@ -23,6 +23,8 @@ _test_passedn=0
 _test_failedn=0
 _test_current_test=""
 _test_statefile="$(mktemp)"
+_test_original_pwd=""
+_test_temp_root=""
 # Set by each test
 results_dir="${results_dir:-}"
 
@@ -42,6 +44,23 @@ test_debug() {
 	echo -e "${YELLOW}$*${RESET}" >&2
 }
 
+create_test_root() {
+	_test_original_pwd="$(pwd)"
+	_test_temp_root="$(mktemp -d)"
+	cd "$_test_temp_root"
+}
+
+cleanup_test_root() {
+	if [ -n "$_test_original_pwd" ]; then
+		cd "$_test_original_pwd"
+	fi
+	if [ -n "$_test_temp_root" ] && [ -d "$_test_temp_root" ]; then
+		rm -rf "$_test_temp_root"
+	fi
+	_test_original_pwd=""
+	_test_temp_root=""
+}
+
 assert_strequal() {
 	# $1: first string
 	# $2: second string
@@ -87,6 +106,71 @@ assert_unset() {
 	test_log "    ✅ \$$1 is unset"
 }
 
+assert_exists() {
+	# $1: filename to test
+	if [ -z "$1" ]; then
+		test_log "ERROR: assert_exists: not enough arguments given"
+		exit 1
+	fi
+	if ! [ -e "$1" ]; then
+		_test_assert_failed="\$$1 should exist but does not"
+		test_log "    ❌ $_test_assert_failed"
+		return
+	fi
+	test_log "    ✅ \$$1 exists"
+}
+
+assert_not_exists() {
+	if [ -z "$1" ]; then
+		test_log "ERROR: assert_not_exists: not enough arguments given"
+		exit 1
+	fi
+	if [ -e "$1" ]; then
+		_test_assert_failed="\$$1 should NOT exist but does"
+		test_log "    ❌ $_test_assert_failed"
+		return
+	fi
+	test_log "    ✅ \$$1 does not exist"
+}
+
+assert_contains() {
+	# $1: string to search in
+	# $2: substring to find
+	if [ -z "$1" ] || [ -z "$2" ]; then
+		test_log "ERROR: assert_contains: not enough arguments given"
+		exit 1
+	fi
+	case "$1" in
+		*"$2"*)
+			test_log "    ✅ '$2' found in '$1'"
+			;;
+		*)
+			_test_assert_failed="'$2' not found in '$1'"
+			test_log "    ❌ $_test_assert_failed"
+			return
+			;;
+	esac
+}
+
+assert_not_contains() {
+	# $1: string to search in
+	# $2: substring that should not be found
+	if [ -z "$1" ] || [ -z "$2" ]; then
+		test_log "ERROR: assert_not_contains: not enough arguments given"
+		exit 1
+	fi
+	case "$1" in
+		*"$2"*)
+			_test_assert_failed="'$2' found in '$1' but should not be"
+			test_log "    ❌ $_test_assert_failed"
+			return
+			;;
+		*)
+			test_log "    ✅ '$2' not found in '$1'"
+			;;
+	esac
+}
+
 # Log some expression and evaluate it
 logeval() {
 	eval "$*"

.ci/lib/verify_checksums.py

@@ -26,7 +26,6 @@ def verify_checksums(packages):
 
 if __name__ == "__main__":
     # Get and print modified packages
-    common.add_upstream_git_remote()
     packages = common.get_changed_packages()
 
     # Load context

.ci/pytest.sh

@@ -26,17 +26,7 @@ pmbootstrap work_migrate
 pmbootstrap config aports "$pmaports"
 pmbootstrap -q shutdown
 
-# Make sure we have a valid device (pmbootstrap#1128)
-device="$(pmbootstrap config device)"
-deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
-# shellcheck disable=SC2086
-if ! [ -e $deviceinfo ]; then
-	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
-	echo "Expected path: $deviceinfo"
-	echo "Maybe you have switched to a branch where your device does not exist?"
-	echo "Use 'pmbootstrap config device qemu-amd64' to switch to a valid device."
-	exit 1
-fi
-
+# Needed to import "common"
+export PYTHONPATH=".ci/lib"
 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
+pytest -vv --tb=native "$pmaports/.ci/testcases" "$@"

.ci/shellcheck.sh

@@ -21,9 +21,12 @@ sh_files="
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-ui-os-installer/rootfs-usr-bin-pmos_setup.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
+	./device/testing/device-apple-mac-aarch64/*.sh
+	./extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-libexec-systemd-apk-trigger
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')

.ci/testcases/test_deviceinfo.py

@@ -13,22 +13,6 @@ import pmb.parse
 from pmb.core.pkgrepo import pkgrepo_iglob
 
 
-def deviceinfo_obsolete(info):
-    """
-    Test for obsolete options used in the deviceinfo file. They must still be
-    defined in pmbootstrap's config/__init__.py.
-    """
-    obsolete_options = [
-        "usb_rndis_function",
-        "weston_pixman_type",
-    ]
-    for option in obsolete_options:
-        if getattr(info, option, None):
-            raise RuntimeError(f"option {option} is obsolete, please rename"
-                               " or remove it (see reasons for removal of at"
-                               " https://postmarketos.org/deviceinfo)")
-
-
 def test_deviceinfo():
     """
     Parse all deviceinfo files successfully and run checks on the parsed data.
@@ -47,19 +31,10 @@ def test_deviceinfo():
 
         try:
             for line in lines:
-                # Require space after # for comments
-                if line.startswith("#") and not line.startswith("# "):
-                    raise RuntimeError("Comment style: please change '#' to"
-                                       f" '# ': {line}")
-
                 # Skip empty lines and comments
                 if not line or line.startswith("# "):
                     continue
 
-                # Variable can not be empty
-                if '=""' in line:
-                    raise RuntimeError("Please remove the empty variable: " + line)
-
                 # Check line against regex (can't use multiple lines etc.)
                 if not pattern.match(line) or line.endswith("\\\""):
                     raise RuntimeError("Line looks invalid, maybe missing"
@@ -68,7 +43,6 @@ def test_deviceinfo():
 
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(device)
-            deviceinfo_obsolete(info)
 
             # deviceinfo_name must start with manufacturer
             name = info.name

.ci/testcases/test_directory_structure.py

@@ -46,20 +46,20 @@ def test_executable_files():
                                "m0755` or a variation thereof.")
 
 
-# Make sure files are either:
-#  - in root directory (README.md)
-#  - hidden (.ci/, device/.shared-patches/)
-#  - or belong to a package (below a directory with APKBUILD)
+# Make sure files belong to a package (below a directory with APKBUILD)
 def test_files_belong_to_package():
     # Walk directories and set package_dir when we find an APKBUILD
     # This allows matching files in subdirectories to the package directory.
     package_dir = None
     for dirpath, dirs, files in os.walk("."):
-        # Skip "hidden" directories
+        # Skip "hidden" directories (.ci/, device/.shared-patches/)
         dirs[:] = [d for d in dirs if not d.startswith(".")]
-        # Ignore files in root directory
+        # Ignore files in root directory (README.md)
         if dirpath == '.':
             continue
+        # Ignore files under docs/
+        if dirpath.startswith('./docs'):
+            continue
 
         # Switched to another directory?
         if package_dir and not dirpath.startswith(package_dir + os.sep):

.ci/testcases/test_ui.py

@@ -2,14 +2,10 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import glob
-import pytest
-import sys
-import os
+from pathlib import Path
 
-import add_pmbootstrap_to_import_path
+import common
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob
 
 
 def test_aports_ui():
@@ -17,9 +13,15 @@ def test_aports_ui():
     Raise an error if package in _pmb_recommends is not found
     """
     pmaports_cfg = pmb.config.pmaports.read_config()
-
     for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in pkgrepo_iglob("main/postmarketos-ui-*/APKBUILD"):
+        for path in common.get_changed_files():
+            path = Path(path)
+
+            if path.name != "APKBUILD":
+                continue
+            if not path.parent.name.startswith("postmarketos-ui"):
+                continue
+
             apkbuild = pmb.parse.apkbuild(path)
             # Skip if arch isn't enabled
             if not pmb.helpers.package.check_arch(apkbuild["pkgname"], arch, False):

.ci/wiki.sh

@@ -7,9 +7,11 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk -q add \
+		git \
 		python3
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
 set -x
-.ci/lib/check_devices_in_wiki.py --booting
+# shellcheck disable=SC2068
+.ci/lib/check_devices_in_wiki.py --booting $@

.editorconfig

@@ -7,12 +7,19 @@
 # Top-most EditorConfig file.
 root = true
 
-[{**.{md,ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
+[{**.{ini,sh,rules,nft},**/APKBUILD,CODEOWNERS}]
 indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[**.md]
+# No indent_size since space size has meaning in markdown
+indent_style = space
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 # Forked from Alpine
 [extra-repos/systemd/networkmanager/networkmanager.rules]
 indent_style = space

.githooks/prepare-commit-msg

@@ -49,6 +49,12 @@ case "$lcp" in
 	device/*/*)
 		prefix="$(echo "$lcp" | cut -d/ -f3)"
 		;;
+	docs/*.adoc)
+		prefix="docs/$(basename $lcp .adoc)"
+		;;
+	docs/*)
+		prefix="docs"
+		;;
 	device/*)
 		# Multiple packages touched for same device category. More
 		# logic could be added to detect if they all belong to same

.gitignore

@@ -65,8 +65,9 @@ instance/
 # Scrapy stuff:
 .scrapy
 
-# Sphinx documentation
-docs/_build/
+# Documentation
+public
+docs/deviceinfo-reference.md
 
 # PyBuilder
 target/

.gitlab-ci.yml

@@ -10,6 +10,7 @@ stages:
   - build
   - autoupdate
   - test
+  - deploy
 variables:
   # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
   # seems like a reasonable balance. If this is too low, git merge-base (from ci/
@@ -21,6 +22,8 @@ workflow:
   rules:
     # Run for merge requests
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # Some things have to run in the default branch
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     # Run scheduled pipeline for autoupdate or manually triggered pipeline
     - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
 
@@ -101,6 +104,22 @@ aport-lint:
     - .ci/apkbuild-lint.sh
   allow_failure: true
 
+# deviceinfo linting
+dint:
+  stage: lint
+  rules:
+    - if: *mr_rule
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/deviceinfo
+  script:
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/dint.sh
+  allow_failure:
+    exit_codes:
+      - 2  # returned by dint on non-fatal warning
+
 # kernel kconfig check
 kernel-kconfig:
   stage: lint
@@ -180,6 +199,29 @@ build-jobs:
   rules:
     - if: *mr_rule
 
+build-docs:
+  stage: build
+  before_script:
+    - adduser -D build
+  script:
+    - .ci/build-docs.sh
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - docs/**
+
+deploy-docs:
+  stage: deploy
+  trigger:
+    project: postmarketOS/docs.postmarketos.org
+    strategy: depend
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "postmarketOS"
+      changes:
+        - docs/**
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: never
+
 auto-update:
   stage: autoupdate
   rules:

COMMITSTYLE.md

@@ -31,16 +31,16 @@ subfolders of the device directory. As such, commits changing
 packages inside of the device directory should omit the directory
 prefix, for example:
 
-	device-pine64-pinephone: description of change
+    device-pine64-pinephone: description of change
 
 Or:
 
-	soc-qcom-msm8996: description of change
+    soc-qcom-msm8996: description of change
 
 If the commit only makes device-specific changes, the
 commit title can opt to use the following format:
 
-	manufacturer-codename: description of change
+    manufacturer-codename: description of change
 
 ### Changes to packages inside of the systemd directory
 
@@ -48,12 +48,12 @@ We also shorten the prefixes for packages in `extra-repos/systemd`.
 When the `systemd` package itself gets changed, use `systemd: ` as
 prefix. For example:
 
-	systemd: add triggers for reloading/restarting services
+    systemd: add triggers for reloading/restarting services
 
 When another package inside the systemd directory gets changed, use
 `systemd/$pkgname: ` as prefix. For example:
 
-	systemd/cups: restart on upgrade
+    systemd/cups: restart on upgrade
 
 ### Moving devices between categories
 
@@ -61,11 +61,11 @@ As we do not include directory prefixes in device-related commits,
 Alpine's commit style for moving packages does not apply. Instead,
 we do the following:
 
-	manufacturer-codename: move from category to category
+    manufacturer-codename: move from category to category
 
 For example:
 
-	samsung-m0: move from testing to community
+    samsung-m0: move from testing to community
 
 ## Additions
 

README.md

@@ -7,7 +7,17 @@ There are many more packages defined in the [Alpine Linux aports](https://gitlab
 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
+* [pmaports commit style](./COMMITSTYLE.md)
+* [Review and merging guidelines](./docs/modules/ROOT/pages/merging-rules.adoc)
 * [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/)
 * [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)
 * [postmarketOS package search](https://pkgs.postmarketos.org/packages)
-* [postmarketOS commit style](./COMMITSTYLE.md)
+
+## Git Hooks
+
+You can find some useful git hooks in the `.githooks` directory.
+To use them, run the following command after cloning this repository:
+
+```sh
+git config --local core.hooksPath .githooks
+```

channels.cfg

@@ -8,6 +8,12 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
+[v25.12]
+description=Upcoming stable release (DO NOT USE)
+branch_pmaports=v25.12
+branch_aports=master
+mirrordir_alpine=v3.23
+
 [v25.06]
 description=Latest release / Recommended for best stability
 branch_pmaports=v25.06

cross/.gitlab-ci.yml

@@ -1,15 +1,21 @@
 cross-gcc-tests:
   extends: .package-test
+  tags: [qemu]
   before_script:
     - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
     - sh ./install_pmbootstrap.sh
   script:
-    - su pmos -c "pmbootstrap --details-to-stdout build gcc-aarch64"
-    - su pmos -c "pmbootstrap --details-to-stdout build --arch=aarch64 hello-world"
-    - su pmos -c "pmbootstrap --details-to-stdout build --arch=aarch64 iskey"
-    - su pmos -c "pmbootstrap --details-to-stdout build --arch=aarch64 pbsplash"
-    - su pmos -c "pmbootstrap --details-to-stdout build --arch=aarch64 gcc-x86_64"
+    - su pmos -c "pmbootstrap build gcc-aarch64"
+    - su pmos -c "pmbootstrap build --arch=aarch64 hello-world --force"
+    - su pmos -c "pmbootstrap build --arch=aarch64 iskey --force"
+    - su pmos -c "pmbootstrap build --arch=aarch64 pbsplash --force"
+    - su pmos -c "pmbootstrap build --arch=aarch64 gcc-x86_64"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
         - cross/gcc-x86_64/APKBUILD
+  artifacts:
+    when: always
+    paths:
+      - log.txt
+    expire_in: 1 week

cross/busybox-static-aarch64/APKBUILD

@@ -1,36 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen busybox-static-aarch64
-
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
-pkgname=busybox-static-aarch64
-pkgver=1.37.0
-pkgrel=22
-
-_arch="aarch64"
-_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="
-9ab4cc4a70e7fb124c09860cc783ecfdda13af0b1acc726704dbfd0af5c5302b3cfdbee55cacaa4deb5a367afab3e67d9dea54fcb1fd1c5de77a12cc7cf862da  busybox-static-1.37.0-r22-aarch64-edge.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.37.0
-pkgrel=22
-
-_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="
-a625d518a850c69079ae16438deffba87c06ab9ac40f1e63b8f02f04b156f5ddb899aa7687b16affac42744f80acdd07e160abeb5b4a5ecd2327f20c1f4933fc  busybox-static-1.37.0-r22-armhf-edge.apk
-"

cross/busybox-static-armv7/APKBUILD

@@ -1,36 +0,0 @@
-# Automatically generated aport, do not edit!
-# Generator: pmbootstrap aportgen busybox-static-armv7
-
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
-pkgname=busybox-static-armv7
-pkgver=1.37.0
-pkgrel=22
-
-_arch="armv7"
-_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="
-875b7267c85f551338d0bf6123421cfa374ad6cfbdda596a580e426d1e99bc45a127d92191dcd84b0fc2e851e6e73949f5281307a2f4948345d22ef7a5a856e4  busybox-static-1.37.0-r22-armv7-edge.apk
-"

cross/ccache-cross-symlinks/APKBUILD

@@ -5,7 +5,7 @@
 
 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=2
+pkgrel=3
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"
 
 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64 ppc64le"
+	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64 ppc64le loongarch64"
 
 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"

cross/crossdirect/APKBUILD

@@ -20,7 +20,7 @@
 # as simple shell wrappers.
 
 pkgname=crossdirect
-pkgver=5.3.0
+pkgver=5.3.1
 pkgrel=1
 pkgdesc="Wrappers to launch native programs (e.g. cross compilers) in foreign chroots"
 url="https://postmarketOS.org"
@@ -38,7 +38,7 @@ source="
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 ppc64le riscv64"
+	_archs="x86_64 armhf armv7 aarch64 loongarch64 ppc64le riscv64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -59,6 +59,7 @@ package() {
 		aarch64
 		armhf
 		armv7
+		loongarch64
 		ppc64le
 		riscv64
 		x86_64
@@ -128,7 +129,7 @@ package() {
 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
 b2e602b7fc95ed403d29f0d754879d5f773c39ee33e726bb10cff17b3c088406dac84f2ca6d8ad563c64370007d98af805d6ee9cd4a06fe3d4c61c0cb90c5c0c  crossdirect.c
-a87d91b6e3286ce29fb1f487954e7154f282194691a1bf19b4cd80cca07a9c36aa96306883b1a6671ffbc2b503575a8c9484dccde8c55431845056c6f377bec5  exec_native.sh
+73e2b5d2d8ef7c6002b3a787d14945586991493b8d81f59e5c0beda0d3b290543e1fdc6f288da726c5dd121c0861d2a894410b7b749a537df0df5b409e102330  exec_native.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
 "

cross/crossdirect/exec_native.sh

@@ -1,12 +1,20 @@
 #!/bin/sh -e
 # Execute the binary from the native chroot if it is installed there. This is
 # done for archiver tools such as unxz, so they don't need to go through QEMU.
+BASENAME="$(basename "$0")"
+
+if [ -n "$LD_PRELOAD" ]; then
+	# The archiver tool gets called during package(), which abuild runs
+	# with libfakeroot.so. Some packages do this, like bootchart2, which
+	# compresses man pages in its "make install". We can't run the native
+	# binary here due to the LD_PRELOAD, so run the foreign arch one.
+	export PATH="/usr/bin:/usr/sbin:/sbin:/bin"
+	exec "$BASENAME" "$@"
+fi
 
 # Try /native first, then the foreign arch paths. Never try
 # /native/usr/lib/crossdirect as this would result in a loop.
 UNWRAPPED_PATH="/native/usr/bin:/native/usr/sbin:/native/sbin:/native/bin:/usr/bin:/usr/sbin:/sbin:/bin"
-
-BASENAME="$(basename "$0")"
 UNWRAPPED_BIN="$(PATH="$UNWRAPPED_PATH" command -v "$BASENAME")"
 
 case "$UNWRAPPED_BIN" in

cross/gcc-aarch64/0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch

@@ -0,0 +1,130 @@
+From 824eae920f0f64dd7687c969a2436b129161fdc9 Mon Sep 17 00:00:00 2001
+From: Jinyang He <hejinyang@loongson.cn>
+Date: Wed, 29 Oct 2025 16:07:35 +0800
+Subject: [PATCH] LoongArch: Only allow valid binary op when optimize
+ conditional move
+
+It is wrong that optimize from `if (cond) dest op= 1 << shift` to
+`dest op= (cond ? 1 : 0) << shift` when `dest op 0 != dest`.
+Like `and`, `mul` or `div`.
+And in this optimization `mul` and `div` is optimized to shift.
+
+gcc/ChangeLog:
+
+	* config/loongarch/loongarch.cc
+	(loongarch_expand_conditional_move): Only allow valid binary
+	op when optimize conditional move.
+
+gcc/testsuite/ChangeLog:
+
+	* gcc.target/loongarch/conditional-move-opt-1.c: Remove mul.
+	* gcc.target/loongarch/conditional-move-opt-2.c: Remove and.
+	* gcc.target/loongarch/conditional-move-opt-3.c: New test.
+
+Co-Authored-By: Peng Fan <fanpeng@loongson.cn>
+---
+ gcc/config/loongarch/loongarch.cc             | 26 ++++++++++++++++---
+ .../loongarch/conditional-move-opt-1.c        |  4 +--
+ .../loongarch/conditional-move-opt-2.c        |  2 +-
+ .../loongarch/conditional-move-opt-3.c        | 14 ++++++++++
+ 4 files changed, 40 insertions(+), 6 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+
+diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
+index bdf290654..740c8611a 100644
+--- a/gcc/config/loongarch/loongarch.cc
++++ b/gcc/config/loongarch/loongarch.cc
+@@ -5533,12 +5533,32 @@ loongarch_expand_conditional_move (rtx *operands)
+ 	    }
+ 	}
+ 
++      auto is_binary_op_0_keep_orig = [](enum rtx_code code)
++	{
++	  switch (code)
++	    {
++	    case PLUS:
++	    case MINUS:
++	    case IOR:
++	    case XOR:
++	    case ROTATE:
++	    case ROTATERT:
++	    case ASHIFT:
++	    case ASHIFTRT:
++	    case LSHIFTRT:
++	      return true;
++	    default:
++	      return false;
++	    }
++	};
++
+       /* Check if the optimization conditions are met.  */
+       if (value_if_true_insn
+ 	  && value_if_false_insn
+-	  /* Make sure that value_if_false and var are the same.  */
+-	  && BINARY_P (value_if_true_insn_src
+-		       = SET_SRC (single_set (value_if_true_insn)))
++	  /* Make sure that the orig value OP 0 keep orig.  */
++	  && (value_if_true_insn_src
++	      = SET_SRC (single_set (value_if_true_insn)))
++	  && is_binary_op_0_keep_orig ( GET_CODE (value_if_true_insn_src))
+ 	  /* Make sure that both value_if_true and value_if_false
+ 	     has the same var.  */
+ 	  && rtx_equal_p (XEXP (value_if_true_insn_src, 0),
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
+index ed13471aa..47802aa96 100644
+--- a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
+@@ -27,7 +27,7 @@ void
+ test_lt ()
+ {
+   if (lm < ln)
+-    lr *= (1 << 16);
++    lr += (1 << 16);
+   lr += lm;
+ }
+ 
+@@ -35,7 +35,7 @@ void
+ test_le ()
+ {
+   if (lm <= ln)
+-    lr = lm * ((long)1 << 32);
++    lr = lm + ((long)1 << 32);
+   else
+     lr = lm;
+   lr += lm;
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
+index ac72d4d93..743fd5e67 100644
+--- a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
+@@ -29,7 +29,7 @@ void
+ test_lez ()
+ {
+   if (lm <= 0)
+-    lr &= (1 << 16);
++    lr |= (1 << 16);
+   lr += lm;
+ }
+ 
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+new file mode 100644
+index 000000000..95887980c
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++/* { dg-final { scan-assembler "maskeqz" } } */
++/* { dg-final { scan-assembler "masknez" } } */
++
++extern long lm, ln, lr;
++
++void
++test_and ()
++{
++  if (lm < 0)
++    lr &= (1 << 16);
++  lr += lm;
++}
+-- 
+2.51.1
+

cross/gcc-aarch64/0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch

@@ -0,0 +1,77 @@
+From 21b7d08714c4964403848db4144003835ff5245a Mon Sep 17 00:00:00 2001
+From: Linsen Zhou <i@lin.moe>
+Date: Fri, 17 Oct 2025 11:05:04 +0800
+Subject: [PATCH] tree-object-size.cc: Fix assert constant offset in
+ check_for_plus_in_loops [PR122012]
+
+After commit 51b85dfeb19652bf3e0aaec08828ba7cee1e641c, when the
+pointer offset is a variable in the loop, the object size of the
+pointer may also need to be reexamined.
+Which make gcc_assert in the check_for_plus_in_loops failed.
+
+gcc/ChangeLog:
+
+	PR tree-optimization/122012
+	* tree-object-size.cc (check_for_plus_in_loops): Skip check
+	for the variable offset
+
+gcc/testsuite/ChangeLog:
+
+	PR tree-optimization/122012
+	* gcc.dg/torture/pr122012.c: New test.
+
+Signed-off-by: Linsen Zhou <i@lin.moe>
+(cherry picked from commit 82cefc4898d4ccabe76e28d6626b91ca9e998923)
+---
+ gcc/testsuite/gcc.dg/torture/pr122012.c | 18 ++++++++++++++++++
+ gcc/tree-object-size.cc                 |  7 +++----
+ 2 files changed, 21 insertions(+), 4 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/torture/pr122012.c
+
+diff --git a/gcc/testsuite/gcc.dg/torture/pr122012.c b/gcc/testsuite/gcc.dg/torture/pr122012.c
+new file mode 100644
+index 00000000000..055915a1e98
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/torture/pr122012.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++#include <stdlib.h>
++
++void foo();
++
++void test(size_t step) {
++  char *buf = malloc(64);
++  char *p = buf;
++  size_t i;
++
++  for(i = 0; i < 64; ++i) {
++    p += 4;
++    if (__builtin_object_size (p, 2) != 0)
++      foo();
++    p += step;
++  }
++  free(buf);
++}
+diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
+index 2d13ab79a84..76dc2446059 100644
+--- a/gcc/tree-object-size.cc
++++ b/gcc/tree-object-size.cc
+@@ -2153,12 +2153,11 @@ check_for_plus_in_loops (struct object_size_info *osi, tree var)
+       && gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR)
+     {
+       tree basevar = gimple_assign_rhs1 (stmt);
+-      tree cst = gimple_assign_rhs2 (stmt);
+-
+-      gcc_assert (TREE_CODE (cst) == INTEGER_CST);
++      tree offset = gimple_assign_rhs2 (stmt);
+ 
+       /* Skip non-positive offsets.  */
+-      if (integer_zerop (cst) || compare_tree_int (cst, offset_limit) > 0)
++      if (TREE_CODE (offset) != INTEGER_CST
++	  || integer_zerop (offset) || compare_tree_int (offset, offset_limit) > 0)
+         return;
+ 
+       osi->depths[SSA_NAME_VERSION (basevar)] = 1;
+-- 
+2.51.0
+

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

@@ -1,4 +1,4 @@
-From a59da582e83071de0566274d912ca6f05f4b75d0 Mon Sep 17 00:00:00 2001
+From 95d8fac6247b2cba1142261cc95c21063539112a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -12,6 +12,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/i386/gnu-user.h         |  2 +-
  gcc/config/i386/gnu-user64.h       |  1 +
  gcc/config/ia64/linux.h            |  2 +-
+ gcc/config/loongarch/gnu-user.h    |  2 +-
  gcc/config/mips/gnu-user.h         |  1 +
  gcc/config/riscv/linux.h           |  1 +
  gcc/config/rs6000/linux64.h        |  4 ++--
@@ -19,7 +20,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/s390/linux.h            |  2 +-
  gcc/config/sparc/linux.h           |  2 +-
  gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
- 14 files changed, 36 insertions(+), 19 deletions(-)
+ 15 files changed, 37 insertions(+), 20 deletions(-)
 
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
 index 116bb4e69f3..daf99f8dce9 100644
@@ -124,6 +125,19 @@ index a2494c214c4..e1a5d530cdf 100644
    %{shared:-shared} \
    %{!shared: \
      %{!static: \
+diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
+index fbc75a90ad5..adbc4b7733f 100644
+--- a/gcc/config/loongarch/gnu-user.h
++++ b/gcc/config/loongarch/gnu-user.h
+@@ -44,7 +44,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #undef GNU_USER_TARGET_LINK_SPEC
+ #define GNU_USER_TARGET_LINK_SPEC \
+-  "%{G*} %{shared} -m " GNU_USER_LINK_EMULATION \
++  "%{G*} %{shared} --as-needed -m " GNU_USER_LINK_EMULATION \
+   "%{!shared: %{static} " \
+   "%{!static: %{!static-pie: %{rdynamic:-export-dynamic} " \
+   "-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} " \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
 index 5a82508c113..6eee7cdc603 100644
 --- a/gcc/config/mips/gnu-user.h

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

@@ -1,4 +1,4 @@
-From 35c02ea8267e193b92f30495c94ee1e8e5c2be8e Mon Sep 17 00:00:00 2001
+From 58a94690d4dd7b34543d9d154abc96d2d90d3b32 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.

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

@@ -1,4 +1,4 @@
-From 0b82663fd2f054e07e116c4dcc5019f7e969cd3e Mon Sep 17 00:00:00 2001
+From b2a755b671d88c34402290d7d769232e01aed350 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:44:20 -0700
 Subject: [PATCH] Enable -Wtrampolines by default.

cross/gcc-aarch64/0008-gcc-disable-SSP-on-ffreestanding-nostdlib-and-nodefa.patch

@@ -1,4 +1,4 @@
-From 3acf32fc94fd447874b2f1447a19a65f0905bff5 Mon Sep 17 00:00:00 2001
+From c355364231395090e7223ec00d8a16065903c2c5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:49:03 -0700
 Subject: [PATCH] gcc: disable SSP on -ffreestanding, -nostdlib and

cross/gcc-aarch64/0009-gcc-params-set-default-ssp-buffer-size-to-4.patch

@@ -1,4 +1,4 @@
-From bb98973bdb5fe8bd040e238afe92845203929b59 Mon Sep 17 00:00:00 2001
+From 5f09842c19d6db976724cd117190a8a6951acf9b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:50:42 -0700
 Subject: [PATCH] gcc: params: set default ssp-buffer-size to 4

cross/gcc-aarch64/0010-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch

@@ -1,4 +1,4 @@
-From f89d8e95b809d02eceee416b463200c9abb2b33e Mon Sep 17 00:00:00 2001
+From ee0615536ae0d255f59070b904aa35d6de8fce49 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc

cross/gcc-aarch64/0011-Don-t-declare-asprintf-if-defined-as-a-macro.patch

@@ -1,4 +1,4 @@
-From b45303198567828a5240baf932a8c13255f35d20 Mon Sep 17 00:00:00 2001
+From 62966418472466142a9962892177f4b1f9f56944 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.

cross/gcc-aarch64/0012-libiberty-copy-PIC-objects-during-build-process.patch

@@ -1,4 +1,4 @@
-From 68e2c9356221ba30b27840b9449f742505584cf1 Mon Sep 17 00:00:00 2001
+From 0351f4f3dd00bdece780ce5e24d972e97ca1b7ed Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process

cross/gcc-aarch64/0013-libgcc_s.patch

@@ -1,4 +1,4 @@
-From ca482f8c9cac9617855f908dd30d3d6144e850a0 Mon Sep 17 00:00:00 2001
+From bd7e32d5405b6b4f3994a212a77ff2cd33134c74 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s

cross/gcc-aarch64/0014-nopie.patch

@@ -1,4 +1,4 @@
-From 6dfb241ae9f879f4945941273dd73eb13f127b06 Mon Sep 17 00:00:00 2001
+From c191dc86f4f7340542066f4156aa57be9cfbf876 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie

cross/gcc-aarch64/0015-ada-fix-shared-linking.patch

@@ -1,4 +1,4 @@
-From 8ac6aeca5d6192ee16b959bd8c1903a52d408a55 Mon Sep 17 00:00:00 2001
+From f1d6c0950e0f12fb8cf2429da570f478a1369286 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking

cross/gcc-aarch64/0016-build-fix-CXXFLAGS_FOR_BUILD-passing.patch

@@ -1,4 +1,4 @@
-From 7323d68ae46fc8e33c0746799d820a4e4c8c8b72 Mon Sep 17 00:00:00 2001
+From 8773e0cf880da9fe80de7f8a662359664bb0b234 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing

cross/gcc-aarch64/0017-add-fortify-headers-paths.patch

@@ -1,4 +1,4 @@
-From eaf89c8c91806905c6e1ec9519cbfb56296204b0 Mon Sep 17 00:00:00 2001
+From 625b8095796f24389fdda5bb5bc6ff9fbb365813 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH] add fortify-headers paths

cross/gcc-aarch64/0018-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch

@@ -1,4 +1,4 @@
-From bdedcd9db7b8291637c5147dd82e8a9e3f5f9c87 Mon Sep 17 00:00:00 2001
+From c557286adc46536fe033df400c50a880b672cfd6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
 Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to

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

@@ -1,4 +1,4 @@
-From 586ce3614d4fc3fbeccf01659114a4643c1879c8 Mon Sep 17 00:00:00 2001
+From d698fead9d201ef032e2e978898864335a9ab513 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when

cross/gcc-aarch64/0020-aarch64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 0ca7f92018d0bc04a72655f3b130c9aaeea1b771 Mon Sep 17 00:00:00 2001
+From 9cf1916bd52d61ea0fd7a8b6acebb1dc4a1f2488 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
 Subject: [PATCH] aarch64: disable multilib support

cross/gcc-aarch64/0021-s390x-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From b48898c8fbd7828b81f407c74c25cf8e07fb73a4 Mon Sep 17 00:00:00 2001
+From dc07fb7df8d4f997877d8f98ea9ef8292f738ed3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
 Subject: [PATCH] s390x: disable multilib support

cross/gcc-aarch64/0022-ppc64-le-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 158d93ce86f3d311ce489d0740326027068ca721 Mon Sep 17 00:00:00 2001
+From 496067ded4a3698468412e240b899755d92b314c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
 Subject: [PATCH] ppc64[le]: disable multilib support

cross/gcc-aarch64/0023-x86_64-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From 6957fc21caca80f5e01db15df6dc8de46c85167b Mon Sep 17 00:00:00 2001
+From 3d0f96f3f53a7ff81532f077e9db69d7318db796 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
 Subject: [PATCH] x86_64: disable multilib support

cross/gcc-aarch64/0024-riscv-disable-multilib-support.patch

@@ -1,4 +1,4 @@
-From fdcbe7ee4ce81cdf247966385c8d521ac3f5a38c Mon Sep 17 00:00:00 2001
+From b1ab523d6fa44aae8f3ec5f787a8f86f8686bf64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 3 Jan 2022 07:14:48 +0100
 Subject: [PATCH] riscv: disable multilib support

cross/gcc-aarch64/0025-always-build-libgcc_eh.a.patch

@@ -1,4 +1,4 @@
-From 6f63901256443978a2c3746e72bd5762166a7790 Mon Sep 17 00:00:00 2001
+From ee64e5ead8938d5be6cedd674158a25d93711fe3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
 Subject: [PATCH] always build libgcc_eh.a

cross/gcc-aarch64/0026-ada-libgnarl-remove-use-of-glibc-specific-pthread_rw.patch

@@ -1,4 +1,4 @@
-From a365def37f5de93ad85588d8e2c02c0df28e88d6 Mon Sep 17 00:00:00 2001
+From 5adfe740c027fb8dc9931053f55f7eae222e6bb4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 02:09:02 -0700
 Subject: [PATCH] ada: libgnarl: remove use of glibc-specific

cross/gcc-aarch64/0027-ada-libgnarl-use-posix_openpt-instead-of-glibc-speci.patch

@@ -1,4 +1,4 @@
-From e1572457f94a26da9a588a36afa3eb0e74122c34 Mon Sep 17 00:00:00 2001
+From c8edb618208a854d121ff73c0d82d7cc467a3611 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 02:13:19 -0700
 Subject: [PATCH] ada: libgnarl: use posix_openpt instead of glibc-specific

cross/gcc-aarch64/0028-ada-libgnarl-adaint-fix-sched.h-inclusion-for-musl.patch

@@ -1,4 +1,4 @@
-From 4f26d4bfedb7f942b69ca4743f053c3a690a0b4a Mon Sep 17 00:00:00 2001
+From d3c515c40b9ec0133787388ae7df037e88a95f73 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 02:18:49 -0700
 Subject: [PATCH] ada: libgnarl: adaint: fix sched.h inclusion for musl

cross/gcc-aarch64/0029-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch

@@ -1,4 +1,4 @@
-From 6592e702844d31bcef17c340bfc13e0e1be9f132 Mon Sep 17 00:00:00 2001
+From 3d13edda0134af3fbb802cdec6406c91003bbc33 Mon Sep 17 00:00:00 2001
 From: Drew DeVault <sir@cmpwn.com>
 Date: Wed, 9 Dec 2020 07:42:06 +0000
 Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in

cross/gcc-aarch64/0030-configure-fix-detection-of-atomic-builtins-in-libato.patch

@@ -1,4 +1,4 @@
-From 952070c1616f231a810af2da50264713d7587b48 Mon Sep 17 00:00:00 2001
+From ddc31942d7363acc938007d70f29e3e324064f76 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] configure: fix detection of atomic builtins in libatomic

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

@@ -1,4 +1,4 @@
-From 896b002a2afacb4d75d573aca4ae53b499df19cd Mon Sep 17 00:00:00 2001
+From e9f4662af949bc56eef27d531605dd90181bc300 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Thu, 30 Jun 2022 16:44:51 +0000
 Subject: [PATCH] libstdc++: do not throw exceptions for non-C locales on musl

cross/gcc-aarch64/0032-gdc-unconditionally-link-libgphobos-against-libucont.patch

@@ -1,4 +1,4 @@
-From 22d69ae3e2768d301ef5a1f1b362c25cf8bf27b9 Mon Sep 17 00:00:00 2001
+From b4c412a5d538f7478596880e89d0e6d5046ef16b 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] gdc: unconditionally link libgphobos against libucontext

cross/gcc-aarch64/0033-druntime-link-against-libucontext-on-all-platforms.patch

@@ -1,4 +1,4 @@
-From dc66835022cf68085400f2eed30614c5afdc28a6 Mon Sep 17 00:00:00 2001
+From 0c10e5ee09685a5ecc39650e8ec8a1b4f5e096e5 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] druntime: link against libucontext on all platforms

cross/gcc-aarch64/0034-libgnat-time_t-is-always-64-bit-on-musl-libc.patch

@@ -1,4 +1,4 @@
-From ab88348da140c68e5e1142041dbe1c7b7d9c9a07 Mon Sep 17 00:00:00 2001
+From e5190522319c315efaf9a921737c05fae6a49e85 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] libgnat: time_t is always 64-bit on musl libc

cross/gcc-aarch64/0035-libphobos-do-not-use-LFS64-symbols.patch

@@ -1,4 +1,4 @@
-From f865fb0a27252bd3a01fc4596f101d389929311c Mon Sep 17 00:00:00 2001
+From 3fe1ff6c349a065daba97794c55961cafe6c4a10 Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 29 May 2023 15:33:11 +0000
 Subject: [PATCH] libphobos: do not use LFS64 symbols

cross/gcc-aarch64/0036-libgo-fix-lfs64-use.patch

@@ -1,4 +1,4 @@
-From cf6ba089ba26cd970962e874a3e35f020c3e921c Mon Sep 17 00:00:00 2001
+From ff21b1649c1c5009a33722d21e28af9026c72cd7 Mon Sep 17 00:00:00 2001
 From: psykose <alice@ayaya.dev>
 Date: Mon, 10 Jul 2023 23:23:29 +0000
 Subject: [PATCH] libgo: fix lfs64 use

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

@@ -1,4 +1,4 @@
-From a809e7b909e16fcf3379571417d33574e9c1dbff Mon Sep 17 00:00:00 2001
+From 0e09546330c7500b0d6d4e6d4bbf4fe751d57c34 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

cross/gcc-aarch64/0038-static-PIE-ensure-static-reaches-the-linker.patch

@@ -1,4 +1,4 @@
-From 72606254a2456763cb252b4d729a9505e77e449d Mon Sep 17 00:00:00 2001
+From 05b462e0a6de90c0d69a48ed9c58a6f76158344e Mon Sep 17 00:00:00 2001
 From: Rich Felker <dalias@aerifal.cx>
 Date: Fri, 25 Jul 2025 02:41:46 -0700
 Subject: [PATCH] static PIE: ensure -static reaches the linker

cross/gcc-aarch64/0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch

@@ -1,4 +1,4 @@
-From d984c5c9ed973bb7072b48399e5d9bb1f35c3123 Mon Sep 17 00:00:00 2001
+From 4c8cc9a8621b91f8aa83d8ca81f22b00a98d9fa9 Mon Sep 17 00:00:00 2001
 From: Andrew Pinski <quic_apinski@quicinc.com>
 Date: Fri, 28 Mar 2025 17:25:56 -0700
 Subject: [PATCH] except: Don't use the cached value of the gcc_except_table

cross/gcc-aarch64/0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch

@@ -1,4 +1,4 @@
-From 57eb290b3c8fc36da99213f5050b46cd93575234 Mon Sep 17 00:00:00 2001
+From a6c08fc7fe3a144ebd767cd52fe22043947655e9 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Sat, 26 Jul 2025 02:59:45 -0700
 Subject: [PATCH] ada: libgnat: use stub symbolic module name functions

cross/gcc-aarch64/0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch

@@ -1,4 +1,4 @@
-From 3e246a3de14e843b7a9b322bacb4be497e1c504b Mon Sep 17 00:00:00 2001
+From 4b5dfaaa043999f353ade7fc09e7f1bb4a6fe6db Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Sat, 26 Jul 2025 03:02:38 -0700
 Subject: [PATCH] ada: libgnat: recognize linux-musleabi and linux-muslgnueabi

cross/gcc-aarch64/APKBUILD

@@ -24,7 +24,7 @@ CBUILDROOT="/"
 _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 
 pkgname=gcc-aarch64
-pkgver=15.1.1_git20250726
+pkgver=15.2.0
 # i.e. 13.2.1, must match gcc/BASE-VER
 _pkgbase="${pkgver%%_git*}"
 # date component from snapshots
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -235,8 +235,9 @@ fi
 #
 # 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
-source="https://gcc.gnu.org/pub/gcc/snapshots/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
+#source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz"
+#source="https://gcc.gnu.org/pub/gcc/snapshots/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz"
+source="https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgbase/gcc-$_pkgbase.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -278,6 +279,9 @@ source="https://gcc.gnu.org/pub/gcc/snapshots/${_pkgbase%%.*}-$_pkgsnap/gcc-${_p
 	0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
 	0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
 	0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+
+	0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
+	0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 	"
 
 # secfixes:
@@ -285,8 +289,8 @@ source="https://gcc.gnu.org/pub/gcc/snapshots/${_pkgbase%%.*}-$_pkgsnap/gcc-${_p
 #     - CVE-2023-4039
 
 # we build out-of-tree
-builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
-#builddir="$srcdir"/gcc-$_pkgbase
+#builddir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+builddir="$srcdir"/gcc-$_pkgbase
 _gcclibdir="usr/lib/gcc/$CTARGET/$_pkgbase"
 _gcclibexec="usr/libexec/gcc/$CTARGET/$_pkgbase"
 
@@ -750,46 +754,48 @@ gdb() {
 }
 
 sha512sums="
-21ce5eecd75db4c038389f8c77f985bc58e71d1b2def86fc7b117aa9bbf76885f16fb40d4774aacdf03a6e67a91c26f6ae276256f33a100aedcda18f21e54a0e  gcc-15-20250726.tar.xz
+89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de  gcc-15.2.0.tar.xz
 fd5cebc5deb1d588583424acbc1b5a6d8d6f5b1bfa9f4bdbc082cfd406723f423d87011ee30e04ed18128a7ed8021cbfc9262becff5419125dc1afb6f407defa  0001-posix_memalign.patch
 6634004cb9feea9ee0d063d6b6984d7db3b10c692b6139bb99169a4f2d74f0e10b5ca0ab31ce346ffef34b8eb9c3f536aa4d94bce1b27f8e0b8a9fc5cc4b7057  0002-gcc-poison-system-directories.patch
 37e089791dbcbad73af866b662cda611dc0970d93e28251c7a9aa898db3b96446654e8b778d7866eb8550ba7f4a57cf22e8514d562bfed0c66613e65550d9c85  0003-specs-turn-on-Wl-z-now-by-default.patch
 d4d5bfeb20a9fac968f37497d86d7eff4a9ac863e015dadbffae24c08236f5efde69b615d95191e2546672ce2d4b30d3627528c64a83fc64b715e8fa6fd4c372  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
-b77cd1ee887fc52afee2fafd2d338f70a62c115017aa4fcb0ab9cf82b8a003794f75b7913cc153c767c351d2be8e1e7c113f893edee818217f20cad3cb6a2e66  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
-af634de360e8b7aef285702815affb16da667719b786848ccdb9e4cca2a27826793f64c903a32a5d8ba1953965a5cc8999c58e2b6ce9ef36f74807e495cc9e42  0006-Enable-Wformat-and-Wformat-security-by-default.patch
-21ad1cd4b7ef652ddaf6b9fb8071a87ec2fc694e8c420a79baf456347b8e1db5930a914c92a375943dda63d096c4823a2b8028d02a5b49c9bcdab5c170558004  0007-Enable-Wtrampolines-by-default.patch
-dcd07ecf0daad8743a378abbcb921d4b17e528651a596454956563a3417fe9ea3b88dce7b15b9270f55ae2ea2a72efe8a7215236d0a21e2942c7c5ba0e8e2c39  0008-gcc-disable-SSP-on-ffreestanding-nostdlib-and-nodefa.patch
-488bd530e209e3213f83d695fb2ac529c408e3dba9024457594cfb0d266acb079447bca184fbf136bacd1f1ec5ca3607dc4998b66630af9781ea7ee41c16236b  0009-gcc-params-set-default-ssp-buffer-size-to-4.patch
-7229a3fe655e8460148e0cd4c39d7362e713d1a6215530547f346371a5e3647245123637e8b075c58c5e7e35c823d96a0b3cdbedb6c07b5095507b4499bc053a  0010-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
-f7c1870bda4d418380f471b520b7cf20fde743f57415323c1a8898a815f8c7023adc3882e1d0453c5b6fcb65a27a9534fdeb297bf451453a95d90c0395e42c3b  0011-Don-t-declare-asprintf-if-defined-as-a-macro.patch
-140c8165726404da0fc0ea01add2a7fa307377817968177334c520bdaabc23e8ec5d76f80337b89ff03edfd52dead7119433a03d2165e24780dc944633a9c2a3  0012-libiberty-copy-PIC-objects-during-build-process.patch
-af848ef58b63a7592ad0f549be65fbe8dcd3c1e5ea9f30cfa65be02519ca9826d7612131c3b0042615b7537683d74eeb6849aba61810b0d8ed1c79f968188260  0013-libgcc_s.patch
-c97b473c08b46090b48764af55b244ec70a13d26f2d881c57761abbc4a1c481da9766f33e59daee7188bc06c4631e53becbaf8801d0b35ca0b5fe84cb6a840f7  0014-nopie.patch
-9c37cc38bb7238058751d3ff60712acd4134aa4c28d946c453b8b230bd6ba34c45c47a4b4d7e74aa7e3ed8dfc74cbb1d5a328bda706dd3037320e02a15421b86  0015-ada-fix-shared-linking.patch
-b4afb30431ecdfd86acfd66ba857c275628b55e91cc9b21c18ca0e795b2fadfe895da801978a8e818ff9c93144075e72cf0521f3bce5c6c1d44e47e1b77b8ba4  0016-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
-6260341ed13926ce449cf351ada85d8e28fc7da63a4ae73b69c24fb2e8d0e3003ffacb1bb0f957185b8d5d7e013f777f7f696c9a1c94b2204a9b3e8274ec2f43  0017-add-fortify-headers-paths.patch
-8fe954daf7e9b1d221f0536f54186bc1715e23cf3c74dfd0956c0fa22ce3b5b5e30b5e17ea584db1cc193ac7fdc72daff68c9163dbc46a837e01d25a7a4a90e0  0018-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
-fc5ce12cd70382b15317931ff0f57ae1ed10e8c09dbf2fee627bc55a268f55ebbf9ae32b89b4ef6f51e9a9b7ca32eed201245d481cde88f6eb572d40134f5f4c  0019-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
-e0d4fd0e0bf4ecfb517b60b55d73f326deda0faa75bfd07d1fcae116f91088a96caaa2dd20e2e38a93cc8ffed0aef422c0c861879c8de406364faef0cbcd50ff  0020-aarch64-disable-multilib-support.patch
-7af318ea6fe14dce98b8db1f8f46a2dc9f75c2f27e63a52c62c7b47d6d62cb64748d5c2690eba772d931ff96ac089e3f03bf46b49122ffb5a03a1c186f01ae11  0021-s390x-disable-multilib-support.patch
-b96dbbd0e1aa98ebc2e7eaa2a44912681e4c8bc9a129fafa53a943d67b62451b6d4fad53f92429cd4346a753527359c8c09d58836cf0968a56f5fe933496a412  0022-ppc64-le-disable-multilib-support.patch
-60106cb08f27c89509ba46dc2ff0edecc1f4c7973874c85047dfdd67eabe50e3a852d7540002a09bcb6185c786a5daeba7915958c441fc92d7f16a0cce5bcdea  0023-x86_64-disable-multilib-support.patch
-d55d65242af9341eef7f1e3d03fec2e2de75632a23ed83df4fe6304619f62127b42eba9d9286f7f3647e3b9bd95aaeb79023263e71ff9d58c47f3051b73d8bc2  0024-riscv-disable-multilib-support.patch
-b6dda179cafbd9e7f3ef7e137b303a76491a0157d68f1504dee6611cecdca16d27ca32cbd2298da2f6301e7167b8730d70a775ee5ba88ae3773adef8421efa98  0025-always-build-libgcc_eh.a.patch
-95245b6548ddca5065bac06131294028767a32740c80f707a4d1cf8653a0398305ec68e7c44a3f2912741b792d41048f03729657b0a1c1a2a7bff097c6b2fdc7  0026-ada-libgnarl-remove-use-of-glibc-specific-pthread_rw.patch
-ff6b8b9e1ab9b45d1853e74befb5c904cf7cd83dadb5a4b6f8c94a75e6249d1cdaa72aef73d6b1045beabc2d9012ea869d886015ec3aae561eb4ba8b9d00c2d7  0027-ada-libgnarl-use-posix_openpt-instead-of-glibc-speci.patch
-0582f00e8801df06e51fca45a8dc3ee62e9b6ce9245af98937f435c90c709edc7eb9071569c0e59c9a143d964fe5731b9e11b011174443b97043abddc9db1cce  0028-ada-libgnarl-adaint-fix-sched.h-inclusion-for-musl.patch
-8683314212c0a6f49ed45ea8c74908f59d863822fa8c99e94c7e39ba3a642ca6a3167543e1ae4b58d8acd1ff97824d6e60cc432b19e6580cad2027e3a5c37603  0029-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-60bb67f6cf4b92243dec861fba702aa5847925bf413c2c83705a0ee4ebe4c523cc295cce29666c69c9b2dec70d63def83cd9074e613b4f46e014248f53c87db4  0030-configure-fix-detection-of-atomic-builtins-in-libato.patch
-b49f72cce409f74407761fe64b028e97d58e4f236af7d9099189a8553f2ece3f30559760fab768f3d1fc4c7f89ae3ee6d687018251f3df52c9a43817c9c7c93e  0031-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
-0bd3aa81590d5f47205e193d2998bb5986cbb82adb75e3d39dcf820625bb358d380d1695ebbb18437fdd935ce350b0f5b7364a5fa7c8e07ebe8f972c8cd46cd1  0032-gdc-unconditionally-link-libgphobos-against-libucont.patch
-e8d5c4159f41fcb09e76758768d127ff366c93095137b694a405e9dbba88f2036ba64b69ac6c5c75e488be3281a1227cccbadcea2bef6f60ba0be7fc3d7db754  0033-druntime-link-against-libucontext-on-all-platforms.patch
-6f530cdb1935296925ec29be7a30e4d69cebc155695db6ea30ee95ce65de7e8917e2a6148d3668974715120e7f13f734e5c36bfd35f707f4725a7556cbc1caa5  0034-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
-1dabb0c8d581ec86d8758dfa3d2f1713d915f6d927639f56b3590ed9b0885dfdf452e30ca87edac49721d2dc43d4fbdb4d178f8448e8ba5cc595457f216bf210  0035-libphobos-do-not-use-LFS64-symbols.patch
-b915a0eaf7cc3e48f41f31ebbd9142760891b9ede304ff3f1dc7166f85a9e3f82017a17bb7e65824d3da07445b2c8bcd156a992eed92633362c08329b04b6cb4  0036-libgo-fix-lfs64-use.patch
-0164467e66719187b6041c8d2d717a9bcd5b8c801dab6391b0e503c41e26518cc78389c97bdd2b2bc64f660f95410439aaa8a20799ec01eab17e7ba415ac1dd9  0037-loongarch-disable-multilib-support.patch
-2cae2cb470b2cf469973c0ff3a7a020960cf4325502ff6c84c6b1b3514c8cacfae8452b5c79b55e657b0877fc9d81cc68db6f650156ca6d1376c1bd1a2290d8b  0038-static-PIE-ensure-static-reaches-the-linker.patch
-7d73041566678fc86885877d8315481bf358858cbe54227356d5ab48623e435426ac7ff6e54d21b9fee4cc73e3f4bc7ef646d3e4ab1970e524c890cd1f735905  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
-4556ead97907ec76aaa7dde450e4b6068f87268c49168eeb2af0c3df1dfa312b0a4a947b65b11fd413dae9af0beb3ef002d077c0d7f43b0bc466d3cd4348e657  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
-389eacbeba976a461af3d087d732d1c4f2a38bc5db91b935149e60ad4b210286ba76688b8a947d00f324566b6789152bf3b93a188fa2fb7ee8042786df483fed  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+4806687c806154dd3d5423ea9ef1203db344dfb8fd21f3eb3543d9f05f4dc01aacc4f012f45db8e890eeddc7b1c75ec06a6b29e29a1ef7b9ec6f853d1854cfd0  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+6b225df0dd76339b06d5efbe07edd6648391a7b9415a219041189c35c084ceffe8fb96b2660d60d62099e7afdfeb8e053622a2b6660d2e8a13adb924f4bc8c8a  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+e419b7f20a74384bfb1ac792e3625f9bfe69f8031c2c0beb23f4015df9d48a6c6f107d89bea3c20fa56309b022637863c13e90c1565d027eb47c08154389b7a0  0007-Enable-Wtrampolines-by-default.patch
+e6307eec09196900bcd2c0154a62d6694576b4da48a1cf901750b97b4603cd694c4daee2476c33bce09f10bee92a72749face835eb18fbf2c2a50aa1dd251572  0008-gcc-disable-SSP-on-ffreestanding-nostdlib-and-nodefa.patch
+969797f99602c119e1632f0c5be02a566be5fb4c7e59affefb5eb6084a06b97120d99d5ee63fef0dab6c0278c7cecf1d8caa53521cc5b6622de2aaa7deabf86e  0009-gcc-params-set-default-ssp-buffer-size-to-4.patch
+c15f062790367c9e786a4933deec33931438680176ec752b172c2a0504463a23d588ead4350d32e474603750ceb130ba0ccadfcde601bcf8e2eabca5af8322d0  0010-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+03a1012f1022cd68cf08440428e7d6cbf65ea2184e4a088a55976f34af627d80f42f15f713841ec9cbfc4afa39117d4fc384c3f27a4f9ad0ff3947bd45b71c4a  0011-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+8f098de9fcf4bbece0923dc4a2acfc67cf751c1d5c007535c5d88b8637a4482c1a42d5721a2760127498e327f6983bbc865a592a8e0db9ef7efc0e36b6d4102f  0012-libiberty-copy-PIC-objects-during-build-process.patch
+bbe2b561b5288ca724af37353e17b413df8bf247bce724391e75373aee5cdcdb85e6489d51622c11f4041ed8f317278cf687aee14dfc8756398f03f1a796feb9  0013-libgcc_s.patch
+ae34ca2bc5a53ed1c832651e3f6425ca29b5873f1e112b45613277fb9611693be41986d5879593f09149777e3e57d04ba17b142c43eaa990375d31e4e0b4adde  0014-nopie.patch
+2c91a1eadf7236efff42eb53037862a342807596e37c6cc3c270d25c2d89078bf8db68bb2e93e57a8ad39b3af825e33db72e2f48a6311951fff53776933bc48c  0015-ada-fix-shared-linking.patch
+1366d696a952ed35e5e56ab5bd1eba67e58a8ce752c0ef7e7fe4ad3eef44f25ce6016342d11add9548f9e719dc9ee0772064dda68784257a1a3234ae5957f3fb  0016-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+af739373285e89a4ab0000042b537ff7197b0b366019b56991008c43f3d2b76709d472841cda40e9fb61e6f0dacc0fe8c6b888abb31f393ec1a87acc1c0585b3  0017-add-fortify-headers-paths.patch
+c18f3eef4d7d6fcbfa64570edb71157a62dad1f3d7276f10fe3424e49caa33f57a0a5952f03189199472802a2dd966e4832789685a94911fe9a86bb1fd6c1d50  0018-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+341d39a40ffd896db152863c717798c6885bdde44c9ac645c5d099c2364cbd8f6f526f97cc98302c420682cb5d6d88bbe28d838c7141456f2ba5581f3edfd64f  0019-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+e603652f341909820789a2cec173b8e547ee607b040863f1745b998b8a69d51cb412a4ac55d2c9e3c5192cc298f6288f9dd48fa06fe53ba8f6b1cabbe61c997a  0020-aarch64-disable-multilib-support.patch
+26819f3c3a5844c96cee89fc9766a4f8153e7bb22f6296c6c9fd6a13d45648e3f6c7059397ad7e5be66f55addc21054614b38f480b52a7c9a967cf389735644a  0021-s390x-disable-multilib-support.patch
+8e6e6ed84c8cb39ecc35ad0986a91168fedbae2426c8ec1c83dec85a293777e0ec29eac13130193b1bdc2d98b6ffa180abf574dad70740d4720b4bfdab992ab8  0022-ppc64-le-disable-multilib-support.patch
+264eaa54a76ec5a12294d91ad2f995eddac9210a569ba85aef27176cb015354aa427840bb22f1e3ba2f7761f6f85cc98ddb3b00584b295c6a10a9770c59a2607  0023-x86_64-disable-multilib-support.patch
+47a1a407298b6c259d7faff774f26e4843c9d3764362d74230e7d3f77c46ea8bb51211e09a66bb51c04a9f276ea5b07570fb52312fdb1d354c72a0343bc40c57  0024-riscv-disable-multilib-support.patch
+b86fcf40e75861bdffb00069d3a0c9cec3fe8042d49d6ce2beae48ffeadccc576b8ab36e5a85421db5cffeb080a75f3a66dbcbb825d7f4462d40ec621964efe3  0025-always-build-libgcc_eh.a.patch
+1425543ce064bfd8e33d7e6e07f45cc16d94f156adcfe190c842722652d5ea0c9ba60f6a3e1b444bb0e5bc906ec4f9ca54720b306f274b441600b79bff47dc57  0026-ada-libgnarl-remove-use-of-glibc-specific-pthread_rw.patch
+b8851d0e7fc66201e323007f7c1d702ea8a0d0405aa5945621128ebfb93afd967ec8b3ab6fd4ea779ec10dca2a32e1797f7a2622124ccf8ace2a7596f66ff0bf  0027-ada-libgnarl-use-posix_openpt-instead-of-glibc-speci.patch
+12b09a171d61406a2bfa10bb25398cee8c92676b12506afe7aace7028e94cbf8d7df25f62ff7af07e8ed471c6edd3ab7811fa51dfaf3a221a6b367858b1f032c  0028-ada-libgnarl-adaint-fix-sched.h-inclusion-for-musl.patch
+15bed06ee74a36e9f21f4b29d7bce9c4188769abb6391560e13ea6b165da51f5ae908e141de7510d3d7eec6b998d0fc53de1042fdb7bd056efa703d230a683b4  0029-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+4c5501256669fd33527a5394eaa4b84451ee341a943dd24a179b661d3c53ef70e87ed5d5f3e76c6c3f9cb79cb5d120ea40101278a7b9d04a55d9405e4cbf9796  0030-configure-fix-detection-of-atomic-builtins-in-libato.patch
+eecc77e2a9cf956fd752693ad7f8ff8253a7bb557e00564bb488bbc1deac895e63104cc1182a0bdd700e440763f4a72e29876f560e13e4f5e6de2a1d9438c2f6  0031-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+2b09f90d9cb417170060c8ce198bd4aa2e4ef163286c8f24f6e6c5a673ae80f5a883b078b1a5dd5fa71bc1502e08c886687072694da039eb82baa1ea1948ac2c  0032-gdc-unconditionally-link-libgphobos-against-libucont.patch
+99c74242b6d79e6a814f1199b9fb0b56c6a43eb93e5d1a79b674cea750bb025363cdd1505d05cd2195a43c918831fa586c427556ee5bc826aa79cd82e7ee1c24  0033-druntime-link-against-libucontext-on-all-platforms.patch
+4f8f7876bf8647cda47cbd2b145ff31efe2a7ac21c012c4134174f93482aad1fbab2592c66aacc3b05fccd1a694ff97511b794139db4aac719e243c114373240  0034-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+0069da1d8cb9adb9bab081a34fec680a9ebb1236e606a2497e4565e99bef434518a0f06474a9a1fdfa70811ed3da5d35ca95d267268328f2764bf41c50e924de  0035-libphobos-do-not-use-LFS64-symbols.patch
+1cbe85b63ef13bdf2804bfd3173998a6e86752d8ffc09d4cc75a9ba80b98aec5a04efa732bce97a2f50a90c84b92c442ca8f6639841fe7d6618f928ea65916a6  0036-libgo-fix-lfs64-use.patch
+98fcd5b893a1646edab961a5d00246151c47b449f8eca99c51f4026ffdb53f60b5b9f6426437c0a6411342da10db8983e20337a29cd46ed22b70e0478573ea30  0037-loongarch-disable-multilib-support.patch
+1ad48e39dab351b7bb3e17d9b4b8b78e7de7c736e212638c9d6874b1dde0360dcfc85586c39f515fbd2a6d9910fedc4f0c6ad7ff652b10a5c288c47173671ec7  0038-static-PIE-ensure-static-reaches-the-linker.patch
+9f4c3fa0d17cfcd72626bdbaf51992ff3018f878d673ab19b9056047ee2630b581e5a5a4d4857444f08ba9bcdb0fc94f90dcda6180816e39690d1652843f0d8a  0039-except-Don-t-use-the-cached-value-of-the-gcc_except_.patch
+d166475e340c91bbb24cf257240aab37129b04f2609e5ce323b530ab83853a4c34c525e0072c15732717f1681db07e6b3b0a4d268720c31f460435ccf4c99b7f  0040-ada-libgnat-use-stub-symbolic-module-name-functions.patch
+c717764ef52c0226a23cbf434654cdefa6cbf38ec625648575d9143c5513b16d8914c25015db743033b8a46ac5b2c33ab75e1b67076128d67bb1319e5a83dd85  0041-ada-libgnat-recognize-linux-musleabi-and-linux-muslg.patch
+c3b64b05332bd4dd7fad3fff3cacd4f9de0512943f1548c6f1205fab1a74c83622024f30471805f57d625198cc32f647b32172914528fd5605d0bf61cb0c3ff1  0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch
+e91873055550eba051d9297bec5c6acd27abb9ee6ce8911cdd04b5faf37d77b6b2a7607ec588d2863f13f14b48af9398cb4ac42443d8567bfa5037dc6bd50404  0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch
 "

cross/gcc-armhf/0001-LoongArch-Only-allow-valid-binary-op-when-optimize-c.patch

@@ -0,0 +1,130 @@
+From 824eae920f0f64dd7687c969a2436b129161fdc9 Mon Sep 17 00:00:00 2001
+From: Jinyang He <hejinyang@loongson.cn>
+Date: Wed, 29 Oct 2025 16:07:35 +0800
+Subject: [PATCH] LoongArch: Only allow valid binary op when optimize
+ conditional move
+
+It is wrong that optimize from `if (cond) dest op= 1 << shift` to
+`dest op= (cond ? 1 : 0) << shift` when `dest op 0 != dest`.
+Like `and`, `mul` or `div`.
+And in this optimization `mul` and `div` is optimized to shift.
+
+gcc/ChangeLog:
+
+	* config/loongarch/loongarch.cc
+	(loongarch_expand_conditional_move): Only allow valid binary
+	op when optimize conditional move.
+
+gcc/testsuite/ChangeLog:
+
+	* gcc.target/loongarch/conditional-move-opt-1.c: Remove mul.
+	* gcc.target/loongarch/conditional-move-opt-2.c: Remove and.
+	* gcc.target/loongarch/conditional-move-opt-3.c: New test.
+
+Co-Authored-By: Peng Fan <fanpeng@loongson.cn>
+---
+ gcc/config/loongarch/loongarch.cc             | 26 ++++++++++++++++---
+ .../loongarch/conditional-move-opt-1.c        |  4 +--
+ .../loongarch/conditional-move-opt-2.c        |  2 +-
+ .../loongarch/conditional-move-opt-3.c        | 14 ++++++++++
+ 4 files changed, 40 insertions(+), 6 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+
+diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
+index bdf290654..740c8611a 100644
+--- a/gcc/config/loongarch/loongarch.cc
++++ b/gcc/config/loongarch/loongarch.cc
+@@ -5533,12 +5533,32 @@ loongarch_expand_conditional_move (rtx *operands)
+ 	    }
+ 	}
+ 
++      auto is_binary_op_0_keep_orig = [](enum rtx_code code)
++	{
++	  switch (code)
++	    {
++	    case PLUS:
++	    case MINUS:
++	    case IOR:
++	    case XOR:
++	    case ROTATE:
++	    case ROTATERT:
++	    case ASHIFT:
++	    case ASHIFTRT:
++	    case LSHIFTRT:
++	      return true;
++	    default:
++	      return false;
++	    }
++	};
++
+       /* Check if the optimization conditions are met.  */
+       if (value_if_true_insn
+ 	  && value_if_false_insn
+-	  /* Make sure that value_if_false and var are the same.  */
+-	  && BINARY_P (value_if_true_insn_src
+-		       = SET_SRC (single_set (value_if_true_insn)))
++	  /* Make sure that the orig value OP 0 keep orig.  */
++	  && (value_if_true_insn_src
++	      = SET_SRC (single_set (value_if_true_insn)))
++	  && is_binary_op_0_keep_orig ( GET_CODE (value_if_true_insn_src))
+ 	  /* Make sure that both value_if_true and value_if_false
+ 	     has the same var.  */
+ 	  && rtx_equal_p (XEXP (value_if_true_insn_src, 0),
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
+index ed13471aa..47802aa96 100644
+--- a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-1.c
+@@ -27,7 +27,7 @@ void
+ test_lt ()
+ {
+   if (lm < ln)
+-    lr *= (1 << 16);
++    lr += (1 << 16);
+   lr += lm;
+ }
+ 
+@@ -35,7 +35,7 @@ void
+ test_le ()
+ {
+   if (lm <= ln)
+-    lr = lm * ((long)1 << 32);
++    lr = lm + ((long)1 << 32);
+   else
+     lr = lm;
+   lr += lm;
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
+index ac72d4d93..743fd5e67 100644
+--- a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-2.c
+@@ -29,7 +29,7 @@ void
+ test_lez ()
+ {
+   if (lm <= 0)
+-    lr &= (1 << 16);
++    lr |= (1 << 16);
+   lr += lm;
+ }
+ 
+diff --git a/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+new file mode 100644
+index 000000000..95887980c
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/loongarch/conditional-move-opt-3.c
+@@ -0,0 +1,14 @@
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++/* { dg-final { scan-assembler "maskeqz" } } */
++/* { dg-final { scan-assembler "masknez" } } */
++
++extern long lm, ln, lr;
++
++void
++test_and ()
++{
++  if (lm < 0)
++    lr &= (1 << 16);
++  lr += lm;
++}
+-- 
+2.51.1
+

cross/gcc-armhf/0001-tree-object-size.cc-Fix-assert-constant-offset-in-ch.patch

@@ -0,0 +1,77 @@
+From 21b7d08714c4964403848db4144003835ff5245a Mon Sep 17 00:00:00 2001
+From: Linsen Zhou <i@lin.moe>
+Date: Fri, 17 Oct 2025 11:05:04 +0800
+Subject: [PATCH] tree-object-size.cc: Fix assert constant offset in
+ check_for_plus_in_loops [PR122012]
+
+After commit 51b85dfeb19652bf3e0aaec08828ba7cee1e641c, when the
+pointer offset is a variable in the loop, the object size of the
+pointer may also need to be reexamined.
+Which make gcc_assert in the check_for_plus_in_loops failed.
+
+gcc/ChangeLog:
+
+	PR tree-optimization/122012
+	* tree-object-size.cc (check_for_plus_in_loops): Skip check
+	for the variable offset
+
+gcc/testsuite/ChangeLog:
+
+	PR tree-optimization/122012
+	* gcc.dg/torture/pr122012.c: New test.
+
+Signed-off-by: Linsen Zhou <i@lin.moe>
+(cherry picked from commit 82cefc4898d4ccabe76e28d6626b91ca9e998923)
+---
+ gcc/testsuite/gcc.dg/torture/pr122012.c | 18 ++++++++++++++++++
+ gcc/tree-object-size.cc                 |  7 +++----
+ 2 files changed, 21 insertions(+), 4 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/torture/pr122012.c
+
+diff --git a/gcc/testsuite/gcc.dg/torture/pr122012.c b/gcc/testsuite/gcc.dg/torture/pr122012.c
+new file mode 100644
+index 00000000000..055915a1e98
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/torture/pr122012.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++#include <stdlib.h>
++
++void foo();
++
++void test(size_t step) {
++  char *buf = malloc(64);
++  char *p = buf;
++  size_t i;
++
++  for(i = 0; i < 64; ++i) {
++    p += 4;
++    if (__builtin_object_size (p, 2) != 0)
++      foo();
++    p += step;
++  }
++  free(buf);
++}
+diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc
+index 2d13ab79a84..76dc2446059 100644
+--- a/gcc/tree-object-size.cc
++++ b/gcc/tree-object-size.cc
+@@ -2153,12 +2153,11 @@ check_for_plus_in_loops (struct object_size_info *osi, tree var)
+       && gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR)
+     {
+       tree basevar = gimple_assign_rhs1 (stmt);
+-      tree cst = gimple_assign_rhs2 (stmt);
+-
+-      gcc_assert (TREE_CODE (cst) == INTEGER_CST);
++      tree offset = gimple_assign_rhs2 (stmt);
+ 
+       /* Skip non-positive offsets.  */
+-      if (integer_zerop (cst) || compare_tree_int (cst, offset_limit) > 0)
++      if (TREE_CODE (offset) != INTEGER_CST
++	  || integer_zerop (offset) || compare_tree_int (offset, offset_limit) > 0)
+         return;
+ 
+       osi->depths[SSA_NAME_VERSION (basevar)] = 1;
+-- 
+2.51.0
+

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

@@ -1,4 +1,4 @@
-From a59da582e83071de0566274d912ca6f05f4b75d0 Mon Sep 17 00:00:00 2001
+From 95d8fac6247b2cba1142261cc95c21063539112a Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:46:56 +0000
 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
@@ -12,6 +12,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/i386/gnu-user.h         |  2 +-
  gcc/config/i386/gnu-user64.h       |  1 +
  gcc/config/ia64/linux.h            |  2 +-
+ gcc/config/loongarch/gnu-user.h    |  2 +-
  gcc/config/mips/gnu-user.h         |  1 +
  gcc/config/riscv/linux.h           |  1 +
  gcc/config/rs6000/linux64.h        |  4 ++--
@@ -19,7 +20,7 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
  gcc/config/s390/linux.h            |  2 +-
  gcc/config/sparc/linux.h           |  2 +-
  gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
- 14 files changed, 36 insertions(+), 19 deletions(-)
+ 15 files changed, 37 insertions(+), 20 deletions(-)
 
 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
 index 116bb4e69f3..daf99f8dce9 100644
@@ -124,6 +125,19 @@ index a2494c214c4..e1a5d530cdf 100644
    %{shared:-shared} \
    %{!shared: \
      %{!static: \
+diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h
+index fbc75a90ad5..adbc4b7733f 100644
+--- a/gcc/config/loongarch/gnu-user.h
++++ b/gcc/config/loongarch/gnu-user.h
+@@ -44,7 +44,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #undef GNU_USER_TARGET_LINK_SPEC
+ #define GNU_USER_TARGET_LINK_SPEC \
+-  "%{G*} %{shared} -m " GNU_USER_LINK_EMULATION \
++  "%{G*} %{shared} --as-needed -m " GNU_USER_LINK_EMULATION \
+   "%{!shared: %{static} " \
+   "%{!static: %{!static-pie: %{rdynamic:-export-dynamic} " \
+   "-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} " \
 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
 index 5a82508c113..6eee7cdc603 100644
 --- a/gcc/config/mips/gnu-user.h

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

@@ -1,4 +1,4 @@
-From 35c02ea8267e193b92f30495c94ee1e8e5c2be8e Mon Sep 17 00:00:00 2001
+From 58a94690d4dd7b34543d9d154abc96d2d90d3b32 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:47:43 +0000
 Subject: [PATCH] Enable -Wformat and -Wformat-security by default.

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

@@ -1,4 +1,4 @@
-From 0b82663fd2f054e07e116c4dcc5019f7e969cd3e Mon Sep 17 00:00:00 2001
+From b2a755b671d88c34402290d7d769232e01aed350 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:44:20 -0700
 Subject: [PATCH] Enable -Wtrampolines by default.

cross/gcc-armhf/0008-gcc-disable-SSP-on-ffreestanding-nostdlib-and-nodefa.patch

@@ -1,4 +1,4 @@
-From 3acf32fc94fd447874b2f1447a19a65f0905bff5 Mon Sep 17 00:00:00 2001
+From c355364231395090e7223ec00d8a16065903c2c5 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:49:03 -0700
 Subject: [PATCH] gcc: disable SSP on -ffreestanding, -nostdlib and

cross/gcc-armhf/0009-gcc-params-set-default-ssp-buffer-size-to-4.patch

@@ -1,4 +1,4 @@
-From bb98973bdb5fe8bd040e238afe92845203929b59 Mon Sep 17 00:00:00 2001
+From 5f09842c19d6db976724cd117190a8a6951acf9b Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 01:50:42 -0700
 Subject: [PATCH] gcc: params: set default ssp-buffer-size to 4

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

@@ -1,4 +1,4 @@
-From f89d8e95b809d02eceee416b463200c9abb2b33e Mon Sep 17 00:00:00 2001
+From ee0615536ae0d255f59070b904aa35d6de8fce49 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:50:33 +0000
 Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc

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

@@ -1,4 +1,4 @@
-From b45303198567828a5240baf932a8c13255f35d20 Mon Sep 17 00:00:00 2001
+From 62966418472466142a9962892177f4b1f9f56944 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:52:07 +0000
 Subject: [PATCH] Don't declare asprintf if defined as a macro.

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

@@ -1,4 +1,4 @@
-From 68e2c9356221ba30b27840b9449f742505584cf1 Mon Sep 17 00:00:00 2001
+From 0351f4f3dd00bdece780ce5e24d972e97ca1b7ed Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:53:00 +0000
 Subject: [PATCH] libiberty: copy PIC objects during build process

cross/gcc-armhf/0013-libgcc_s.patch

@@ -1,4 +1,4 @@
-From ca482f8c9cac9617855f908dd30d3d6144e850a0 Mon Sep 17 00:00:00 2001
+From bd7e32d5405b6b4f3994a212a77ff2cd33134c74 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 24 Oct 2015 20:09:53 +0000
 Subject: [PATCH] libgcc_s

cross/gcc-armhf/0014-nopie.patch

@@ -1,4 +1,4 @@
-From 6dfb241ae9f879f4945941273dd73eb13f127b06 Mon Sep 17 00:00:00 2001
+From c191dc86f4f7340542066f4156aa57be9cfbf876 Mon Sep 17 00:00:00 2001
 From: Szabolcs Nagy <nsz@port70.net>
 Date: Sat, 7 Nov 2015 02:08:05 +0000
 Subject: [PATCH] nopie

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

@@ -1,4 +1,4 @@
-From 8ac6aeca5d6192ee16b959bd8c1903a52d408a55 Mon Sep 17 00:00:00 2001
+From f1d6c0950e0f12fb8cf2429da570f478a1369286 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:16 +0000
 Subject: [PATCH] ada: fix shared linking

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

@@ -1,4 +1,4 @@
-From 7323d68ae46fc8e33c0746799d820a4e4c8c8b72 Mon Sep 17 00:00:00 2001
+From 8773e0cf880da9fe80de7f8a662359664bb0b234 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 06:59:43 +0000
 Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing

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

@@ -1,4 +1,4 @@
-From eaf89c8c91806905c6e1ec9519cbfb56296204b0 Mon Sep 17 00:00:00 2001
+From 625b8095796f24389fdda5bb5bc6ff9fbb365813 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:01:06 +0000
 Subject: [PATCH] add fortify-headers paths

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

@@ -1,4 +1,4 @@
-From bdedcd9db7b8291637c5147dd82e8a9e3f5f9c87 Mon Sep 17 00:00:00 2001
+From c557286adc46536fe033df400c50a880b672cfd6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Fri, 21 Aug 2020 07:03:00 +0000
 Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to

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

@@ -1,4 +1,4 @@
-From 586ce3614d4fc3fbeccf01659114a4643c1879c8 Mon Sep 17 00:00:00 2001
+From d698fead9d201ef032e2e978898864335a9ab513 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:03:42 +0000
 Subject: [PATCH] DP: Use --push-state/--pop-state for gold as well when

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

@@ -1,4 +1,4 @@
-From 0ca7f92018d0bc04a72655f3b130c9aaeea1b771 Mon Sep 17 00:00:00 2001
+From 9cf1916bd52d61ea0fd7a8b6acebb1dc4a1f2488 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:12:55 +0000
 Subject: [PATCH] aarch64: disable multilib support

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

@@ -1,4 +1,4 @@
-From b48898c8fbd7828b81f407c74c25cf8e07fb73a4 Mon Sep 17 00:00:00 2001
+From dc07fb7df8d4f997877d8f98ea9ef8292f738ed3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:13:59 +0000
 Subject: [PATCH] s390x: disable multilib support

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

@@ -1,4 +1,4 @@
-From 158d93ce86f3d311ce489d0740326027068ca721 Mon Sep 17 00:00:00 2001
+From 496067ded4a3698468412e240b899755d92b314c Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:33 +0000
 Subject: [PATCH] ppc64[le]: disable multilib support

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

@@ -1,4 +1,4 @@
-From 6957fc21caca80f5e01db15df6dc8de46c85167b Mon Sep 17 00:00:00 2001
+From 3d0f96f3f53a7ff81532f077e9db69d7318db796 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Thu, 6 Jan 2022 03:14:54 +0000
 Subject: [PATCH] x86_64: disable multilib support

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

@@ -1,4 +1,4 @@
-From fdcbe7ee4ce81cdf247966385c8d521ac3f5a38c Mon Sep 17 00:00:00 2001
+From b1ab523d6fa44aae8f3ec5f787a8f86f8686bf64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Mon, 3 Jan 2022 07:14:48 +0100
 Subject: [PATCH] riscv: disable multilib support

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

@@ -1,4 +1,4 @@
-From 6f63901256443978a2c3746e72bd5762166a7790 Mon Sep 17 00:00:00 2001
+From ee64e5ead8938d5be6cedd674158a25d93711fe3 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@dereferenced.org>
 Date: Fri, 21 Aug 2020 07:05:41 +0000
 Subject: [PATCH] always build libgcc_eh.a

cross/gcc-armhf/0026-ada-libgnarl-remove-use-of-glibc-specific-pthread_rw.patch

@@ -1,4 +1,4 @@
-From a365def37f5de93ad85588d8e2c02c0df28e88d6 Mon Sep 17 00:00:00 2001
+From 5adfe740c027fb8dc9931053f55f7eae222e6bb4 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 02:09:02 -0700
 Subject: [PATCH] ada: libgnarl: remove use of glibc-specific

cross/gcc-armhf/0027-ada-libgnarl-use-posix_openpt-instead-of-glibc-speci.patch

@@ -1,4 +1,4 @@
-From e1572457f94a26da9a588a36afa3eb0e74122c34 Mon Sep 17 00:00:00 2001
+From c8edb618208a854d121ff73c0d82d7cc467a3611 Mon Sep 17 00:00:00 2001
 From: Ariadne Conill <ariadne@ariadne.space>
 Date: Fri, 25 Jul 2025 02:13:19 -0700
 Subject: [PATCH] ada: libgnarl: use posix_openpt instead of glibc-specific