DO NOT MERGE: tablet-x64eufi: adopt and move to community

Signed-off-by: Alistair Francis <alistair@alistair23.me>

[ci:skip-build] already built successfully in CI

.ci/apkbuild-lint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh -e
+# Description: run apkbuild-lint on modified APKBUILDs
+# Options: native
+# Use 'native' because it requires git commit history.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+# Wrap pmbootstrap to use this repository for --aports
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
+_pmbootstrap="$(command -v pmbootstrap)"
+pmbootstrap() {
+	"$_pmbootstrap" --aports="$pmaports" "$@"
+}
+
+.ci/lib/apkbuild_linting.py
+

.ci/build-aarch64.sh

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

.ci/build-armhf.sh

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

.ci/build-armv7.sh

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

.ci/build-riscv64.sh

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

.ci/build-x86.sh

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

.ci/build-x86_64.sh

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

.ci/build.sh

@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# Convenience wrapper for short arch-specific build jobs in .gitlab-ci.yml
-
-export PYTHONUNBUFFERED=1
-JOB_ARCH="${CI_JOB_NAME#build-}"
-
-set -x
-su pmos -c ".ci/build_changed_aports.py $JOB_ARCH"

.ci/check-dtb-install-location.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if grep -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb'; then
-	echo 'Please do not install dtbs to /usr/share/dtb!'
-	echo 'Unless you have a good reason not to, please put them in /boot/dtbs'
-	exit 1
-fi

.ci/commits.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+# Copyright 2023 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
+# Options: native
+# Use 'native' because it requires git commit history.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
+	# already downloads and runs install_pmbootstrap.sh.
+	if ! [ -e install_pmbootstrap.sh ]; then
+		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+		sh ./install_pmbootstrap.sh
+	fi
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+.ci/lib/check_changed_aports_versions.py

.ci/ec.sh

@@ -0,0 +1,13 @@
+#!/bin/sh -e
+# Description: editorconfig-checker: lint for trailing whitespaces etc.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add \
+		editorconfig-checker
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+ec

.ci/flake8.sh

@@ -0,0 +1,14 @@
+#!/bin/sh -e
+# Description: lint CI related python scripts/tests
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add py3-flake8
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+
+# shellcheck disable=SC2046
+flake8 --ignore E501,F401,E722,W504,W605 $(find .ci -name '*.py')

.ci/grep.sh

@@ -0,0 +1,40 @@
+#!/bin/sh -e
+# Description: check various bad patterns with grep
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add grep
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+# Find CHANGEMEs in APKBUILDs
+if grep -qr '(CHANGEME!)' -- *; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' -- *
+	exit 1
+fi
+
+# DTBs installed to /usr/share/db
+# shellcheck disable=SC2016
+if grep -qr 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/; then
+	echo 'ERROR: Please do not install dtbs to /usr/share/dtb!'
+	echo 'ERROR: Unless you have a good reason not to, please put them in /boot/dtbs'
+	echo 'ERROR: Files that need fixing:'
+	# shellcheck disable=SC2016
+	grep --color=always -r 'INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb' device/
+	exit 1
+fi
+
+
+# Find old mkinitfs paths (pre mkinitfs 2.0)
+if grep -qr '/etc/postmarketos-mkinitfs' -- *; then
+	echo "ERROR: Please replace '/etc/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
+	grep --color=always -r '/etc/postmarketos-mkinitfs' -- *
+	exit 1
+fi
+if grep -qr '/usr/share/postmarketos-mkinitfs' -- *; then
+	echo "ERROR: Please replace '/usr/share/postmarketos-mkinitfs' with '/usr/share/mkinitfs' in the following files:"
+	grep --color=always -r '/usr/share/postmarketos-mkinitfs' -- *
+	exit 1
+fi

.ci/kconfig.sh

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+# Description: check modified kernel configs
+# Options: native
+# Use 'native' because it requires running pmbootstrap.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+export PYTHONUNBUFFERED=1
+
+.ci/lib/check_changed_kernels.py

.ci/lib/add_pmbootstrap_to_import_path

@@ -0,0 +1 @@
+../testcases/add_pmbootstrap_to_import_path

.ci/lib/build_changed_aports.py

@@ -7,7 +7,7 @@ import sys
 import common
 
 # pmbootstrap
-import testcases.add_pmbootstrap_to_import_path
+import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports

.ci/lib/build_changed_aports.sh

@@ -0,0 +1,19 @@
+#!/bin/sh -e
+# Description: build modified packages for this architecture
+# Options: native slow
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+export PYTHONUNBUFFERED=1
+
+# Get the architecture from the symlink we are running
+arch="$(echo "$0" | cut -d '-' -f 2 | cut -d '.' -f 1)"
+
+set -x
+.ci/lib/build_changed_aports.py "$arch"

.ci/lib/check_changed_aports_versions.py

@@ -11,7 +11,7 @@ import subprocess
 import common
 
 # pmbootstrap
-import testcases.add_pmbootstrap_to_import_path  # noqa
+import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

.ci/lib/check_changed_kernels.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# Copyright 2023 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import tempfile
+import sys
+import subprocess
+
+# Same dir
+import common
+
+# pmbootstrap
+import add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.helpers.logging
+
+
+def check_kconfig(args, pkgnames):
+    last_failed = None
+    for i in range(len(pkgnames)):
+        pkgname = pkgnames[i]
+        print(f"  ({i+1}/{len(pkgnames)}) {pkgname}")
+
+        apkbuild_path = pmb.helpers.pmaports.find(args, pkgname)
+        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
+
+        options = []
+
+        for opt in apkbuild["options"]:
+            if "pmb:kconfigcheck" in opt:
+                options += [opt]
+
+        if len(options):
+            options.sort()
+            print(f'options="{" ".join(options)}"')
+
+        if "!pmb:kconfigcheck" in apkbuild["options"]:
+            print("skipped (!pmb:kconfigcheck)")
+            continue
+
+        if not pmb.parse.kconfig.check(args, pkgname, details=True):
+            last_failed = pkgname
+
+    return last_failed
+
+
+def show_error(last_failed):
+    print("")
+    print("Please adjust your kernel config. This is required for getting your"
+          " patch merged.")
+    print("")
+    print("Edit your kernel config:")
+    print(f"  pmbootstrap kconfig edit {last_failed}")
+    print("")
+    print("Test this kernel config again:")
+    print(f"  pmbootstrap kconfig check {last_failed}")
+    print("")
+    print("Run this check again (on all kernels you modified):")
+    print("  pmbootstrap ci kconfig")
+    print("")
+
+
+if __name__ == "__main__":
+    common.add_upstream_git_remote()
+    pkgnames = common.get_changed_kernels()
+    print(f"Changed kernels: {pkgnames}")
+
+    if len(pkgnames) == 0:
+        print("No kernels changed in this branch")
+        exit(0)
+
+    # Initialize args (so we can use pmbootstrap's kconfig parsing)
+    sys.argv = ["pmbootstrap", "kconfig", "check"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    print("Running kconfig check on changed kernels...")
+    last_failed = check_kconfig(args, pkgnames)
+
+    if last_failed:
+        show_error(last_failed)
+        exit(1)

.ci/lib/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -13,7 +13,7 @@ def get_devices():
     """:returns: list of all devices"""
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
-                "/..")))
+                "/../..")))
     for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
 
@@ -110,7 +110,7 @@ def main():
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")
-        print("   <https://wiki.postmarketos.org/wiki/Help:Device_Page>")
+        print("   https://wiki.postmarketos.org/wiki/Help:Device_Page")
         print("2) Set 'booting = yes' in the infobox of your device page.")
         print("3) Run these tests again with an empty commit in your MR:")
         print("   $ git commit --allow-empty -m 'run tests again'")

.ci/lib/common.py

@@ -17,7 +17,7 @@ def get_pmaports_dir():
     global cache
     if "pmaports_dir" in cache:
         return cache["pmaports_dir"]
-    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+    ret = os.path.realpath(os.path.join(os.path.dirname(__file__) + "/../.."))
     cache["pmaports_dir"] = ret
     return ret
 
@@ -190,3 +190,11 @@ def get_changed_packages():
         ret.add(os.path.basename(dirname))
 
     return ret
+
+
+def get_changed_kernels():
+    ret = []
+    for pkgname in get_changed_packages():
+        if pkgname.startswith("linux-"):
+            ret += [pkgname]
+    return ret

.ci/lib/gitlab_prepare_ci.sh

@@ -0,0 +1,17 @@
+#!/bin/sh -e
+# Copyright 2023 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
+	echo "Mounting binfmt_misc"
+	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+fi
+
+if id "build" > /dev/null 2>&1; then
+	echo "User 'build' exists already"
+else
+	echo "Creating build user"
+	adduser -D build
+	chown -R build:build .
+	echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+fi

.ci/lib/move_logs.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then
-	echo "usage: $(basename $0) \$CI_PROJECT_DIR"
+	echo "usage: $(basename "$0") \$CI_PROJECT_DIR"
 	exit 1
 fi
 

.ci/pytest.sh

@@ -1,15 +1,26 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Description: lint with various python tests
+# Options: native
+# Use 'native' because it requires pmbootstrap.
+# https://postmarketos.org/pmb-ci
 
-# Require pmbootstrap
-if ! command -v pmbootstrap > /dev/null; then
-	echo "ERROR: pmbootstrap needs to be installed."
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	sh ./install_pmbootstrap.sh pytest
+	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
+fi
+
+# Require pytest to be installed on the host system
+if [ -z "$(command -v pytest)" ]; then
+	echo "ERROR: pytest command not found, make sure it is in your PATH."
 	exit 1
 fi
 
 # Wrap pmbootstrap to use this repository for --aports
-pmaports="$(cd $(dirname $0)/..; pwd -P)"
+pmaports="$(cd "$(dirname "$0")"/..; pwd -P)"
 _pmbootstrap="$(command -v pmbootstrap)"
 pmbootstrap() {
 	"$_pmbootstrap" --aports="$pmaports" "$@"
@@ -23,6 +34,7 @@ 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"

.ci/shellcheck.sh

@@ -1,16 +1,15 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Description: lint all shell scripts
+# https://postmarketos.org/pmb-ci
 
-set -e
-DIR="$(cd "$(dirname "$0")" && pwd -P)"
-cd "$DIR/.."
+DIR="$(cd "$(dirname "$0")/.." && pwd -P)"
 
-# Find CHANGEMEs in APKBUILDs
-if grep -qr '(CHANGEME!)' *; then
-	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
-	grep --color=always -r '(CHANGEME!)' *
-	exit 1
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add shellcheck
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
 # Shell: shellcheck
@@ -18,17 +17,17 @@ sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/osk-sdl/unlock.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base-ui/rootfs-etc-NetworkManager-dispatcher.d-99-dns-filter.sh
 	./main/postmarketos-installkernel/installkernel-pmos
-	./main/postmarketos-mkinitfs/init.sh
-	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-initramfs/init.sh
+	./main/postmarketos-initramfs/init_functions.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/postmarketos-update-kernel/update-kernel.sh
-	./main/swclock-offset/swclock-offset-boot.sh
-	./main/swclock-offset/swclock-offset-shutdown.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
+	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')
@@ -42,10 +41,11 @@ sh_files="
 	$(find . -path './main/devicepkg-dev/*.sh')
 	$(find . -path './main/postmarketos-mvcfg/*.sh')
 
-	$(find . -path '.ci/*.sh')
+	$(find . -path './.ci/**.sh')
 "
+
 for file in $sh_files; do
 	echo "Test with shellcheck: $file"
-	cd "$DIR/../$(dirname "$file")"
+	cd "$DIR/$(dirname "$file")"
 	shellcheck -e SC1008 -x "$(basename "$file")"
 done

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -15,8 +15,10 @@ def path_pmbootstrap():
         code from there.
         returns: pmbootstrap installation folder
     """
-    # Find 'pmbootstrap' executable
-    bin = shutil.which("pmbootstrap")
+    # This variable is set by pmbootstrap 1.52 and later
+    # If it's undefined, try to find 'pmbootstrap' in path
+    bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")
+
     if not bin:
         print("ERROR: 'pmbootstrap' not found in $PATH")
         sys.exit(1)

.ci/testcases/test_device.py

@@ -38,7 +38,11 @@ def test_aports_device(args):
         apkbuild = pmb.parse.apkbuild(path)
 
         # Depends: Require "postmarketos-base"
-        if "postmarketos-base" not in apkbuild["depends"]:
+        depend_flag = False
+        for dependency in apkbuild["depends"]:
+            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
+                depend_flag = True
+        if not depend_flag:
             raise RuntimeError("Missing 'postmarketos-base' in depends of " +
                                path)
 

.ci/testcases/test_deviceinfo.py

@@ -17,12 +17,15 @@ 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 = ["weston_pixman_type"]
+    obsolete_options = [
+        "usb_rndis_function",
+        "weston_pixman_type",
+    ]
     for option in obsolete_options:
-        if info[option]:
-            raise RuntimeError("option '" + option + "' is obsolete, please"
-                               " remove it (reasons for removal are at"
-                               " <https://postmarketos.org/deviceinfo>)")
+        if option in info and info[option]:
+            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(args):

.ci/testcases/test_firmware.py

@@ -15,6 +15,7 @@ def test_aports_firmware(args):
     """
 
     excluded = [
+        "firmware-motorola-ali",  # Depends on firmware-qcom-adreno-a530
         "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
         "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
         "firmware-xiaomi-sagit",  # Depends on soc-qcom-sdm845-nonfree-firmware

.ci/testcases/test_provides.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2022 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import glob
 import logging

.ci/testcases/test_source.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+# Various checks on source= in the APKBUILDs
 
 import glob
+import logging
+import os
 import pytest
 import sys
-import os
 
 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -21,12 +23,13 @@ def parse_source_from_checksums(args, apkbuild_path):
     to parse shell code (like in postmarketos-base).
 
     :param apkbuild_path: full path to the APKBUILD
-    :returns: list of parsed "source" files, e.g.:
-              ["first.patch", "second.patch"]
+    :returns: dict of parsed "source" filenames and checksums, e.g.:
+              {"first.patch": "b4dc4f3…",
+               "second.patch": "b4dc4f3…"}
     """
     start = 'sha512sums="'
     in_block = False
-    ret = []
+    ret = {}
 
     with open(apkbuild_path, encoding="utf-8") as handle:
         for line in handle.readlines():
@@ -43,18 +46,21 @@ def parse_source_from_checksums(args, apkbuild_path):
                 continue
 
             try:
-                _, filename = line.rstrip().split("  ", 2)
+                checksum, filename = line.rstrip().split("  ", 2)
             except ValueError:
                 raise ValueError("Failed to parse checksums. Try to delete the"
                                  " checksums and generate them again with"
                                  f" 'pmbootstrap checksum': {apkbuild_path}")
 
+            # Cut off 'sha512sums="' if the first checksum is in that line
+            if checksum.startswith(start):
+                checksum = checksum[len(start):]
+
             # Find end
             if filename.endswith('"'):
-                ret += [filename[:-1]]
-                break
+                filename = filename[:-1]
 
-            ret += [filename]
+            ret[filename] = checksum
     return ret
 
 
@@ -97,3 +103,50 @@ def test_aports_unreferenced_files(args):
                     and rel_file_path not in subpackage_installs \
                     and rel_file_path not in trigger_sources:
                 raise RuntimeError(f"{apkbuild_path}: found unreferenced file: {rel_file_path}")
+
+
+def test_distfiles_conflict(args):
+    """
+    Make sure that each filename mentioned in any source= of any APKBUILD
+    always has the same checksum. This is important because apk caches
+    downloaded source files in a flat distfiles directory. So if two APKBUILDs
+    both download a file with the same filename but different checksum, and the
+    user builds both after each other, abuild will fail on the second build
+    with a checksum error.
+    """
+    source_all = {}
+    for apkbuild_path in glob.iglob(f"{args.aports}/**/APKBUILD", recursive=True):
+        source = parse_source_from_checksums(args, apkbuild_path)
+        dir_path = os.path.dirname(apkbuild_path)
+        apkbuild_rel = os.path.relpath(apkbuild_path, args.aports)
+        for filename, checksum in source.items():
+            # Files bundled with the APKBUILD don't get copied to the distfiles
+            # cache, so not relevant for this check. Use glob.glob here and not
+            # iglob, because we don't want an iterator.
+            if glob.glob(f"{dir_path}/**/{filename}", recursive=True):
+                continue
+
+            # First time seeing this file
+            if filename not in source_all:
+                source_all[filename] = {"checksum": checksum,
+                                        "apkbuild_rel": apkbuild_rel}
+                continue
+
+            # Saw this file already with same checksum
+            if checksum == source_all[filename]["checksum"]:
+                continue
+
+            # Saw this file already with different checksum
+            logging.error("")
+            logging.error(f"ERROR: the source file '{filename}' has different"
+                          " checksums in the following files:")
+            logging.error(f"- {source_all[filename]['apkbuild_rel']}:")
+            logging.error(f"  {source_all[filename]['checksum']}")
+            logging.error(f"- {apkbuild_rel}:")
+            logging.error(f"  {checksum}")
+            logging.error("")
+            logging.error("Fix this by setting a different target filename in"
+                          " the package you modified:")
+            logging.error("https://wiki.alpinelinux.org/wiki/APKBUILD_Reference#source")
+            logging.error("")
+            raise RuntimeError(f"Conflict with source file '{filename}'")

.ci/wiki.sh

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# Description: verify devices are documented in the wiki
+# Options: native
+# Run natively so we don't need to set up a chroot, python3 is the only dep.
+# https://postmarketos.org/pmb-ci
+
+if [ "$(id -u)" = 0 ]; then
+	set -x
+	apk -q add \
+		python3
+	exec su "${TESTUSER:-build}" -c "sh -e $0"
+fi
+
+set -x
+.ci/lib/check_devices_in_wiki.py --booting

.ecrc

@@ -1,4 +1,3 @@
 {
-  "Version": "2.6.0",
   "SpacesAftertabs": true
 }

.githooks/pre-commit

@@ -0,0 +1,119 @@
+#!/bin/sh
+#
+# This hook checks that all local sources specified in the staged APKBUILDs
+# are staged too or already committed and that checksums are correct.
+#
+set -eu
+
+# Maximal allowed size (in bytes) of a file.
+FILE_SIZE_LIMIT=262144  # 256 kiB
+
+
+if ! command -v sha512sum >/dev/null; then
+	# macOS / BSDs (?) don't have sha512sum, but shasum.
+	alias sha512sum='shasum -a 512'
+fi
+
+error() {
+	printf '\033[0;31mpre-commit:\033[0m %s\n' "$1" >&2  # red
+}
+
+# Prints paths of created or modified files being committed.
+changed_files() {
+	git diff-index \
+		--name-only \
+		--cached \
+		--diff-filter=ACMR HEAD \
+		-- "$@"
+}
+
+# Prints file names and checksums (in format <SHA-512>:<filename>) of local
+# sources specified in the APKBUILD ($1).
+apkbuild_local_sources() {
+	apkbuild="$1"
+
+	set +eu
+	. "$apkbuild" || {
+		error "$apkbuild is invalid"
+		return 1
+	}
+	set -eu
+
+	status=0
+	: ${source:=""}
+	for src in $source; do
+		# Skip remote sources.
+		case "$src" in */*) continue;; esac
+
+		echo "$sha512sums" | awk -v src="$src" '
+				{ if ($2 == src) { ok=1; print($2 ":" $1) } }
+				END { if (ok != 1) exit 1 }' || {
+			status=1
+			error "${apkbuild%/*}: file \"$src\" is missing in \$sha512sums (hint: run pmbootstrap checksum)"
+		}
+	done
+
+	return $status
+}
+
+# check if given object is a symlink
+is_symlink() {
+	test "$(git ls-files --stage "$1" | awk '{print $1}')" = "120000"
+}
+
+# Checks that all local sources specified in the APKBUILD file ($1) are
+# available in git tree and checksums are correct.
+check_local_sources() {
+	local apkbuild="$1"
+	local startdir="${apkbuild%/*}"
+	local status=0
+	local checksum_act checksum_exp content filename line sources
+
+	sources=$(apkbuild_local_sources "$apkbuild")
+	for line in $sources; do
+		filename=${line%%:*}
+		checksum_exp=${line#*:}
+
+		if ! git cat-file -e ":$startdir/$filename" 2>/dev/null; then
+			error "$startdir: missing file \"$filename\""
+			status=1
+			continue
+		fi
+
+		if is_symlink ":$startdir/$filename"; then
+			continue
+		fi
+
+		checksum_act=$(git show ":$startdir/$filename" | sha512sum)
+		if [ "$checksum_act" != "$checksum_exp  -" ]; then
+			local cmd="pmbootstrap checksum $(basename "$startdir")"
+			error "$startdir: bad checksum for file \"$filename\" (hint: run $cmd)"
+			status=1
+		fi
+	done
+
+	return $status
+}
+
+# Checks if the file ($1) being committed is not bigger than FILE_SIZE_LIMIT.
+check_file_size() {
+	local path="$1"
+	local size
+
+	size=$(git cat-file -s ":$path")
+	if [ $size -gt $FILE_SIZE_LIMIT ]; then
+		local size_kb=$(( size / 1024 ))
+
+		error "file \"$path\" is quite big ($(( size / 1024 )) kiB), better put a remote url in source="
+		return 1
+	fi
+}
+
+
+for apkbuild in $(changed_files '**/APKBUILD'); do
+	check_local_sources "$apkbuild"
+done
+
+for path in $(changed_files); do
+	check_file_size "$path"
+done

.githooks/prepare-commit-msg

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# This hook adds prefix "<repo>/<pkgname>: " to the commit message when
+# committing changes of a single package.
+#
+MSG_FILE="$1"
+SOURCE="$2"
+
+longest_common_prefix() {
+	awk -F/ '
+		(NR == 1) { split($0, prefix); prefix_len = NF }
+		(NR > 1) {
+			for (i = 1; i <= prefix_len; i++) {
+				if (prefix[i] != $i) {
+					prefix_len = i - 1; break
+				}
+			}
+		}
+		(prefix_len == 0) { exit }
+		END {
+			res = prefix[1]
+			for (i = 2; i <= prefix_len; i++) {
+				res = res FS prefix[i]
+			}
+			print(res)
+		}'
+}
+
+prepend_msg() {
+	local prefix="$1"
+
+	printf '%s\n%s\n' "$prefix" "$(cat "$MSG_FILE")" > "$MSG_FILE"
+}
+
+
+# Do nothing if message has been given using -m, template, merge etc.
+[ -z "$SOURCE" ] || exit 0
+
+lcp=$(git diff-index --name-only --cached HEAD | longest_common_prefix)
+
+case "$lcp" in
+	device/*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f3): ";;
+	# Multiple packages touched for same device category
+	# More logic could be added to detect if they all belong to same device
+	device/*)  ;;
+	[^.]*/*) prepend_msg "$(echo "$lcp" | cut -d/ -f1-2): ";;
+esac
+
+exit 0

.gitignore

@@ -20,7 +20,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/move_logs.sh $CI_PROJECT_DIR
+  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
@@ -31,13 +31,12 @@ wiki:
       - merge_requests
     changes:
       - device/*/device-*/*
-  before_script:
-    - apk -q add python3
   script:
-    - .ci/check_devices_in_wiki.py --booting
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/wiki.sh
 
 # testcases linting
-testcases-linting:
+flake8:
   stage: lint
   <<: *only-default
   only:
@@ -49,38 +48,35 @@ testcases-linting:
   before_script:
     - apk -q add py-flake8
   script:
-    - flake8 --ignore E501,F401,E722,W504,W605
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/flake8.sh
 
-# shellcheck
-shellcheck:
+# shellcheck and various grep checks
+shellcheck-grep:
   stage: lint
   <<: *only-default
   image: alpine:edge
-  before_script:
-    - apk -q add shellcheck
   script:
+    - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
+    - .ci/grep.sh
 
 editor-config:
   stage: lint
   <<: *only-default
   image: alpine:edge
-  before_script:
-    - apk -q add editorconfig-checker
   script:
-    - ec
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/ec.sh
 
 # aports checks (generic)
-aports-static:
+pytest-commits:
   stage: lint
   <<: *only-default
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c ".ci/run_testcases.sh"
-    - su pmos -c ".ci/check_changed_aports_versions.py"
-    - su pmos -c ".ci/check-dtb-install-location.sh"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/pytest.sh
+    - .ci/commits.sh
   artifacts:
     when: on_failure
     paths:
@@ -89,26 +85,12 @@ aports-static:
       - pmbootstrap.cfg
     expire_in: 1 week
 
-distfile-check:
-  stage: lint
-  <<: *only-default
-  before_script:
-    - apk -q add make findutils
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/archive/master/ci-common-master.tar.bz2"
-    - tar -xf ci-common-master.tar.bz2
-    - mv ci-common-master/distfile-check/*.sh ci-common-master/distfile-check/Makefile .
-    - rm -r ci-common-master ci-common-master.tar.bz2
-  script:
-    - make -j999
-
 # APKBUILD linting
 aport-lint:
   stage: lint
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
   script:
-    - su pmos -c ".ci/apkbuild-linting.py"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/apkbuild-lint.sh
   only:
     - merge_requests
   allow_failure: true
@@ -123,11 +105,9 @@ kernel-kconfig:
     changes:
       - device/*/linux-*/config-*
       - main/linux-*/config-*
-  before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
   script:
-    - su pmos -c "pmbootstrap kconfig check"
+    - .ci/lib/gitlab_prepare_ci.sh
+    - .ci/kconfig.sh
 
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
@@ -146,10 +126,8 @@ mr-settings:
   stage: build
   <<: *only-default
   before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
-  script:
-    - .ci/build.sh
+    - .ci/lib/gitlab_prepare_ci.sh
+  after_script:
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
   artifacts:
     expire_in: 1 week
@@ -159,18 +137,30 @@ mr-settings:
 
 build-x86_64:
   extends: .build
+  script:
+    - .ci/build-x86_64.sh
 
 build-x86:
   extends: .build
+  script:
+    - .ci/build-x86.sh
 
 build-aarch64:
   extends: .build
+  script:
+    - .ci/build-aarch64.sh
 
 build-armv7:
   extends: .build
+  script:
+    - .ci/build-armv7.sh
 
 build-armhf:
   extends: .build
+  script:
+    - .ci/build-armhf.sh
 
 build-riscv64:
   extends: .build
+  script:
+    - .ci/build-riscv64.sh

.gitlab/issue_templates/Default.md

@@ -0,0 +1,46 @@
+<!--
+	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
+	we would like you to fill in the following :
+-->
+### Describe your issue
+#### What's the expected behaviour?
+
+#### What's the current behaviour?
+
+#### How to reproduce your issue?
+
+### What device are you using?
+<!--
+	Leave name of your device in vendor-codename format.
+	If unsure, check name in the device package or leave full name of device
+	PinePhone: which revision exactly? See https://wiki.pine64.org/index.php/PinePhone#Hardware_revisions
+-->
+
+### On what postmarketOS version did you encounter the issue?
+<!--
+	Replace space inside `[ ]` with `x` to fill the checkbox
+-->
+* [ ] edge (`master` branch)
+* [ ] `v22.12`
+
+* [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
+
+### On what environment did you encounter the issue?
+#### Environments
+* [ ] Phosh
+* [ ] Plasma Mobile
+* [ ] Sxmo (Wayland/Sway) **Please post the output of `sxmo_version.sh`**
+* [ ] Other: **Please fill out**
+### How did you get postmarketOS image?
+* [ ] from https://images.postmarketos.org
+* [ ] I built it using pmbootstrap
+* [ ] It was preinstalled on my device
+### What's the build date of the image? (in yyyy-mm-dd format)
+<!--
+	Notes:
+		can be left empty if unsure
+		If you downloaded image from images.postmarketos.org, date will be in yyyymmdd format
+-->
+
+### Additional information
+<!-- logs, etc. -- make use <details> for long listings -->

.mrhlpr.json

@@ -1,12 +1,7 @@
 {
     "subject_format": {
         "pass": [
-            "^[a-z]+/[a-z-0-9*{}]+: new aport(s|)( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: pkgrel bump( \\(MR \\d+\\)|)$",
-            "^[a-z-0-9*{}]+: new device \\([^\\)]+\\)( \\(MR \\d+\\)|)",
-            "^[a-z]+/[a-z-0-9*{}]+: upgrade to [0-9\\.a-z\\-_]+( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove( \\(MR \\d+\\)|)$",
-            "^[a-z]+/[a-z-0-9*{}]+: remove, upstreamed( \\(MR \\d+\\)|)$",
+            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
             "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
             "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
             "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"

CODEOWNERS

@@ -29,7 +29,7 @@ device/*/linux-google-veyron/			@jenneron
 device/*/u-boot-peach-pi/			@jenneron
 device/*/device-google-cozmo/			@jenneron
 device/*/u-boot-veyron-speedy/			@jenneron
-device/*/device-google-juniper/			@jenneron
+device/*/device-google-juniper/			@jenneron @binarycraft
 device/*/u-boot-peach-pit/			@jenneron
 device/*/device-google-damu/			@jenneron
 device/*/u-boot-nyan-4gb/			@jenneron
@@ -37,7 +37,7 @@ device/*/device-google-kenzo/			@jenneron
 device/*/device-google-kodama/			@jenneron
 device/*/u-boot-snow/				@jenneron
 device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
 device/*/u-boot-veyron-minnie/			@jenneron
@@ -45,6 +45,7 @@ device/*/device-google-fennel14/		@jenneron
 device/*/linux-google-nyan/			@jenneron
 device/*/device-google-willow/			@jenneron
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
+device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/firmware-powervr-gx6250/		@jenneron
 device/*/device-google-hana/			@jenneron
@@ -56,13 +57,30 @@ device/*/device-google-kakadu/			@jenneron
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
 device/*/device-lg-judyp/			@jenneron
+device/*/device-asus-tf201/			@clamor95
+device/*/device-asus-tf300t/			@clamor95
+device/*/device-asus-tf300tg/			@clamor95
+device/*/device-asus-tf700t/			@clamor95
+device/*/device-lg-p895/			@clamor95
+device/*/firmware-asus-transformer/		@clamor95 @jenneron
+device/*/firmware-lg-x3/			@clamor95
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/ 		@bshah
 main/ttyescape					@calebccff
 temp/u-boot-librem5/				@craftyguy @bshah
-temp/alsa-ucm-conf-google-kukui/		@jenneron
+temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 temp/alsa-ucm-conf-google-gru/			@jenneron
+device/*/*-videostrong-kii-pro/                 @vitali64yt
+device/*/*-amlogic-s905*                        @vitali64yt
+device/*/linux-postmarketos-amlogic/            @vitali64yt @exkc
 
 # vim: ts=8 sw=4 et

COMMITSTYLE.md

@@ -0,0 +1,89 @@
+# Policy for commits in pmaports
+
+This document defines policy for organising and titling commits for
+inclusion in pmaports.
+
+## Definitions
+
+### Device-specific package
+
+A device-specific package is used to apply configuration and
+functionality specifically for device support in postmarketOS.
+This is in contrast to other packages
+(e.g. main/postmarketos-ui-phosh) in postmarketOS that are used
+for configuring the distribution without consideration of the
+target device.
+
+## General policy
+
+We follow Alpine's aports commit style with some minor exceptions
+and additions. Alpine's commit style can be found here:
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/COMMITSTYLE.md
+
+## Exceptions
+
+### Changes to packages inside of the device directory
+
+While Alpine has the policy of always prefixing package names with
+the name of the repository they are in, in the case of pmaports
+this can lead to excessively long commit titles due to the nested
+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
+
+Or:
+
+	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
+
+### Moving devices between categories
+
+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
+
+For example:
+
+	samsung-m0: move from testing to community
+
+## Additions
+
+### Forking packages from Alpine
+
+Run `pmbootstrap aportgen --fork-alpine package` and modify it.
+
+#### Template
+
+ - temp/package-name: fork from Alpine
+
+Example: temp/pulseaudio: fork from Alpine
+
+#### Rules
+
+One commit per forked package.
+
+### Adding new devices
+
+Adding a new device package and optionally also a device-specific
+Linux and firmware package.
+
+#### Template
+
+ - manufacturer-codename: new device
+
+Example: htc-m8qlul: new device
+
+#### Rules
+
+If the device has the option of making use of a device-specific
+kernel and/or firmware package, those packages should be included
+in the same commit that adds the device package. One device per
+commit.

README.md

@@ -6,3 +6,4 @@ Helpful resources:
 * [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)

channels.cfg

@@ -8,8 +8,14 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v22.06]
+[v22.12]
 description=Latest release / Recommended for best stability
+branch_pmaports=v22.12
+branch_aports=3.17-stable
+mirrordir_alpine=v3.17
+
+[v22.06]
+description=Old release (unsupported)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

cross/binutils-aarch64/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=aarch64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-aarch64
-pkgver=2.39
-pkgrel=2
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -77,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -102,7 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -126,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-aarch64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-aarch64/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-aarch64/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-aarch64/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armhf/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=armhf
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armhf
-pkgver=2.39
-pkgrel=2
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -77,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -102,7 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -126,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-armhf/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-armhf/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-armhf/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-armhf/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-armv7/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=armv7
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armv7
-pkgver=2.39
-pkgrel=2
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -77,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -102,7 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -126,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-armv7/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-armv7/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-armv7/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-armv7/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/binutils-riscv64/APKBUILD

@@ -7,23 +7,19 @@ CTARGET_ARCH=riscv64
 CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-riscv64
-pkgver=2.39
-pkgrel=2
+pkgver=2.40
+pkgrel=5
 pkgdesc="Tools necessary to build programs for riscv64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
-makedepends_host="zlib-dev"
+makedepends_host="zlib-dev zstd-dev"
 makedepends="$makedepends_build $makedepends_host"
 arch="x86_64"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
 subpackages="binutils-dev binutils-doc"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	CVE-2022-38533.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -77,11 +73,6 @@ build() {
 		_gold_configure="--disable-gold"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -102,7 +93,7 @@ build() {
 		--enable-default-execstack=no \
 		$_cross_configure \
 		$_arch_configure \
-		$_hash_style_configure \
+		--enable-default-hash-style=gnu \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \
@@ -126,30 +117,17 @@ package() {
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
 sha512sums="
-68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3  binutils-2.39.tar.xz
+a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925  binutils-2.40.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-631726e557524633ace39c597acbc5ac39bfd25f7b292eee1f0b2a80a503f4ff799f027757d12d5a24b2fa3c07c7e14602d8a86d96e19876d6d0d5d1a02817e7  CVE-2022-38533.patch
 "

cross/binutils-riscv64/CVE-2022-38533.patch

@@ -1,22 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=bfd%2Fcoffcode.h;h=52027981c3f052d98e043cd0c877f0bb5da97c7f;hp=67aaf158ca1829fe63f0065f31a0b1009b227b36;hb=ef186fe54aa6d281a3ff8a9528417e5cc614c797;hpb=80075150727d653c39e9d037e15c6b87dcef08cd
-
-diff --git a/bfd/coffcode.h b/bfd/coffcode.h
-index 67aaf158ca1..52027981c3f 100644
---- a/bfd/coffcode.h
-+++ b/bfd/coffcode.h
-@@ -4302,10 +4302,13 @@ coff_set_section_contents (bfd * abfd,
- 
- 	rec = (bfd_byte *) location;
- 	recend = rec + count;
--	while (rec < recend)
-+	while (recend - rec >= 4)
- 	  {
-+	    size_t len = bfd_get_32 (abfd, rec);
-+	    if (len == 0 || len > (size_t) (recend - rec) / 4)
-+	      break;
-+	    rec += len * 4;
- 	    ++section->lma;
--	    rec += bfd_get_32 (abfd, rec) * 4;
- 	  }
- 
- 	BFD_ASSERT (rec == recend);

cross/binutils-riscv64/binutils-mips-disable-assert.patch

@@ -1,14 +0,0 @@
-diff -urN binutils-2.35.2.orig/bfd/elfxx-mips.c binutils-2.35.2/bfd/elfxx-mips.c
---- binutils-2.35.2.orig/bfd/elfxx-mips.c	2021-01-30 01:38:03.000000000 -0700
-+++ binutils-2.35.2/bfd/elfxx-mips.c	2021-05-13 17:35:34.706913601 -0600
-@@ -6744,8 +6744,10 @@
-      in the relocation.  */
-   if (h != NULL && ! SYMBOL_REFERENCES_LOCAL (info, &h->root))
-     {
-+#if 0
-       BFD_ASSERT (htab->root.target_os == is_vxworks
- 		  || h->global_got_area != GGA_NONE);
-+#endif
-       indx = h->root.dynindx;
-       if (SGI_COMPAT (output_bfd))
- 	defined_p = h->root.def_regular;

cross/binutils-riscv64/gold-mips.patch

@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS

cross/binutils-riscv64/ld-bfd-mips.patch

@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip

cross/busybox-static-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-aarch64
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.36.0
+pkgrel=8
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-1df3f1400461a3b9c951be9bf4ade500af9b83b4a11025bb244224cee197753d95471a8373a2f5f45d343599f632629c005dc7eba2c3d558dfbcfa56063ed110  busybox-static-1.35.0-r27-aarch64-edge.apk
+918c25a969447cc34a1c3d8176a3da560bc61d3b028206b08d0ef8cc1147756f0f8a2fff02a560a14062ddfffcbb264368502a0f24725992a5652ea0755ed24a  busybox-static-1.36.0-r8-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.36.0
+pkgrel=8
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-cdc8cfb4e013ad0761d2417fba91f75221d97074705bcd4f8ae7a64d0badadff2340595b5d03ff0e5ca608f543ce85f4ba82820a4fd501ecb758d77432afcf90  busybox-static-1.35.0-r27-armhf-edge.apk
+d6c6d8c34101406c7dd7a237a0b3201908a3180d95aa7905bc4c9bde88ea2427cc808a5456c49bd087ce9ed07cbeae9de62681b6cc98900d7ce66af5b73fc0c8  busybox-static-1.36.0-r8-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=busybox-static-armv7
-pkgver=1.35.0
-pkgrel=27
+pkgver=1.36.0
+pkgrel=8
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-65678aa673f8fb11d0a68b7d22203ab9ce2795fb6b3d47c117f8cbecf61305316bb0b0de12812df5d7fe2febe0630fd6ca3961434ffe8051da6a0e194c133cb4  busybox-static-1.35.0-r27-armv7-edge.apk
+b7ebdf31d92ebf6d4a5eebc57a9f9e4d5246e2e325999631bcad71e019e3f6be9ebc2e46ff085a92cee5cd7bb106964ca1f17fd69da47e7b0438bde592dbd830  busybox-static-1.36.0-r8-armv7-edge.apk
 "

cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-aarch64/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-aarch64/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-aarch64/APKBUILD

@@ -26,20 +26,21 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-aarch64
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=4
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-aarch64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
@@ -212,7 +213,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # 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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +263,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +367,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +439,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +656,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,12 +794,12 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-armhf/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-armhf/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-armhf/APKBUILD

@@ -26,20 +26,21 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-armhf
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=4
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armhf mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
@@ -212,7 +213,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # 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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +263,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +367,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +439,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +656,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,12 +794,12 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-armv7/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-armv7/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-armv7/APKBUILD

@@ -26,20 +26,21 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-armv7
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=4
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-armv7 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
@@ -212,7 +213,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # 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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +263,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +367,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +439,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +656,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,12 +794,12 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/gcc-riscv64/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-riscv64/0034-Use-generic-errstr.go-implementation-on-musl.patch

@@ -1,45 +1,204 @@
-From 5093aa99f9cdded2e1ddf67b7139da6fac36b0a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 19 Apr 2021 07:21:41 +0200
-Subject: [PATCH] Use generic errstr.go implementation on musl
+From b3840bdcc0eee2a4d099a9af52199944ade7acb9 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Tue, 29 Nov 2022 17:28:44 -0800
+Subject: [PATCH] syscall, runtime: always call XSI strerror_r
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-glibc provides two version of strerror_r() depending on a feature test
-macro. The first is the XSI-compliant version which returns an int, the
-second is GNU-specific and returns a char pointer.
+This does the right thing for either glibc or musl on GNU/Linux.
 
-Similarity, gcc's libgo provides two implementations of Errstr() both of
-which use strerror_r(). On Linux, it is assumed that the GNU-specific
-strerror_r version is used. However, musl only provides the
-XSI-compliant version of strerror_r. This patch enables the generic
-Errstr() implementation which also uses the XSI-compliant version of
-strerror_r.
+Based on patch by Sören Tempel.
+
+Change-Id: If2969e131f0fae456d58b35d839d8abe191fcc59
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/454176
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Ian Lance Taylor <iant@google.com>
+TryBot-Bypass: Ian Lance Taylor <iant@google.com>
 ---
- libgo/go/syscall/errstr.go       | 1 -
- libgo/go/syscall/errstr_glibc.go | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ libgo/Makefile.am                |  1 +
+ libgo/Makefile.in                |  6 +++++-
+ libgo/go/syscall/errstr.go       | 22 ++++++++-----------
+ libgo/go/syscall/errstr_glibc.go | 33 ----------------------------
+ libgo/runtime/go-strerror.c      | 37 ++++++++++++++++++++++++++++++++
+ 5 files changed, 52 insertions(+), 47 deletions(-)
+ delete mode 100644 libgo/go/syscall/errstr_glibc.go
+ create mode 100644 libgo/runtime/go-strerror.c
 
+diff --git a/libgo/Makefile.am b/libgo/Makefile.am
+index e0a1eec5..df568743 100644
+--- a/libgo/Makefile.am
++++ b/libgo/Makefile.am
+@@ -465,6 +465,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+diff --git a/libgo/Makefile.in b/libgo/Makefile.in
+index 7bef5df9..f2f3f0fc 100644
+--- a/libgo/Makefile.in
++++ b/libgo/Makefile.in
+@@ -247,7 +247,7 @@ am__objects_4 = runtime/aeshash.lo runtime/go-assert.lo \
+ 	runtime/go-fieldtrack.lo runtime/go-matherr.lo \
+ 	runtime/go-memclr.lo runtime/go-memmove.lo \
+ 	runtime/go-memequal.lo runtime/go-nanotime.lo \
+-	runtime/go-now.lo runtime/go-nosys.lo \
++	runtime/go-now.lo runtime/go-nosys.lo runtime/go-strerror.lo \
+ 	runtime/go-reflect-call.lo runtime/go-setenv.lo \
+ 	runtime/go-signal.lo runtime/go-unsafe-pointer.lo \
+ 	runtime/go-unsetenv.lo runtime/go-unwind.lo \
+@@ -917,6 +917,7 @@ runtime_files = \
+ 	runtime/go-nanotime.c \
+ 	runtime/go-now.c \
+ 	runtime/go-nosys.c \
++	runtime/go-strerror.c \
+ 	runtime/go-reflect-call.c \
+ 	runtime/go-setenv.c \
+ 	runtime/go-signal.c \
+@@ -1390,6 +1391,8 @@ runtime/go-now.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-nosys.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
++runtime/go-strerror.lo: runtime/$(am__dirstamp) \
++	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-reflect-call.lo: runtime/$(am__dirstamp) \
+ 	runtime/$(DEPDIR)/$(am__dirstamp)
+ runtime/go-setenv.lo: runtime/$(am__dirstamp) \
+@@ -1457,6 +1460,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-reflect-call.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-setenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-signal.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-strerror.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsafe-pointer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unsetenv.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@runtime/$(DEPDIR)/go-unwind.Plo@am__quote@
 diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go
-index 6c2441d364d..8f7c5538163 100644
+index 6c2441d3..9f688e2a 100644
 --- a/libgo/go/syscall/errstr.go
 +++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
+@@ -4,23 +4,19 @@
+ // Use of this source code is governed by a BSD-style
  // license that can be found in the LICENSE file.
  
- // +build !hurd
+-// +build !hurd
 -// +build !linux
- 
+-
  package syscall
  
+-//sysnb	strerror_r(errnum int, buf []byte) (err Errno)
+-//strerror_r(errnum _C_int, buf *byte, buflen Size_t) _C_int
++import "internal/bytealg"
++
++//extern go_strerror
++func go_strerror(_C_int, *byte, Size_t) _C_int
+ 
+ func Errstr(errnum int) string {
+-	for len := 128; ; len *= 2 {
+-		b := make([]byte, len)
+-		errno := strerror_r(errnum, b)
++	for size := 128; ; size *= 2 {
++		b := make([]byte, size)
++		errno := go_strerror(_C_int(errnum), &b[0], Size_t(len(b)))
+ 		if errno == 0 {
+-			i := 0
+-			for b[i] != 0 {
+-				i++
+-			}
++			i := bytealg.IndexByte(b, 0)
+ 			// Lowercase first letter: Bad -> bad, but
+ 			// STREAM -> STREAM.
+ 			if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+@@ -29,7 +25,7 @@ func Errstr(errnum int) string {
+ 			return string(b[:i])
+ 		}
+ 		if errno != ERANGE {
+-			return "errstr failure"
++			return "strerror_r failure"
+ 		}
+ 	}
+ }
 diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go
-index 5b19e6f202d..8dc60172186 100644
+deleted file mode 100644
+index 5b19e6f2..00000000
 --- a/libgo/go/syscall/errstr_glibc.go
-+++ b/libgo/go/syscall/errstr_glibc.go
-@@ -7,7 +7,7 @@
- // We use this rather than errstr.go because on GNU/Linux sterror_r
- // returns a pointer to the error message, and may not use buf at all.
- 
++++ /dev/null
+@@ -1,33 +0,0 @@
+-// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
+-
+-// Copyright 2010 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-// We use this rather than errstr.go because on GNU/Linux sterror_r
+-// returns a pointer to the error message, and may not use buf at all.
+-
 -// +build hurd linux
-+// +build hurd !linux
- 
- package syscall
- 
+-
+-package syscall
+-
+-import "unsafe"
+-
+-//sysnb	strerror_r(errnum int, b []byte) (errstr *byte)
+-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
+-
+-func Errstr(errnum int) string {
+-	a := make([]byte, 128)
+-	p := strerror_r(errnum, a)
+-	b := (*[1000]byte)(unsafe.Pointer(p))
+-	i := 0
+-	for b[i] != 0 {
+-		i++
+-	}
+-	// Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
+-	if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
+-		c := b[0] + 'a' - 'A'
+-		return string(c) + string(b[1:i])
+-	}
+-	return string(b[:i])
+-}
+diff --git a/libgo/runtime/go-strerror.c b/libgo/runtime/go-strerror.c
+new file mode 100644
+index 00000000..13d1d91d
+--- /dev/null
++++ b/libgo/runtime/go-strerror.c
+@@ -0,0 +1,37 @@
++/* go-strerror.c -- wrapper around XSI-compliant strerror_r.
++
++   Copyright 2022 The Go Authors. All rights reserved.
++   Use of this source code is governed by a BSD-style
++   license that can be found in the LICENSE file.  */
++
++/* There are two version of strerror_r on GNU/Linux: a GNU-specific
++   and an XSI-compliant version.  The former version is only available
++   on glibc.  Since glibc 2.13, the XSI-compliant version is also
++   provided by glibc if _GNU_SOURCE is not defined.  Since the
++   entirety of gofrontend is compiled with _GNU_SOURCE, this file
++   exists to selectively undefine it and provides an alias to the
++   XSI-compliant version of strerror_r(3).  */
++
++#ifdef __linux__
++
++/* Force selection of XSI-compliant strerror_r by glibc.  */
++#undef XOPEN_SOURCE
++#define XOPEN_SOURCE 600
++#undef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 200112L
++#undef _GNU_SOURCE
++
++#endif /* __linux__ */
++
++#include <string.h>
++
++#ifndef HAVE_STRERROR_R
++// Provided by go-nosys.c if not provided by libc itself.
++extern int strerror_r (int, char *, size_t);
++#endif
++
++int
++go_strerror (int errnum, char *buf, size_t buflen)
++{
++  return strerror_r (errnum, buf, buflen);
++}

cross/gcc-riscv64/0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch

@@ -1,22 +1,26 @@
-From 4b6240d5301ce04b8bbc3e2152915cbc7da80584 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 28 Sep 2022 17:30:14 +0200
-Subject: [PATCH] libgo: use _off_t for mmap offset argument
+From 5e658f4659c551330ea68f5667e4f951b218f32d Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Wed, 26 Oct 2022 17:23:42 -0700
+Subject: [PATCH] runtime: use _libgo_off_t_type when calling C mmap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-On glibc-based systems, off_t is a 32-bit type on 32-bit systems and a
-64-bit type on 64-bit systems by default. However, on systems using musl
-libc off_t is unconditionally a 64-bit type. As such, it is insufficient
-to use a uintptr type for the mmap offset parameter.
+The last argument to the C mmap function is type off_t, not uintptr.
+On some 32-bit systems, off_t is larger than uintptr.
 
-Presently, the (incorrect) mmap declaration causes a libgo run-time
-failure on 32-bit musl systems (fatal error: runtime: cannot allocate
-memory). This commit fixes this run-time error.
+Based on patch by Sören Tempel.
+
+Change-Id: Ib6f9d5bcd4734f99a72889e2282b97ec3c8fbd34
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- libgo/go/runtime/mem_gccgo.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ libgo/go/runtime/mem_gccgo.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go
-index fa3389d8..07bf325a 100644
+index fa3389d8..1e84f4f5 100644
 --- a/libgo/go/runtime/mem_gccgo.go
 +++ b/libgo/go/runtime/mem_gccgo.go
 @@ -15,7 +15,7 @@ import (
@@ -24,7 +28,7 @@ index fa3389d8..07bf325a 100644
  
  //extern mmap
 -func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _off_t) unsafe.Pointer
++func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
  
  //extern munmap
  func munmap(addr unsafe.Pointer, length uintptr) int32
@@ -33,7 +37,23 @@ index fa3389d8..07bf325a 100644
  
  func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
 -	p := sysMmap(addr, n, prot, flags, fd, off)
-+	p := sysMmap(addr, n, prot, flags, fd, _off_t(off))
++	p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
  	if uintptr(p) == _MAP_FAILED {
  		return nil, errno()
  	}
+@@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
+ 
+ // Don't split the stack as this method may be invoked without a valid G, which
+ // prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
+ 	p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
+@@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
+ 
+ // Don't split the stack as this function may be invoked without a valid G,
+ // which prevents us from allocating more stack.
++//
+ //go:nosplit
+ func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
+ 	sysStat.add(-int64(n))

cross/gcc-riscv64/APKBUILD

@@ -26,20 +26,21 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-riscv64
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=4
+pkgrel=10
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
 depends="binutils-riscv64 mpc1"
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+# XXX: build hack to upgrade live on builders
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
@@ -212,7 +213,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # 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://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +263,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +367,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +439,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +656,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,12 +794,12 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
-699dc3641099da6136dd3689f06c6553c03b3a85acf83a3fce1beb5425065b3e378535ca9e9100a120fdbafc34871d61c063fd5328a49cd87a15a989ed51706d  0034-Use-generic-errstr.go-implementation-on-musl.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
+141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch
 8bc6823f0b3c66f7b73d7ddb64ffa6930463285c2e9a14a2bc1882bcc4271144eaa1107d713294699caf9481648163cbf43921a2b8e4ac0d55c78a804bae8a3d  0037-libgo-Recognize-off64_t-and-loff_t-definitions-of-mu.patch
-e9699f4721778869eb3a8fef2c679208ef5b98584892f30b0e1cb5dc1669f8158198d7792659b1b56c381baf62247d21990dcced9178547affd5d6bfb2d12548  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
+f0744c01859e67deed404c97e1870b2876935fdc467e51980373744936574c314d5d21134734c5d515e7f3cd3483ef98045b9bbcd81c568c6038fac96ffb5fa0  0039-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch
 d6dc1bfb881a313d167aaa5658790b0f55eea4336c408cfc6613dd5783440dafd0d37c43031a5f3e69be40f632e38371cd4fb6e5f0494ac4ea4d7d5025d2ae02  0041-go-gospec-forcibly-disable-fsplit-stack-support.patch
 684c6a6d52512b973429b6e709966439ac1e174f9e79a33d4a638b452245b457b34752b4b4034ba983f6a712f86522e7adf715bab00a6603f64a12139c5b1e39  0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
 25014dfa99d96ee70ce0ad22e9f7974f0a51cc50b3b9c2db49df50774c8cd29e497ceed120486bee50be83bfb07f2009ed310eb9b0543f2795bd7359b87eadd2  0043-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=6
+pkgrel=11
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-ab6731f2486a1c58af91839c758491cfafad48b899287c3015194699639e2349f3b49cefccdc4040c87c1dc3c3c2fdedfdd023481e613156e4e3e3f455bc8a2b  grub-efi-2.06-r6-x86-edge.apk
+7400eb18117b8b1c8229f3f2f3eb3bcff75022d8ca81fa66fd35022eab93d9832e602d2454e957c11b8583f6c6176d1ff7fa6aa94ff5fadf8c14a0d55e447762  grub-efi-2.06-r11-x86-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-aarch64
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-17ca2c88d44f1e08372cb7a117a8cf754d44804445f1f94631c6517169657104beda3d57ffa07159054024519cb568cb3a8f267fd660897c1d36d3b5dfd059e4  musl-1.2.3-r4-aarch64-edge.apk
-d77fc40eac95c7ad87f7286f77bc356373fbbda93a971e8fa8154b23a55ec04691ec7976d522b4d52f1efd57cf2ea05576dbed8f70b1168028fcd25321c303b3  musl-dev-1.2.3-r4-aarch64-edge.apk
+08fc24d6ab89fe424d7531cbdd313ed6fa5cf28e7cbb9d0ce15912dc22373fc9f21c301ed3adea47a460cacbb1220319a51f93f7c6a2ae1a93658c0703619c07  musl-1.2.3_git20230411-r0-aarch64-edge.apk
+7a9e555fd7e94d50c2e0664ff32ff610537249131fb9bc968db286204c959bd1b3b155c0eed15d685225a094f71b71877d571821ef13c6faf74c73024306d8ee  musl-dev-1.2.3_git20230411-r0-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armhf
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-95e4ddc58290acdc15ebcf15c77b75de40bd0eb5ce79f745ef7dcdfde7d786216f69ca632c6c7bc562ff8ca54c65842a63ea3f79582ea63a13f2b9b8e5b0aee2  musl-1.2.3-r4-armhf-edge.apk
-45577e4571692a84fd984f023591d935901591a6b877163f93d1b854ba3b3876f972d26f5897a9f8b43d4dbc81aa736af2cec9bf60a7ff47f55805cc90926b3d  musl-dev-1.2.3-r4-armhf-edge.apk
+fa19f5b324ab7bf112e724670f8b7775d51a6209ef9c123c84a52859427021db07aa2cb329429d038ccfed010d0d21e20aef73447c2d2f0b0cd4dc7a8648dbf9  musl-1.2.3_git20230411-r0-armhf-edge.apk
+29da6801c91ccae218de9b6685af2380ee6e377719cfe7b37c6bf54d0fddbcd926e6be30ef4b38e833e19dd5b9f5e5093fea9bace17c408afe9bb570630595d3  musl-dev-1.2.3_git20230411-r0-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-armv7
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-0fb05cad178984393ac82ebcda74110ec77f13a9bb8fd5639cdec1e563ed724b80e0d2a2dea30ec98afab279bf9fc00d482b82be1c77611d0e8582853845a754  musl-1.2.3-r4-armv7-edge.apk
-f5cd6d747617fc8dc2ec021c75e8b66846c38773d02d106a549480a7a60d0f646fea0d2f941a62d269a021bb4f13e26447e75d10fed053352b9d0c5217a55896  musl-dev-1.2.3-r4-armv7-edge.apk
+b11903dab8d0f4e0a3eee7c78f74cb495519c6c08c250d6823342340c464d5d75acd1ba89bd90aaaea27505fcebb38cbfd10278a572e95a3bcdea1f5dd43c1e8  musl-1.2.3_git20230411-r0-armv7-edge.apk
+94aca2637425a6bd7f7641e2eb3be8cbea414c568c295d70b592550510f0a5c775a8e4f89aacff13caf6fd30fdc34c2f0f62ee9c93d185bed989f611e28ed0bf  musl-dev-1.2.3_git20230411-r0-armv7-edge.apk
 "

cross/musl-riscv64/APKBUILD

@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi
 
 pkgname=musl-riscv64
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.3_git20230411
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-2f8046831c410d91dac08443091ac218e0b49f75b3d8b9b41735d4567c425e9aaae2704bfd537af97ed79910e5aa8dc6e1ba70ca7b2017349cebbf4406457aa9  musl-1.2.3-r4-riscv64-edge.apk
-7971285250946e45a78eb8a8414911b09c5f54bc99cdd0f9258f4f9f026001690935eb084c54115ce0c0d3c5ca7ffe2cbf903bb90da46f45c6ca71a361c54c89  musl-dev-1.2.3-r4-riscv64-edge.apk
+c9ed4d52c43a3810463bdee5aab83eaf0c23b5b5d6376245ad4f3c93acb533a7f458b6410ef31c044a699436a42eaf92530d884155eabf952878e85c79ac1c70  musl-1.2.3_git20230411-r0-riscv64-edge.apk
+29f59d4bbd1297efb032899b09ad63b64664a4c3cb46bf88dbdc9abbbb3f4729bf445dccf13ed5b56794fc1b703bb11c65a220c0a2de69ce497f83c64c2aced7  musl-dev-1.2.3_git20230411-r0-riscv64-edge.apk
 "

device/.shared-patches/linux/fix-read-only-segment-has-dynamic-relocations-error.patch

@@ -0,0 +1,17 @@
+Fixes "ld: read-only segment has dynamic relocations" error caused by "main/binutils: add -z text by default":
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/a737d101cad8c0acf782d9a0ec38cf8d3432b6ff
+https://gitlab.alpinelinux.org/alpine/aports/-/commit/098309ba27bbb71f3723aa2e6e180776e0396b86
+
+diff --git a/Makefile b/Makefile
+index 4ee2a6394ec3..3fbced2573d1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -969,6 +969,8 @@ ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
+ LDFLAGS_vmlinux	+= $(call ld-option, -X,)
+ endif
+ 
++LDFLAGS_vmlinux += -z notext
++
+ ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false)
+   ifeq ($(CONFIG_SENSORS_FINGERPRINT), y)
+     ifneq ($(CONFIG_SEC_FACTORY), y)

device/.shared-patches/u-boot/gcc-12-u-boot-2020-fix-read-only-segment-has-dynamic-relocations-error.patch

@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -970,6 +970,8 @@
+ # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
+ LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
+ 
++LDFLAGS_u-boot += -z notext $(call ld-option, --apply-dynamic-relocs)
++
+ ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
+ LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
+ endif

device/community/device-fairphone-fp4/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=0.9
+pkgver=1.0
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -71,7 +71,7 @@ phosh() {
 
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-584d14a61b9d3ee436725a5b4fd9e7e1fde8764bb7e1872e4a20115ad767e1d87ab2c2023d5f941217579ef915b6a6011f6ae61487102f690bd532368a090c8a  deviceinfo
+7a54c90ebe68b2fe1c59ef3b94bfdac0e0e7833eb881d8dcff86d61dc0d45a606d498aa10cefcc68a82bdbc4130091e036867fdb429ed314b9b46100c55a21d7  deviceinfo
 25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-fairphone-fp4/deviceinfo

@@ -24,7 +24,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT sdhci.debug_quirks=0x40"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"

device/community/device-lenovo-a6000/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,6 @@ phosh() {
 }
 
 sha512sums="
-c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
+a73d36985ea77bf01493e8a4dae0e437a0e944254745d71fe8f6ecd5809497a7a93cbbddcde608d83fc5539def887feb0d9dd1920613acc51ec386f7dbdb0b1d  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6000/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="lenovo-a6000"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86518"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
+deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-lenovo-a6010/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,6 +46,6 @@ phosh() {
 }
 
 sha512sums="
-f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
+ab4d6460d45793c887b4e632b01e7a16a46b7aa3deee7d8b3c7bbc5d1397db54b492c212e15c49c588c1766a265882373324b3e861ce3e0258056a631220b4b5  deviceinfo
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "

device/community/device-lenovo-a6010/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="lenovo-a6010"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86528"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
+deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"
 
 # Device related

device/community/device-motorola-harpia/APKBUILD

@@ -1,10 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Ruby Iris Juric <ruby@srxl.me>
-# Co-Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,8 +31,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	# harpia's WCNSS firmware has problems with WiFi channels on some device
+	# variants, using osprey's firmware seems to help as a workaround
+	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
-		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
+		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
+		 firmware-motorola-osprey-wcnss"
 	mkdir "$subpkgdir"
 }
 

device/community/device-nokia-n900/APKBUILD

@@ -2,13 +2,13 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=8.3
-pkgrel=2
+pkgver=9.0
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
@@ -41,6 +41,7 @@ source="
 	keymaps/rx51_fise.map
 	keymaps/rx51_it.map
 	keymaps/rx51_us.map
+	lock.sh
 	n900-wlan-data.initd
 	pointercal
 	uboot-script.cmd
@@ -74,7 +75,7 @@ package() {
 	install -D -m644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
 	install -D -m644 "$srcdir"/backlight-enable.sh \
-		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-$pkgname-backlight.sh
+		"$pkgdir"/usr/share/mkinitfs/hooks/00-$pkgname-backlight.sh
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 	install -D -m644 "$srcdir"/asound.state.speakers \
@@ -82,9 +83,9 @@ package() {
 	install -D -m644 "$srcdir"/asound.state.headset \
 		"$pkgdir"/var/lib/alsa/asound.state.headset
 	install -Dm644 "$srcdir"/10-initfs-keymap.files \
-		"$pkgdir"/etc/postmarketos-mkinitfs/files/10-initfs-keymap.files
+		"$pkgdir"/usr/share/mkinitfs/files/10-initfs-keymap.files
 	install -Dm644 "$srcdir"/10-initfs-keymap.sh \
-		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/10-initfs-keymap.sh
+		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
 	install -Dm755 "$srcdir"/$pkgname.start \
 		"$pkgdir"/etc/local.d/$pkgname.start
 
@@ -118,10 +119,13 @@ package() {
 
 x11() {
 	install_if="$pkgname xorg-server"
+	depends="xset xinput"
 	install -D -m644 "$srcdir"/40-xkb.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
+	install -Dm755 "$srcdir"/lock.sh \
+		"$pkgdir"/usr/bin/lock.sh
 }
 
 xkeyboard_config() {
@@ -187,9 +191,10 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28  rx51_fise.map
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
+caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-3ae550b50f963695be30eb0e03c31fe7a92aad73174873efe5b73d446b74da5763b6fe9495b91bbdbe307723f6510ebc6639437904815e9251a094ce9bec5b11  uboot-script.cmd
+9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 737d9e57e219a0220c5b1943375f325309323344fdf06973546c7d88ed9aec857657abd6b7861669873574f865e1c99719d411e0564dbfebe028f9e77d308491  x11-keymap

device/community/device-nokia-n900/uboot-script.cmd

@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 console=ttyO2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile