Attempt to integrate with lightdm and elogind

.ci/apkbuild-linting.py

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import common
-import os.path
-import sys
-
-if __name__ == "__main__":
-    common.add_upstream_git_remote()
-    apkbuilds = {file for file in common.get_changed_files(removed=False)
-                 if os.path.basename(file) == "APKBUILD"}
-    if len(apkbuilds) < 1:
-        print("No APKBUILDs to lint")
-        sys.exit(0)
-
-    packages = []
-    for apkbuild in apkbuilds:
-        if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
-            print(f"NOTE: Skipping linting of {apkbuild}")
-            continue
-        packages.append(os.path.basename(os.path.dirname(apkbuild)))
-    if len(packages) < 1:
-        print("No APKBUILDs to lint")
-        sys.exit(0)
-
-    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
-
-    if len(result) > 0:
-        print("Linting issues found:")
-        print(result)
-        sys.exit(1)

.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/build_changed_aports.py

@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-import sys
-
-# Same dir
-import common
-
-# pmbootstrap
-import testcases.add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.helpers.pmaports
-
-
-def build_strict(packages, arch):
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
-                            "--strict", "--force",
-                            "--arch", arch, ] + list(packages))
-
-
-def verify_checksums(packages, arch):
-    # Only do this with one build-{arch} job
-    arch_verify = "x86_64"
-    if arch != arch_verify:
-        print(f"NOTE: doing checksum verification in build-{arch_verify} job,"
-              " not here.")
-        return
-
-    if len(packages) == 0:
-        print("no packages changed, not doing any checksums verification")
-        return
-
-    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
-                           list(packages))
-
-
-if __name__ == "__main__":
-    # Architecture to build for (as in build-{arch})
-    if len(sys.argv) != 2:
-        print("usage: build_changed_aports.py ARCH")
-        sys.exit(1)
-    arch = sys.argv[1]
-
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-
-    # Package count sanity check
-    common.get_changed_packages_sanity_check(len(packages))
-
-    # [ci:skip-build]: verify checksums and stop
-    verify_only = common.commit_message_has_string("[ci:skip-build]")
-    if verify_only:
-        print("WARNING: not building changed packages ([ci:skip-build])!")
-        print("verifying checksums: " + ", ".join(packages))
-        verify_checksums(packages, arch)
-        sys.exit(0)
-
-    # Prepare "args" to use pmbootstrap code
-    sys.argv = ["pmbootstrap", "chroot"]
-    args = pmb.parse.arguments()
-
-    # Filter out packages that can't be built for given arch
-    # (Iterate over copy of packages, because we modify it in this loop)
-    for package in packages.copy():
-        apkbuild_path = pmb.helpers.pmaports.find(args, package)
-        apkbuild = pmb.parse._apkbuild.apkbuild(f"{apkbuild_path}/APKBUILD")
-
-        if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
-            print(f"{package}: not enabled for {arch}, skipping")
-            packages.remove(package)
-
-    # No packages: skip build
-    if len(packages) == 0:
-        print(f"no packages changed, which can be built for {arch}")
-        sys.exit(0)
-
-    # Build packages
-    print(f"building in strict mode for {arch}: {', '.join(packages)}")
-    build_strict(packages, arch)

.ci/check_changed_aports_versions.py

@@ -1,156 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import tempfile
-import sys
-import subprocess
-
-# Same dir
-import common
-
-# pmbootstrap
-import testcases.add_pmbootstrap_to_import_path  # noqa
-import pmb.parse
-import pmb.parse.version
-import pmb.helpers.logging
-
-
-def get_package_version(args, package, revision, check=True):
-    # Redirect stderr to /dev/null, so git doesn't complain about files not
-    # existing in upstream branch for new packages
-    stderr = None
-    if not check:
-        stderr = subprocess.DEVNULL
-
-    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
-    pmaports_dir = common.get_pmaports_dir()
-    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
-    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
-    apkbuild_content = common.run_git(["show", revision + ":" + path], check,
-                                      stderr)
-    if not apkbuild_content:
-        return None
-
-    # Save APKBUILD to a temporary path and parse it from there. (Not the best
-    # way to do things, but good enough for this CI script.)
-    with tempfile.TemporaryDirectory() as tempdir:
-        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
-            handle.write(apkbuild_content)
-        parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
-
-    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
-
-
-def version_compare_operator(result):
-    """ :param result: return value from pmb.parse.version.compare() """
-    if result == -1:
-        return "<"
-    elif result == 0:
-        return "=="
-    elif result == 1:
-        return ">"
-
-    raise RuntimeError("Unexpected version_compare_operator input: " + result)
-
-
-def exit_with_error_message():
-    branch = common.get_upstream_branch()
-    print()
-    print("ERROR: Modified package(s) don't have an increased version or a")
-    print("new package has a nonzero pkgrel!")
-    print()
-    print("This can happen if you added a new package with a nonzero")
-    print("pkgrel, or if you did not change the pkgver/pkgrel")
-    print("variables in the APKBUILDs. Or you did change them, but the")
-    print(f"packages have been updated in the official '{branch}' branch, and")
-    print("now your versions are not higher anymore.")
-    print()
-    print("Your options:")
-    print("a) If you made changes to the packages, and did not increase the")
-    print("   pkgrel/pkgver: increase them now, and force push your branch.")
-    print("   => https://postmarketos.org/howto-bump-pkgrel-pkgver")
-    print("b) If you had already increased the package versions, rebase on")
-    print(f"   '{branch}', increase the versions again and then force push:")
-    print("   => https://postmarketos.org/rebase")
-    print("c) If you made a change, that does not require rebuilding the")
-    print("   packages, such as only changing the arch=... line: you can")
-    print("   disable this check by adding '[ci:skip-vercheck]' to the")
-    print("   latest commit message, then force push.")
-    print()
-    print("Thank you and sorry for the inconvenience.")
-    exit(1)
-
-
-def check_versions(args, packages):
-    error = False
-
-    # Get relevant commits: compare HEAD against upstream branch or HEAD~1
-    # (the latter if this CI check is running on upstream branch). Note that
-    # for the common.get_changed_files() code, we don't check against
-    # upstream branch HEAD, but against the latest common ancestor. This is not
-    # desired here, since we already know what packages changed, and really
-    # want to check if the version was increased towards *current* upstream
-    # branch HEAD.
-    commit = f"upstream/{common.get_upstream_branch()}"
-    if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
-                                                                commit]):
-        print(f"NOTE: {commit} is on same commit as HEAD, comparing"
-              " HEAD against HEAD~1.")
-        commit = "HEAD~1"
-
-    for package in packages:
-        # Get versions, skip new packages
-        head = get_package_version(args, package, "HEAD")
-        upstream = get_package_version(args, package, commit, False)
-        if not upstream:
-            if head.rpartition('r')[2] != "0":
-                print(f"- {package}: {head} (HEAD) (new package) [ERROR]")
-                error = True
-            else:
-                print(f"- {package}: {head} (HEAD) (new package)")
-            continue
-
-        # Compare head and upstream versions
-        result = pmb.parse.version.compare(head, upstream)
-        if result != 1:
-            error = True
-
-        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
-        formatstr = "- {}: {} (HEAD) {} {} ({})"
-        if result != 1:
-            formatstr += " [ERROR]"
-        operator = version_compare_operator(result)
-        print(formatstr.format(package, head, operator, upstream, commit))
-
-    if error:
-        exit_with_error_message()
-
-
-if __name__ == "__main__":
-    # Get and print modified packages
-    common.add_upstream_git_remote()
-    packages = common.get_changed_packages()
-    print(f"Changed packages: {packages}")
-
-    # Verify modified package count
-    common.get_changed_packages_sanity_check(len(packages))
-    if len(packages) == 0:
-        print("no aports changed in this branch")
-        exit(0)
-
-    # Potentially skip this check
-    if common.commit_message_has_string("[ci:skip-vercheck]"):
-        print("WARNING: not checking for changed package versions"
-              " ([ci:skip-vercheck])!")
-        exit(0)
-
-    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
-    sys.argv = ["pmbootstrap.py", "chroot"]
-    args = pmb.parse.arguments()
-    pmb.helpers.logging.init(args)
-
-    # Verify package versions
-    print("checking changed package versions...")
-    check_versions(args, packages)

.ci/common.py

@@ -1,192 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Various functions used in CI scripts
-
-import configparser
-import os
-import subprocess
-import sys
-
-
-cache = {}
-
-
-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__) + "/.."))
-    cache["pmaports_dir"] = ret
-    return ret
-
-
-def run_git(parameters, check=True, stderr=None):
-    """ Run git in the pmaports dir and return the output """
-    cmd = ["git", "-C", get_pmaports_dir()] + parameters
-    try:
-        return subprocess.check_output(cmd, stderr=stderr).decode()
-    except subprocess.CalledProcessError:
-        if check:
-            raise
-        return None
-
-
-def add_upstream_git_remote():
-    """ Add a remote pointing to postmarketOS/pmaports. """
-    run_git(["remote", "add", "upstream",
-             "https://gitlab.com/postmarketOS/pmaports.git"], False)
-    run_git(["fetch", "-q", "upstream"])
-
-
-def commit_message_has_string(needle):
-    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
-
-
-def run_pmbootstrap(parameters, output_return=False):
-    """ Run pmbootstrap with the pmaports dir as --aports """
-    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
-    stdout = subprocess.PIPE if output_return else None
-    result = subprocess.run(cmd, stdout=stdout, universal_newlines=True)
-    result.check_returncode()
-    if output_return:
-        return result.stdout
-
-
-def get_upstream_branch():
-    """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and
-        channels.cfg from master to retrieve the upstream branch.
-
-        :returns: branch name, e.g. "v20.05" """
-    global cache
-    if "upstream_branch" in cache:
-        return cache["upstream_branch"]
-
-    # Get channel (e.g. "stable") from pmaports.cfg
-    # https://postmarketos.org/pmaports.cfg
-    pmaports_dir = get_pmaports_dir()
-    pmaports_cfg = configparser.ConfigParser()
-    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
-    channel = pmaports_cfg["pmaports"]["channel"]
-
-    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
-    # https://postmarketos.org/channels.cfg
-    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
-    channels_cfg = configparser.ConfigParser()
-    channels_cfg.read_string(channels_cfg_str)
-    assert channel in channels_cfg, \
-        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
-        " This appears to be an old branch, consider recreating your change" \
-        " on top of master."
-
-    ret = channels_cfg[channel]["branch_pmaports"]
-    cache["upstream_branch"] = ret
-    return ret
-
-
-def get_changed_files(removed=True):
-    """ Get all changed files and print them, as well as the branch and the
-        commit that was used for the diff.
-        :param removed: also return removed files (default: True)
-        :returns: set of changed files
-    """
-    branch_upstream = f"upstream/{get_upstream_branch()}"
-    commit_head = run_git(["rev-parse", "HEAD"])[:-1]
-    commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
-    print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: f{commit_upstream}")
-
-    # Check if we are HEAD on the upstream branch
-    if commit_head == commit_upstream:
-        # then compare with previous commit
-        commit = "HEAD~1"
-    else:
-        # otherwise compare with latest common ancestor
-        commit = run_git(["merge-base", branch_upstream, "HEAD"])[:-1]
-    print("comparing HEAD with: " + commit)
-
-    # Changed files
-    ret = set()
-    print("changed file(s):")
-    for file in run_git(["diff", "--name-only", commit, "HEAD"]).splitlines():
-        message = "  " + file
-        if not os.path.exists(file):
-            message += " (deleted)"
-            if removed:
-                ret.add(file)
-        else:
-            ret.add(file)
-        print(message)
-    return ret
-
-
-def get_changed_packages_sanity_check(count):
-    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
-        if commit_message_has_string(mark):
-            print("NOTE: package count sanity check skipped (" + mark + ").")
-            return
-    if count <= 10:
-        return
-
-    branch = get_upstream_branch()
-    print()
-    print("ERROR: Too many packages have changed!")
-    print()
-    print("This is a sanity check, so we don't end up building packages that")
-    print("have not been modified. CI won't run for more than one hour")
-    print("anyway.")
-    print()
-    print("Your options:")
-    print("a) If you *did not* modify everything listed above, then rebase")
-    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
-    print("   branch. Feel free to ask in the chat for help if you need any.")
-    print("b) If you *did* modify all these packages, and you assume that")
-    print("   they will build within one hour: skip this sanity check by")
-    print("   adding '[ci:ignore-count]' to the commit message (then force")
-    print("   push).")
-    print("c) If you *did* modify all these packages, and you are sure that")
-    print("   they won't build in time, please add '[ci:skip-build]' to the")
-    print("   commit message (then force push). Make sure that all packages")
-    print("   build with 'pmbootstrap build --strict'!")
-    print()
-    print("Thank you and sorry for the inconvenience.")
-
-    sys.exit(1)
-
-
-def get_changed_packages():
-    ret = set()
-    for file in get_changed_files():
-        dirname, filename = os.path.split(file)
-
-        # Skip files:
-        # * in the root dir of pmaports (e.g. README.md)
-        # * path with a dot (e.g. .ci/, device/.shared-patches/)
-        if not dirname or file.startswith(".") or "/." in file:
-            continue
-
-        if filename != "APKBUILD":
-            # Walk up directories until we (eventually) find the package
-            # the file belongs to (could be in a subdirectory of a package)
-            while dirname and not os.path.exists(os.path.join(dirname, "APKBUILD")):
-                dirname = os.path.dirname(dirname)
-
-            # Unable to find APKBUILD the file belong to
-            if not dirname:
-                # ... maybe the package was deleted entirely?
-                if not os.path.exists(file):
-                    continue
-
-                # Weird, file does not belong to any package?
-                # Here we just warn, there is an extra check
-                # to make sure that files are organized properly.
-                print(f"WARNING: Changed file {file} does not belong to any package")
-                continue
-
-        elif not os.path.exists(file):
-            continue  # APKBUILD was deleted
-
-        ret.add(os.path.basename(dirname))
-
-    return ret

.ci/shellcheck.sh

@@ -1,53 +0,0 @@
-#!/bin/sh -e
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-set -e
-DIR="$(cd "$(dirname "$0")" && pwd -P)"
-cd "$DIR/.."
-
-# 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
-
-# Shell: shellcheck
-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-installkernel/installkernel-pmos
-	./main/postmarketos-mkinitfs/init.sh
-	./main/postmarketos-mkinitfs/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/*.sh
-	./main/ttyescape/*.post-install
-	./main/unl0kr/unlock.sh
-	./main/msm-firmware-loader/*.sh
-	./main/msm-firmware-loader/*.post-install
-
-	$(find . -path './main/postmarketos-ui-*/*.sh')
-	$(find . -path './main/postmarketos-ui-*/*.pre-install')
-	$(find . -path './main/postmarketos-ui-*/*.post-install')
-	$(find . -path './main/postmarketos-ui-*/*.pre-upgrade')
-	$(find . -path './main/postmarketos-ui-*/*.post-upgrade')
-	$(find . -path './main/postmarketos-ui-*/*.pre-deinstall')
-	$(find . -path './main/postmarketos-ui-*/*.post-deinstall')
-
-	$(find . -name '*.trigger')
-	$(find . -path './main/devicepkg-dev/*.sh')
-	$(find . -path './main/postmarketos-mvcfg/*.sh')
-
-	$(find . -path '.ci/*.sh')
-"
-for file in $sh_files; do
-	echo "Test with shellcheck: $file"
-	cd "$DIR/../$(dirname "$file")"
-	shellcheck -e SC1008 -x "$(basename "$file")"
-done

.ci/testcases/conftest.py

@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pytest
-import sys
-import os
-
-
-@pytest.fixture
-def args(request):
-    # Initialize args
-    pmaports = os.path.realpath(f"{os.path.dirname(__file__)}/../..")
-    sys.argv = ["pmbootstrap",
-                "--aports", pmaports,
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(pmb.helpers.logging.logfd.close)
-    return args

.ci/testcases/test_device.py

@@ -1,136 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pytest
-import sys
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-
-
-def device_dependency_check(apkbuild, path):
-    """ Raise an error if a device package has a dependency that is not allowed
-        (e.g. because it should be in a subpackage instead). """
-
-    # asus-me176c: without this, the device will simply run the broken ACPI
-    #              DSDT table, so we might as well update it. See pmaports!699.
-    firmware_ok = {"device-asus-me176c": ["firmware-asus-me176c-acpi"]}
-
-    pkgname = apkbuild["pkgname"]
-    for depend in apkbuild["depends"]:
-        if (depend.startswith("firmware-") or
-                depend.startswith("linux-firmware")):
-            if pkgname in firmware_ok and depend in firmware_ok[pkgname]:
-                continue
-            raise RuntimeError("Firmware package '" + depend + "' found in"
-                               " depends of " + path + ". These go into"
-                               " subpackages now, see"
-                               " <https://postmarketos.org/devicepkg>.")
-
-
-def test_aports_device(args):
-    """
-    Various tests performed on the /device/*/device-* aports.
-    """
-    for path in glob.iglob(args.aports + "/device/*/device-*/APKBUILD"):
-        apkbuild = pmb.parse.apkbuild(path)
-
-        # Depends: Require "postmarketos-base"
-        if "postmarketos-base" not in apkbuild["depends"]:
-            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
-                               path)
-
-        # Depends: Must not have firmware packages
-        for depend in apkbuild["depends"]:
-            device_dependency_check(apkbuild, path)
-
-        # Architecture
-        device = apkbuild["pkgname"][len("device-"):]
-        deviceinfo = pmb.parse.deviceinfo(args, device)
-        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
-            raise RuntimeError("wrong architecture, please change to arch=\"" +
-                               deviceinfo["arch"] + "\": " + path)
-        if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError("!archcheck missing in options= line: " + path)
-
-        if deviceinfo["flash_kernel_on_update"] == "true" \
-                and "postmarketos-update-kernel" not in apkbuild["depends"]:
-            raise RuntimeError(
-                "Deviceinfo indicates this device supports automatic kernel"
-                " flashing on update, but doesn't depend on"
-                " 'postmarketos-update-kernel'. Please add the missing"
-                " dependency.")
-
-
-def test_aports_device_kernel(args):
-    """
-    Verify the kernels specified in the device packages:
-    * Kernel must not be in depends when kernels are in subpackages
-    * Check if only one kernel is defined in depends
-    """
-
-    # Iterate over device aports
-    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
-        # Parse apkbuild and kernels from subpackages
-        apkbuild = pmb.parse.apkbuild(path)
-        device = apkbuild["pkgname"][len("device-"):]
-        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
-
-        # Parse kernels from depends
-        kernels_depends = []
-        for depend in apkbuild["depends"]:
-            if not depend.startswith("linux-"):
-                continue
-            kernels_depends.append(depend)
-
-            # Kernel in subpackages *and* depends
-            if kernels_subpackages:
-                raise RuntimeError("Kernel package '" + depend + "' needs to"
-                                   " be removed when using kernel" +
-                                   " subpackages: " + path)
-
-        # No kernel
-        if not kernels_depends and not kernels_subpackages:
-            raise RuntimeError("Device doesn't have a kernel in depends or"
-                               " subpackages: " + path)
-
-        # Multiple kernels in depends
-        if len(kernels_depends) > 1:
-            raise RuntimeError("Please use kernel subpackages instead of"
-                               " multiple kernels in depends (see"
-                               " <https://postmarketos.org/devicepkg>): " +
-                               path)
-
-
-def test_aports_maintained(args):
-    """
-    Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
-    """
-    for path in glob.iglob(f"{args.aports}/device/main/*/APKBUILD"):
-        if '/firmware-' in path:
-            continue
-        maintainers = pmb.parse._apkbuild.maintainers(path)
-        assert maintainers and len(maintainers) >= 2, \
-            f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-
-    for path in glob.iglob(f"{args.aports}/device/community/*/APKBUILD"):
-        if '/firmware-' in path:
-            continue
-        maintainers = pmb.parse._apkbuild.maintainers(path)
-        assert maintainers, f"{path} in community needs at least 1 Maintainer"
-
-
-def test_aports_unmaintained(args):
-    """
-    Ensure that aports in /device/unmaintained have an "Unmaintained:" comment
-    that describes why the aport is unmaintained.
-    """
-    for path in glob.iglob(f"{args.aports}/device/unmaintained/*/APKBUILD"):
-        unmaintained = pmb.parse._apkbuild.unmaintained(path)
-        assert unmaintained, f"{path} should have an Unmaintained: " +\
-            "comment that describes why the package is unmaintained"

.ci/testcases/test_deviceinfo.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pytest
-import sys
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-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"]
-    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>)")
-
-
-def test_deviceinfo(args):
-    """
-    Parse all deviceinfo files successfully and run checks on the parsed data.
-    """
-    # Iterate over all devices
-    last_exception = None
-    count = 0
-    for folder in glob.glob(args.aports + "/device/*/device-*"):
-        device = folder[len(args.aports):].split("-", 1)[1]
-
-        f = open(folder[len(args.aports):][1:] + "/deviceinfo")
-        lines = f.read().split("\n")
-        f.close()
-
-        try:
-            # variable can not be empty
-            for line in lines:
-                if '=""' in line:
-                    raise RuntimeError("Please remove the empty variable: " + line)
-
-            # Successful deviceinfo parsing / obsolete options
-            info = pmb.parse.deviceinfo(args, device)
-            deviceinfo_obsolete(info)
-
-            # deviceinfo_name must start with manufacturer
-            name = info["name"]
-            manufacturer = info["manufacturer"]
-            if not name.startswith(manufacturer) and \
-                    not name.startswith("Google"):
-                raise RuntimeError("Please add the manufacturer in front of"
-                                   " the deviceinfo_name, e.g.: '" +
-                                   manufacturer + " " + name + "'")
-
-        # Don't abort on first error
-        except Exception as e:
-            last_exception = e
-            count += 1
-            print(device + ": " + str(e))
-
-    # Raise the last exception
-    if last_exception:
-        print("deviceinfo error count: " + str(count))
-        raise last_exception

.ci/testcases/test_directory_structure.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: GPL-3.0-or-later
-import glob
-import os
-import stat
-
-expected_directories = [
-    "cross",
-    "device/community",
-    "device/main",
-    "device/testing",
-    "device/unmaintained",
-    "main",
-    "modem",
-    "non-free",
-    "sxmo",
-    "temp",
-]
-
-
-# pmbootstrap allows placing APKBUILDs in arbitrarily nested directories.
-# This test makes sure all of them are in one of the expected locations.
-def test_directories():
-    apkbuilds = set(glob.iglob("**/APKBUILD", recursive=True))
-    expected = set(f for d in expected_directories for f in glob.iglob(d + "/*/APKBUILD"))
-    assert apkbuilds == expected, "Found APKBUILD in unexpected directory. " \
-        "Note that we moved firmware/* to device/{main,community,testing}/*."
-
-
-# Ensure no file in pmaports are executable.
-# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
-def test_executable_files():
-    for file in glob.iglob("**/*", recursive=True):
-        if os.path.isdir(file) or os.path.islink(file):
-            continue
-            # still check other less common inode types
-        permissions = os.stat(file).st_mode
-        executable_bits = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
-        if permissions & executable_bits != 0:
-            raise RuntimeError(f"\"{file}\" is executable. Files in pmaports" +
-                               " should not be executables. post-* files" +
-                               " don't need to be executable and executables" +
-                               " should be installed using `install -D" +
-                               "m0755` or a variation thereof.")
-
-
-# Make sure files are either:
-#  - in root directory (README.md)
-#  - hidden (.ci/, device/.shared-patches/)
-#  - or belong to a package (below a directory with APKBUILD)
-def test_files_belong_to_package():
-    # Walk directories and set package_dir when we find an APKBUILD
-    # This allows matching files in subdirectories to the package directory.
-    package_dir = None
-    for dirpath, dirs, files in os.walk("."):
-        # Skip "hidden" directories
-        dirs[:] = [d for d in dirs if not d.startswith(".")]
-        # Ignore files in root directory
-        if dirpath == '.':
-            continue
-
-        # Switched to another directory?
-        if package_dir and not dirpath.startswith(package_dir + os.sep):
-            package_dir = None
-
-        if 'APKBUILD' in files:
-            assert not package_dir, f"Nested packages: {package_dir} and {dirpath} " \
-                "both contain an APKBUILD"
-            package_dir = dirpath
-
-        assert not files or package_dir, "Found files that do not belong to any package: " \
-            f"{dirpath}/{files}"

.ci/testcases/test_firmware.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Johannes Marbach
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-def test_aports_firmware(args):
-    """
-    Various tests performed on the /**/firmware-* aports.
-    """
-
-    excluded = [
-        "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
-        "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-oneplus-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
-        "firmware-shift-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-beryllium",  # Depends on soc-qcom-sdm845-nonfree-firmware
-        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
-        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
-    ]
-
-    for path in glob.iglob(f"{args.aports}/**/firmware-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
-
-        if aport_name not in excluded:
-            if "pmb:cross-native" not in apkbuild["options"]:
-                raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                                   " options= line. The pmb:cross-native option is"
-                                   " preferred because it results in significantly"
-                                   " lower build times. If the package doesn't build"
-                                   " with the option, you can add an exemption in"
-                                   " .gitlab-ci/testcases/test_firmware.py.")
-
-        if "!tracedeps" not in apkbuild["options"]:
-            raise RuntimeError(f"{aport_name}: \"!tracedeps\" missing in"
-                               " options= line. The tracedeps option is superfluous"
-                               " for firmware packages.")

.ci/testcases/test_framework_versions.py

@@ -1,118 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-""" Make sure that components of frameworks (Qt, KDE, ...) have the same
-    version in all packages. We scan all packages, categorize them by URL
-    and then compare the versions of all packages in each category. """
-
-import glob
-import logging
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.config
-import pmb.parse
-
-
-def get_categorized_packages(args):
-    """
-    Parse all aports and categorize them.
-
-    :returns: {"plasma": {"kwin": "5.13.3", ...},
-               "kde": {"kcrash": "5.48.0", ...},
-               "qt": {"qt5-qtbase": "5.12.0", ...},
-               "other": {"konsole": "1234", ...}}
-    """
-    ret = {}
-
-    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
-        # Parse APKBUILD
-        apkbuild = pmb.parse.apkbuild(path)
-        url = apkbuild["url"]
-        pkgname = apkbuild["pkgname"]
-        pkgver = apkbuild["pkgver"]
-        if pkgver == "9999":
-            pkgver = apkbuild["_pkgver"]
-
-        if "_git" in pkgver:
-            continue
-
-        # Categorize by URL
-        category = "other"
-        if "https://www.kde.org/workspaces/plasmadesktop" in url:
-            category = "plasma"
-        elif "https://community.kde.org/Frameworks" in url:
-            category = "kde"
-        elif url in ["http://qt-project.org/",
-                     "https://www.qt.io/developers/"]:
-            category = "qt"
-
-        # Remove hotfix number (i.e. 5.16.90.1 becomes 5.16.90)
-        if category in ["kde", "plasma"]:
-            pkgver = ".".join(pkgver.split(".")[0:3])
-
-        # Save result
-        if category not in ret:
-            ret[category] = {}
-        ret[category][pkgname] = pkgver
-    return ret
-
-
-def check_categories(categories):
-    """
-    Make sure that all packages in one framework (kde, plasma, ...) have the
-    same package version (and that there is at least one package in each
-    category).
-
-    :param categories: see return of get_categorized_packages()
-    :returns: True when the check passed, False otherwise
-    """
-    ret = True
-    for category, packages in categories.items():
-        reference = None
-        for pkgname, pkgver in packages.items():
-
-            # Use the first package as reference and print a summary
-            if not reference:
-                logging.info("---")
-                logging.info("Package category: " + category)
-                logging.info("Packages count: " + str(len(packages)))
-
-                # Category "other": done after printing the basic summary, no
-                # need to print each package or compare the package versions
-                if category == "other":
-                    reference = True
-                    break
-
-                # Print all packages
-                logging.info("Packages: " + ", ".join(sorted(packages.keys())))
-
-                # Print the reference and skip checking it against itself
-                reference = {"pkgname": pkgname, "pkgver": pkgver}
-                logging.info("Reference pkgver: " + pkgver + " (from '" +
-                             pkgname + "')")
-                continue
-
-            # Check version against reference
-            if pkgver != reference["pkgver"]:
-                logging.info("ERROR: " + pkgname + " has version " + pkgver)
-                ret = False
-
-        # Each category must at least have one package
-        if not reference:
-            logging.info("ERROR: could not find any packages in category: " +
-                         category)
-            ret = False
-    return ret
-
-
-def test_framework_versions(args):
-    """
-    Make sure that packages of the same framework have the same version.
-    """
-    categories = get_categorized_packages(args)
-    if not check_categories(categories):
-        raise RuntimeError("Framework version check failed!")

.ci/testcases/test_kernel.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pytest
-import sys
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-def test_aports_kernel(args):
-    """
-    Various tests performed on the /**/linux-* aports.
-    """
-
-    for path in glob.iglob(f"{args.aports}/**/linux-*/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(path)
-        aport_name = os.path.basename(os.path.dirname(path))
-
-        if "pmb:cross-native" not in apkbuild["options"]:
-            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
-                               " options= line")
-
-        # cross-compilers should not be in makedepends
-        for ccc in ["gcc-armv7", "gcc-armhf", "gcc-aarch64",
-                    "gcc4-armv7", "gcc4-armhf", "gcc4-aarch64",
-                    "gcc6-armv7", "gcc6-armhf", "gcc6-aarch64"]:
-            if ccc in apkbuild["makedepends"]:
-                raise RuntimeError(f"{aport_name}: Cross-compiler ({ccc}) should"
-                                   " not be explicitly specified in makedepends!"
-                                   " pmbootstrap installs cross-compiler"
-                                   " automatically.")
-
-        # nftables support in kernels used by main and community devices
-        for dir in ["main", "device/main", "device/community"]:
-            if path.startswith(f"{args.aports}/{dir}"):
-                assert pmb.parse.kconfig.check(args,
-                                               aport_name.replace("linux-", ""),
-                                               force_nftables_check=True)

.ci/testcases/test_ui.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pytest
-import sys
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-
-
-def test_aports_ui(args):
-    """
-    Raise an error if package in _pmb_recommends is not found
-    """
-    for arch in pmb.config.build_device_architectures:
-        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
-            apkbuild = pmb.parse.apkbuild(path)
-            # Skip if arch isn't enabled
-            if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False):
-                continue
-
-            for package in apkbuild["_pmb_recommends"]:
-                depend = pmb.helpers.package.get(args, package,
-                                                 arch, must_exist=False)
-                if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
-                    raise RuntimeError(f"{path}: package '{package}' from"
-                                       f" _pmb_recommends not found for arch '{arch}'")
-
-            # Check packages from "_pmb_recommends" of -extras subpackage if one exists
-            if f"{apkbuild['pkgname']}-extras" in apkbuild["subpackages"]:
-                apkbuild = apkbuild["subpackages"][f"{apkbuild['pkgname']}-extras"]
-                for package in apkbuild["_pmb_recommends"]:
-                    depend = pmb.helpers.package.get(args, package,
-                                                     arch, must_exist=False)
-                    if depend is None or not pmb.helpers.package.check_arch(args, package, arch):
-                        raise RuntimeError(f"{path}: package '{package}' from _pmb_recommends "
-                                           f"of -extras subpackage is not found for arch '{arch}'")

.ci/testcases/test_unreferenced_files.py

@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import pytest
-import sys
-import os
-
-import add_pmbootstrap_to_import_path
-import pmb.parse
-import pmb.parse._apkbuild
-import pmb.parse.apkindex
-import pmb.helpers.repo
-
-
-def parse_source_from_checksums(args, apkbuild_path):
-    """
-    Read the APKBUILD file and parse source files from the checksums at the
-    bottom. This has always the same format, even if $source is built with hard
-    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"]
-    """
-    start = 'sha512sums="'
-    in_block = False
-    ret = []
-
-    with open(apkbuild_path, encoding="utf-8") as handle:
-        for line in handle.readlines():
-            # Find start
-            if not in_block:
-                if line.startswith(start):
-                    in_block = True
-                else:
-                    continue
-
-            # sha512sums may have lines without checksums:
-            # https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/73
-            if "  " not in line:
-                continue
-
-            try:
-                _, 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}")
-
-            # Find end
-            if filename.endswith('"'):
-                ret += [filename[:-1]]
-                break
-
-            ret += [filename]
-    return ret
-
-
-def test_aports_unreferenced_files(args):
-    """
-    Raise an error if an unreferenced file is found
-    """
-    for apkbuild_path in glob.iglob(args.aports + "/**/APKBUILD", recursive=True):
-        apkbuild = pmb.parse.apkbuild(apkbuild_path)
-        sources_chk = parse_source_from_checksums(args, apkbuild_path)
-
-        # Collect install files from subpackages
-        subpackage_installs = []
-        if apkbuild["subpackages"]:
-            for subpackage in apkbuild["subpackages"].values():
-                if not subpackage:
-                    continue
-                try:
-                    subpackage_installs += subpackage["install"]
-                except KeyError:
-                    continue
-
-        # Collect trigger files
-        trigger_sources = []
-        if apkbuild["triggers"]:
-            for trigger in apkbuild["triggers"]:
-                trigger_sources.append(trigger.split("=")[0])
-
-        dirname = os.path.dirname(apkbuild_path)
-        for file in glob.iglob(dirname + "/**", recursive=True):
-            rel_file_path = os.path.relpath(file, dirname)
-            # Skip APKBUILDs and directories
-            if rel_file_path == "APKBUILD" or os.path.isdir(file):
-                continue
-
-            if os.path.basename(rel_file_path) not in sources_chk \
-                    and rel_file_path not in apkbuild["install"] \
-                    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}")

.gitignore

@@ -113,9 +113,3 @@ ENV/
 
 # JetBrains IDEs (PyCharm, etc)
 .idea
-
-# Sources as unpacked and built by abuild
-**/src/
-
-# Allow having untracked packages in aports using a custom-something directory
-/custom-*/

.gitlab-ci.yml

@@ -3,10 +3,10 @@
 # global settings
 image: alpine:latest
 after_script:
-  - .ci/move_logs.sh $CI_PROJECT_DIR
+  - .gitlab-ci/move_logs.sh $CI_PROJECT_DIR
 stages:
-  - lint
-  - build
+  - first
+  - second
 
 # defaults for "only"
 # We need to run the CI jobs in a "merge request specific context", if CI is
@@ -24,53 +24,45 @@ stages:
 
 # device documentation
 wiki:
-  stage: lint
+  stage: first
   <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
   before_script:
     - apk -q add python3
   script:
-    - .ci/check_devices_in_wiki.py --booting
+    - .gitlab-ci/check_devices_in_wiki.py --booting
 
-# testcases linting
-testcases-linting:
-  stage: lint
+# static code analysis (shellcheck is not in Alpine, so we use Debian)
+py-sh-static:
+  stage: first
   <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - .ci/*
-      - .ci/*/*
+  image: python:3.6-slim-stretch
   before_script:
-    - apk -q add py-flake8
+    - apt -q update >/dev/null
+    - apt -y install flake8 shellcheck >/dev/null
   script:
-    - flake8 --ignore E501,F401,E722,W504,W605
+    - .gitlab-ci/static_code_analysis.sh
 
-# shellcheck
-shellcheck:
-  stage: lint
+# coding style check
+clang-format-static:
+  stage: first
   <<: *only-default
-  image: alpine:edge
   before_script:
-    - apk -q add shellcheck
+    - apk -q add clang git
   script:
-    - .ci/shellcheck.sh
+    - .gitlab-ci/static_clang-format.sh
 
 # aports checks (generic)
 aports-static:
-  stage: lint
+  stage: first
   <<: *only-default
   before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh pytest
+    - .gitlab-ci/install_pmbootstrap.sh pytest
   script:
-    - su pmos -c ".ci/run_testcases.sh"
-    - su pmos -c ".ci/check_changed_aports_versions.py"
+    - apk -q add git
+    - su pmos -c "pmbootstrap kconfig check"
+    - su pmos -c ".gitlab-ci/run_testcases.sh
+        -m 'not pmaports_upstream_compat'"
+    - su pmos -c ".gitlab-ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
     paths:
@@ -79,90 +71,40 @@ 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"
-  only:
-    - merge_requests
-  allow_failure: true
-
-# kernel kconfig check
-kernel-kconfig:
-  stage: lint
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
-  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"
-
 # MR settings
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
-  stage: lint
+  stage: first
   only:
     - merge_requests
   before_script:
     - apk -q add python3
   script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
-    - python3 ./check_mr_settings.py
+    - .gitlab-ci/check_mr_settings.py
+
+# aports checks (upstream compatibility)
+aports-static-upstream:
+  stage: second
+  only:
+    - master@postmarketOS/pmaports
+  before_script:
+    - .gitlab-ci/install_pmbootstrap.sh pytest
+  script:
+    - su pmos -c ".gitlab-ci/run_testcases.sh
+        -m 'pmaports_upstream_compat'"
+  artifacts:
+    when: on_failure
+    paths:
+      - log.txt
+      - log_testsuite_pmaports.txt
+      - pmbootstrap.cfg
+    expire_in: 1 week
 
 # build changed aports
-.build:
-  stage: build
+aports-build:
+  stage: second
   <<: *only-default
   before_script:
-    - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-    - sh ./install_pmbootstrap.sh
+    - .gitlab-ci/install_pmbootstrap.sh git
   script:
-    - .ci/build.sh
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-
-build-x86_64:
-  extends: .build
-
-build-x86:
-  extends: .build
-
-build-aarch64:
-  tags:
-    - aarch64
-  extends: .build
-
-build-armv7:
-  tags:
-    - aarch64
-  extends: .build
-
-build-armhf:
-  tags:
-    - aarch64
-  extends: .build
+    - PYTHONUNBUFFERED=1 su pmos -c ".gitlab-ci/build_changed_aports.py"

.gitlab-ci/build_changed_aports.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Same dir
+import common
+
+
+def check_build(packages, verify_only=False):
+    # Initialize build environment with less logging
+    common.run_pmbootstrap(["build_init"])
+
+    if verify_only:
+        common.run_pmbootstrap(["--details-to-stdout", "checksum",
+                                "--verify"] + list(packages))
+    else:
+        common.run_pmbootstrap(["--details-to-stdout", "build", "--strict",
+                                "--force"] + list(packages))
+
+
+if __name__ == "__main__":
+    # Get and print modified packages
+    common.add_upstream_git_remote()
+    packages = common.get_changed_packages()
+
+    # Build changed packages
+    common.get_changed_packages_sanity_check(len(packages))
+    if len(packages) == 0:
+        print("no aports changed in this branch")
+    else:
+        verify_only = common.commit_message_has_string("[ci:skip-build]")
+        if verify_only:
+            print("WARNING: not building changed packages ([ci:skip-build])!")
+            print("verifying checksums: " + ", ".join(packages))
+        else:
+            print("building in strict mode: " + ", ".join(packages))
+        check_build(packages, verify_only)

.gitlab-ci/check_changed_aports_versions.py

@@ -0,0 +1,147 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import tempfile
+import sys
+import subprocess
+
+# Same dir
+import common
+
+# pmbootstrap
+import testcases.add_pmbootstrap_to_import_path  # noqa
+import pmb.parse
+import pmb.parse.version
+import pmb.helpers.logging
+
+
+def get_package_version(args, package, revision, check=True):
+    # Redirect stderr to /dev/null, so git doesn't complain about files not
+    # existing in master for new packages
+    stderr = None
+    if not check:
+        stderr = subprocess.DEVNULL
+
+    # Run something like "git show upstream/master:main/hello-world/APKBUILD"
+    pmaports_dir = common.get_pmaports_dir()
+    pattern = pmaports_dir + "/*/" + package + "/APKBUILD"
+    path = glob.glob(pattern)[0][len(pmaports_dir + "/"):]
+    apkbuild_content = common.run_git(["show", revision + ":" + path], check,
+                                      stderr)
+    if not apkbuild_content:
+        return None
+
+    # Save APKBUILD to a temporary path and parse it from there. (Not the best
+    # way to do things, but good enough for this CI script.)
+    with tempfile.TemporaryDirectory() as tempdir:
+        with open(tempdir + "/APKBUILD", "w", encoding="utf-8") as handle:
+            handle.write(apkbuild_content)
+        parsed = pmb.parse.apkbuild(args, tempdir + "/APKBUILD", False, False)
+
+    return parsed["pkgver"] + "-r" + parsed["pkgrel"]
+
+
+def version_compare_operator(result):
+    """ :param result: return value from pmb.parse.version.compare() """
+    if result == -1:
+        return "<"
+    elif result == 0:
+        return "=="
+    elif result == 1:
+        return ">"
+
+    raise RuntimeError("Unexpected version_compare_operator input: " + result)
+
+
+def exit_with_error_message():
+    print()
+    print("ERROR: Modified package(s) don't have an increased version!")
+    print()
+    print("This can either happen if you did not change the pkgver/pkgrel")
+    print("variables in the APKBUILDs. Or you did change them, but the")
+    print("packages have been updated in the official master branch, and now")
+    print("your versions are not higher anymore.")
+    print()
+    print("Your options:")
+    print("a) If you made changes to the packages, and did not increase the")
+    print("   pkgrel/pkgver: increase them now, and force push your branch.")
+    print("   => https://postmarketos.org/howto-bump-pkgrel-pkgver")
+    print("b) If you had already increased the package versions, rebase on")
+    print("   master, increase the versions again and then force push:")
+    print("   => https://postmarketos.org/rebase")
+    print("c) If you made a change, that does not require rebuilding the")
+    print("   packages, such as only changing the arch=... line: you can")
+    print("   disable this check by adding '[ci:skip-vercheck]' to the")
+    print("   latest commit message, then force push.")
+    print()
+    print("Thank you and sorry for the inconvenience.")
+    exit(1)
+
+
+def check_versions(args, packages):
+    error = False
+
+    # Get relevant commits: compare HEAD against upstream/master or HEAD~1
+    # (the latter if this CI check is running on upstream/master). Note that
+    # for the common.get_changed_files() code, we don't check against
+    # upstream/master, but against the latest common ancestor. This is not
+    # desired here, since we already know what packages changed, and really
+    # want to check if the version was increased towards *current* master.
+    commit = "upstream/master"
+    if common.run_git(["rev-parse", "HEAD"]) == common.run_git(["rev-parse",
+                                                                commit]):
+        print("NOTE: upstream/master is on same commit as HEAD, comparing"
+              " HEAD against HEAD~1.")
+        commit = "HEAD~1"
+
+    for package in packages:
+        # Get versions, skip new packages
+        head = get_package_version(args, package, "HEAD")
+        master = get_package_version(args, package, commit, False)
+        if not master:
+            print("- {}: {} (HEAD) (new package)".format(package, head))
+            continue
+
+        # Compare head and master versions
+        result = pmb.parse.version.compare(head, master)
+        if result != 1:
+            error = True
+
+        # Print result line ("- hello-world: 1-r2 (HEAD) > 1-r1 (HEAD~1)")
+        formatstr = "- {}: {} (HEAD) {} {} ({})"
+        if result != 1:
+            formatstr += " [ERROR]"
+        operator = version_compare_operator(result)
+        print(formatstr.format(package, head, operator, master, commit))
+
+    if error:
+        exit_with_error_message()
+
+
+if __name__ == "__main__":
+    # Get and print modified packages
+    common.add_upstream_git_remote()
+    packages = common.get_changed_packages()
+
+    # Verify modified package count
+    common.get_changed_packages_sanity_check(len(packages))
+    if len(packages) == 0:
+        print("no aports changed in this branch")
+        exit(0)
+
+    # Potentially skip this check
+    if common.commit_message_has_string("[ci:skip-vercheck]"):
+        print("WARNING: not checking for changed package versions"
+              " ([ci:skip-vercheck])!")
+        exit(0)
+
+    # Initialize args (so we can use pmbootstrap's APKBUILD parsing)
+    sys.argv = ["pmbootstrap.py", "chroot"]
+    args = pmb.parse.arguments()
+    pmb.helpers.logging.init(args)
+
+    # Verify package versions
+    print("checking changed package versions...")
+    check_versions(args, packages)

.gitlab-ci/check_devices_in_wiki.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2019 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import argparse
@@ -14,16 +14,8 @@ def get_devices():
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
                 "/..")))
-    for path in glob.glob(pmaports + "/device/*/device-*/"):
+    for path in glob.glob(pmaports + "/device/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
-
-        # -downstream suffix is used when packaging the downstream kernel for
-        # devices that have a working mainline kernel. Those are usually
-        # unmaintained and therefore might not appear in the wiki. However,
-        # the main device should be documented (remove the -downstream suffix).
-        if device.endswith('-downstream'):
-            device = device[:-len('-downstream')]
-
         ret.append(device)
     return sorted(ret)
 
@@ -45,7 +37,7 @@ def get_wiki_devices_html(path):
         content = urllib.request.urlopen(url).read().decode("utf-8")
 
     # Split into booting and not booting
-    split = content.split("<span class=\"mw-headline\" id=\"Non-booting_devices\">")
+    split = content.split("<span class=\"mw-headline\" id=\"Not_booting\">")
 
     if len(split) != 2:
         print("*** Failed to parse wiki page")
@@ -53,13 +45,6 @@ def get_wiki_devices_html(path):
     return {"booting": split[0], "not_booting": split[1]}
 
 
-def get_wiki_renamed_devices_html():
-    """:returns: HTML of the page"""
-    # Download wiki page
-    url = "http://wiki.postmarketos.org/wiki/Renamed_Devices"
-    return urllib.request.urlopen(url).read().decode("utf-8")
-
-
 def check_device(device, html, is_booting):
     """:param is_booting: require the device to be in the booting section, not
                           just anywhere in the page (i.e. in the not booting
@@ -74,9 +59,6 @@ def check_device(device, html, is_booting):
                   " section already)")
             return False
         return True
-    if device in html["renamed"]:
-        print(f"WARNING: {device} was renamed in the wiki")
-        return True
 
     print(device + ": not in the wiki yet.")
     return False
@@ -97,7 +79,6 @@ def main():
 
     # Check all devices
     html = get_wiki_devices_html(args.path)
-    html["renamed"] = get_wiki_renamed_devices_html()
     error = False
     for device in get_devices():
         if not check_device(device, html, args.booting):

.gitlab-ci/check_mr_settings.py

@@ -0,0 +1,156 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import argparse
+import json
+import os
+import sys
+import urllib.parse
+import urllib.request
+
+
+def check_environment_variables():
+    """ Make sure that all environment variables from GitLab CI are present,
+        and exit right here when a variable is missing. """
+    keys = ["CI_MERGE_REQUEST_IID",
+            "CI_MERGE_REQUEST_PROJECT_PATH",
+            "CI_MERGE_REQUEST_SOURCE_PROJECT_URL"]
+    for key in keys:
+        if key in os.environ:
+            continue
+        print("ERROR: missing environment variable: " + key)
+        print("Reference: https://docs.gitlab.com/ee/ci/variables/")
+        exit(1)
+
+
+def get_url_api():
+    """ :returns: single merge request API URL, as documented here:
+        https://docs.gitlab.com/ee/api/merge_requests.html#get-single-mr """
+    project_path = os.environ["CI_MERGE_REQUEST_PROJECT_PATH"]
+    project_path = urllib.parse.quote_plus(project_path)
+    mr_id = os.environ["CI_MERGE_REQUEST_IID"]
+
+    url = "https://gitlab.com/api/v4/projects/{}/merge_requests/{}"
+    return url.format(project_path, mr_id)
+
+
+def get_url_mr_edit():
+    """ :returns: the link where the user can edit their own MR """
+    url = "https://gitlab.com/{}/merge_requests/{}/edit"
+    return url.format(os.environ["CI_MERGE_REQUEST_PROJECT_PATH"],
+                      os.environ["CI_MERGE_REQUEST_IID"])
+
+
+def get_url_repo_settings():
+    """ :returns: link to the user's forked pmaports project's settings """
+    prefix = os.environ["CI_MERGE_REQUEST_SOURCE_PROJECT_URL"]
+    return prefix + "/settings/repository"
+
+
+def get_mr_settings(path):
+    """ Get the merge request API data and parse it as JSON. Print the whole
+        thing on failure.
+
+        :param path: to a local file with the saved API data (will download a
+                     fresh copy when set to None)
+        :returns: dict of settings data (see GitLab API reference) """
+    content = ""
+    if path:
+        # Read file
+        with open(path, encoding="utf-8") as handle:
+            content = handle.read()
+    else:
+        # Download from GitLab API
+        url = get_url_api()
+        print("Download " + url)
+        content = urllib.request.urlopen(url).read().decode("utf-8")
+
+    # Parse JSON
+    try:
+        return json.loads(content)
+    except:
+        print("ERROR: failed to decode JSON. Here's the whole content for"
+              " debugging:")
+        print("---")
+        print(content)
+        exit(1)
+
+
+def settings_read(settings, key):
+    if key not in settings:
+        print("ERROR: missing '" + key + "' key in settings!")
+        print("Here are the whole settings for debugging:")
+        print("---")
+        print(settings)
+        exit(1)
+    return settings[key]
+
+
+def check_allow_push(settings):
+    """ :returns: True when maintainers are allowed to push to the branch
+                  (what we want!), False otherwise """
+
+    # Check if source branch is in same repository
+    source = settings_read(settings, "source_project_id")
+    target = settings_read(settings, "target_project_id")
+    if source == target:
+        return True
+
+    return settings_read(settings, "allow_maintainer_to_push")
+
+
+def main():
+    # Parse arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--path", help="use a local file instead of querying"
+                        " the GitLab API", default=None)
+    args = parser.parse_args()
+
+    # Check the merge request
+    check_environment_variables()
+    settings = get_mr_settings(args.path)
+
+    # Make sure that squashing is disabled
+    if settings_read(settings, "squash"):
+        print("*** MR settings check failed!")
+        print('ERROR: Please turn off the "Squash commits when merge request'
+              ' is accepted." option in the merge request settings.')
+        return 1
+    if check_allow_push(settings):
+        print("*** MR settings check successful!")
+    else:
+        print("*** MR settings check failed!")
+        print()
+        print("We need to be able to push changes to your merge request.")
+        print("So we can rebase it on master right before merging, add the")
+        print("MR-ID to the commit messages, etc.")
+        print()
+        print("How to fix it:")
+        print("1) Open the 'edit' page of your merge request:")
+        print("   " + get_url_mr_edit())
+        print("2) Enable this option and save:")
+        print("   'Allow commits from members who can merge to the target"
+              " branch'")
+        print("3) Run these tests again with an empty commit in your MR:")
+        print("   $ git commit --allow-empty -m 'run mr-settings test again'")
+        print()
+        print("If that setting is disabled, then you have created the MR from")
+        print("a protected branch. When you had forked the repository from")
+        print("postmarketOS, the protected branch settings were copied to")
+        print("your fork.")
+        print()
+        print("Resolve this with:")
+        print("1) Open your repository settings:")
+        print("   " + get_url_repo_settings())
+        print("2) Scroll down to 'Protected Branches' and expand it")
+        print("3) Click 'unprotect' next to the branch from your MR")
+        print("4) Follow steps 1-3 from the first list again, the option")
+        print("   should not be disabled anymore.")
+        print()
+        print("Thank you and sorry for the inconvenience.")
+        return 1
+    return 0
+
+
+sys.exit(main())

.gitlab-ci/common.py

@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Various functions used in CI scripts
+
+import os
+import subprocess
+import sys
+
+
+def get_pmaports_dir():
+    return os.path.realpath(os.path.join(os.path.dirname(__file__) + "/.."))
+
+
+def run_git(parameters, check=True, stderr=None):
+    """ Run git in the pmaports dir and return the output """
+    cmd = ["git", "-C", get_pmaports_dir()] + parameters
+    try:
+        return subprocess.check_output(cmd, stderr=stderr).decode()
+    except subprocess.CalledProcessError:
+        if check:
+            raise
+        return None
+
+
+def add_upstream_git_remote():
+    """ Add a remote pointing to postmarketOS/pmaports. """
+    run_git(["remote", "add", "upstream",
+             "https://gitlab.com/postmarketOS/pmaports.git"], False)
+    run_git(["fetch", "-q", "upstream"])
+
+
+def commit_message_has_string(needle):
+    return needle in run_git(["show", "-s", "--format=full", "HEAD"])
+
+
+def run_pmbootstrap(parameters):
+    """ Run pmbootstrap with the pmaports dir as --aports """
+    cmd = ["pmbootstrap", "--aports", get_pmaports_dir()] + parameters
+    process = subprocess.Popen(cmd)
+    process.communicate()
+    if process.returncode != 0:
+        print("** Test failed")
+        exit(1)
+
+
+def get_changed_files():
+    """ Get all changed files and print them, as well as the branch and the
+        commit that was used for the diff.
+        :returns: list of changed files
+    """
+    commit_head = run_git(["rev-parse", "HEAD"])[:-1]
+    commit_upstream_master = run_git(["rev-parse", "upstream/master"])[:-1]
+    print("commit HEAD: " + commit_head)
+    print("commit upstream/master: " + commit_upstream_master)
+
+    # Check if we are latest upstream/master
+    if commit_head == commit_upstream_master:
+        # then compare with previous commit
+        commit = "HEAD~1"
+    else:
+        # otherwise compare with latest common ancestor
+        commit = run_git(["merge-base", "upstream/master", "HEAD"])[:-1]
+    print("comparing HEAD with: " + commit)
+
+    # Changed files
+    ret = run_git(["diff", "--name-only", commit, "HEAD"]).splitlines()
+    print("changed file(s):")
+    for file in ret:
+        message = "  " + file
+        if not os.path.exists(file):
+            message += " (deleted)"
+        print(message)
+    return ret
+
+
+def get_changed_packages_sanity_check(count):
+    for mark in ["[ci:ignore-count]", "[ci:skip-build]"]:
+        if commit_message_has_string(mark):
+            print("NOTE: package count sanity check skipped (" + mark + ").")
+            return
+    if count <= 10:
+        return
+
+    print()
+    print("ERROR: Too many packages have changed!")
+    print()
+    print("This is a sanity check, so we don't end up building packages that")
+    print("have not been modified. CI won't run for more than one hour")
+    print("anyway.")
+    print()
+    print("Your options:")
+    print("a) If you *did not* modify everything listed above, then rebase")
+    print("   your branch on the official postmarketOS/pmaports.git master")
+    print("   branch. Feel free to ask in the chat for help if you need any.")
+    print("b) If you *did* modify all these packages, and you assume that")
+    print("   they will build within one hour: skip this sanity check by")
+    print("   adding '[ci:ignore-count]' to the commit message (then force")
+    print("   push).")
+    print("c) If you *did* modify all these packages, and you are sure that")
+    print("   they won't build in time, please add '[ci:skip-build]' to the")
+    print("   commit message (then force push). Make sure that all packages")
+    print("   build with 'pmbootstrap build --strict'!")
+    print()
+    print("Thank you and sorry for the inconvenience.")
+
+    sys.exit(1)
+
+
+def get_changed_packages():
+    files = get_changed_files()
+    ret = set()
+    for file in files:
+        # Skip files:
+        # * in the root dir of pmaports (e.g. README.md)
+        # * path beginning with a dot (e.g. .gitlab-ci/)
+        # * non-existing files (deleted packages)
+        if "/" not in file or file.startswith(".") or not os.path.exists(file):
+            continue
+
+        # Add to the ret set (removes duplicated automatically)
+        ret.add(file.split("/")[1])
+    return ret
+
+
+def check_build(packages, verify_only=False):
+    # Initialize build environment with less logging
+    run_pmbootstrap(["build_init"])
+
+    if verify_only:
+        run_pmbootstrap(["--details-to-stdout", "checksum", "--verify"] +
+                        list(packages))
+    else:
+        run_pmbootstrap(["--details-to-stdout", "build", "--strict",
+                         "--force"] + list(packages))

.gitlab-ci/install_pmbootstrap.sh

@@ -0,0 +1,49 @@
+#!/bin/sh -e
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+# usage: install_pmbootstrap.sh [ADDITIONAL_PACKAGE, ...]
+
+# Config: pmbootstrap tag (or branch)
+tag="master"
+
+# Get download URL and pmaports path
+url="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/$tag/pmbootstrap-$tag.tar.bz2"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+
+# Set up depends and binfmt_misc
+depends="coreutils openssl python3 sudo $@"
+echo "Installing dependencies: $depends"
+apk -q add $depends
+mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+
+# Create pmos user
+echo "Creating pmos user"
+adduser -D pmos
+chown -R pmos:pmos .
+echo 'pmos ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+
+# Download pmbootstrap (to /tmp/pmbootstrap)
+echo "Downloading pmbootstrap ($tag): $url"
+cd /tmp
+wget -q -O "pmb.tar.bz2" "$url"
+tar -xf "pmb.tar.bz2"
+mv pmbootstrap-* pmbootstrap
+
+# Install to $PATH and init
+ln -s /tmp/pmbootstrap/pmbootstrap.py /usr/local/bin/pmbootstrap
+echo "Initializing pmbootstrap"
+if ! su pmos -c "yes '' | pmbootstrap -q --aports '$pmaports' init"; then
+	echo "ERROR: pmbootstrap init failed!"
+	echo
+	echo "Most likely, this means that pmbootstrap requires a newer"
+	echo "pmaports version. Please rebase on the official pmaports.git"
+	echo "master branch and try again."
+	echo
+	echo "Let us know in the chat or issues if you have trouble with that"
+	echo "and we will be happy to help. Sorry for the inconvenience."
+	echo
+	echo "(If that does not help, click on 'Browse' in the 'Job artifacts'"
+	echo "next to this log output, and have a look at log.txt.)"
+	exit 1
+fi
+echo ""

.gitlab-ci/move_logs.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2019 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ -z "$1" ]; then

.gitlab-ci/run_testcases.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# Copyright 2021 Oliver Smith
+# Copyright 2019 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # Require pmbootstrap
@@ -22,8 +22,8 @@ pmbootstrap -q shutdown
 
 # Make sure we have a valid device (pmbootstrap#1128)
 device="$(pmbootstrap config device)"
-deviceinfo="$pmaports/device/*/device-$device/deviceinfo"
-if ! [ -e $deviceinfo ]; then
+deviceinfo="$pmaports/device/device-$device/deviceinfo"
+if ! [ -e "$deviceinfo" ]; then
 	echo "ERROR: Could not find deviceinfo file for selected device '$device'."
 	echo "Expected path: $deviceinfo"
 	echo "Maybe you have switched to a branch where your device does not exist?"
@@ -32,4 +32,4 @@ if ! [ -e $deviceinfo ]; then
 fi
 
 # Run testcases
-pytest -vv -x --tb=native "$pmaports/.ci/testcases" "$@"
+pytest -vv -x --tb=native "$pmaports/.gitlab-ci/testcases" "$@"

.gitlab-ci/static_clang-format.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+clang-format -i $(find . -name "*.c")
+
+git diff > differences.patch
+
+if [ -s differences.patch ]; then
+    echo "C-Code formatting check failed!"
+    echo "Please make sure, the code is formatted properly!"
+    echo "Run:"
+    echo '    clang-format -i $(find . -name "*.c")'
+    echo
+    cat differences.patch
+    echo
+    rm differences.patch
+    exit 1
+else
+    echo "C-Code formatting check is sucessful!"
+    exit 0
+fi

.gitlab-ci/static_code_analysis.sh

@@ -0,0 +1,58 @@
+#!/bin/sh -e
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -e
+DIR="$(cd "$(dirname "$0")" && pwd -P)"
+cd "$DIR/.."
+
+# Find CHANGEMEs in APKBUILDs
+if grep -qr '(CHANGEME!)' device; then
+	echo "ERROR: Please replace '(CHANGEME!)' in the following files:"
+	grep --color=always -r '(CHANGEME!)' device
+	exit 1
+fi
+
+# Shell: shellcheck
+sh_files="
+	./main/postmarketos-base/firmwareload.sh
+	./main/postmarketos-mkinitfs/init.sh.in
+	./main/postmarketos-mkinitfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
+	./main/postmarketos-android-recovery-installer/build_zip.sh
+	./main/postmarketos-android-recovery-installer/pmos_chroot
+	./main/postmarketos-android-recovery-installer/pmos_install
+	./main/postmarketos-android-recovery-installer/pmos_install_functions
+	./main/postmarketos-android-recovery-installer/pmos_setpw
+	./main/postmarketos-android-recovery-installer/update-binary
+	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
+	./main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-install
+	$(find . -path './main/postmarketos-ui-hildon/*.sh')
+	$(find . -name '*.trigger')
+	$(find . -path './main/devicepkg-dev/*.sh')
+
+	$(find . -path '.gitlab-ci/*.sh')
+"
+for file in ${sh_files}; do
+	echo "Test with shellcheck: $file"
+	cd "$DIR/../$(dirname "$file")"
+	shellcheck -e SC1008 -x "$(basename "$file")"
+done
+
+# Python: flake8
+# E501: max line length
+# F401: imported, but not used (false positive: add_pmbootstrap_to_import_path)
+# E722: do not use bare except
+cd "$DIR/.."
+
+echo "Test with flake8: testcases"
+# shellcheck disable=SC2086
+flake8 --ignore E501,F401,E722,W504,W605 $(find . -path "./.gitlab-ci/testcases/*.py")
+
+echo "Test with flake8: all other Python files"
+# shellcheck disable=SC2086
+flake8 --ignore E501,E722,W504,W605 $(find . -not -path './.gitlab-ci/testcases/*' -a -name '*.py')
+
+# Done
+echo "Success!"

.gitlab-ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -1,12 +1,10 @@
 #!/usr/bin/env python3
-# Copyright 2021 Oliver Smith
+# Copyright 2019 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import shutil
 import sys
 import os
-import importlib
-import importlib.util
 from distutils.sysconfig import get_python_lib
 
 
@@ -35,7 +33,5 @@ def path_pmbootstrap():
     sys.exit(1)
 
 
-# Check if pmb module can be imported
-if importlib.util.find_spec("pmb") is None:
-    # Add pmbootstrap dir to import path
-    sys.path.append(os.path.realpath(path_pmbootstrap()))
+# Add pmbootstrap dir to import path
+sys.path.append(os.path.realpath(path_pmbootstrap()))

.gitlab-ci/testcases/test_aports.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import glob
+import pytest
+import sys
+import os
+
+import add_pmbootstrap_to_import_path
+import pmb.parse
+import pmb.parse._apkbuild
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    sys.argv = ["pmbootstrap",
+                "--aports", os.path.dirname(__file__) + "/../..",
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+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"]
+    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>)")
+
+
+def test_deviceinfo(args):
+    """
+    Parse all deviceinfo files successfully and run checks on the parsed data.
+    """
+    # Iterate over all devices
+    last_exception = None
+    count = 0
+    for folder in glob.glob(args.aports + "/device/device-*"):
+        device = folder[len(args.aports):].split("-", 1)[1]
+
+        try:
+            # Successful deviceinfo parsing / obsolete options
+            info = pmb.parse.deviceinfo(args, device)
+            deviceinfo_obsolete(info)
+
+            # deviceinfo_name must start with manufacturer
+            name = info["name"]
+            manufacturer = info["manufacturer"]
+            if not name.startswith(manufacturer) and \
+                    not name.startswith("Google"):
+                raise RuntimeError("Please add the manufacturer in front of"
+                                   " the deviceinfo_name, e.g.: '" +
+                                   manufacturer + " " + name + "'")
+
+        # Don't abort on first error
+        except Exception as e:
+            last_exception = e
+            count += 1
+            print(device + ": " + str(e))
+
+    # Raise the last exception
+    if last_exception:
+        print("deviceinfo error count: " + str(count))
+        raise last_exception
+
+
+def test_aports_device(args):
+    """
+    Various tests performed on the /device/device-* aports.
+    """
+    for path in glob.glob(args.aports + "/device/device-*/APKBUILD"):
+        apkbuild = pmb.parse.apkbuild(args, path)
+
+        # Depends: Require "postmarketos-base"
+        if "postmarketos-base" not in apkbuild["depends"]:
+            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
+                               path)
+
+        # Depends: Must not have firmware packages
+        for depend in apkbuild["depends"]:
+            if (depend.startswith("firmware-") or
+                    depend.startswith("linux-firmware")):
+                raise RuntimeError("Firmware package '" + depend + "' found in"
+                                   " depends of " + path + ". These go into"
+                                   " subpackages now, see"
+                                   " <https://postmarketos.org/devicepkg>.")
+
+        # Architecture
+        device = apkbuild["pkgname"][len("device-"):]
+        deviceinfo = pmb.parse.deviceinfo(args, device)
+        if "".join(apkbuild["arch"]) != deviceinfo["arch"]:
+            raise RuntimeError("wrong architecture, please change to arch=\"" +
+                               deviceinfo["arch"] + "\": " + path)
+        if "!archcheck" not in apkbuild["options"]:
+            raise RuntimeError("!archcheck missing in options= line: " + path)
+
+
+def test_aports_device_kernel(args):
+    """
+    Verify the kernels specified in the device packages:
+    * Kernel must not be in depends when kernels are in subpackages
+    * Check if only one kernel is defined in depends
+    * Validate kernel subpackage names
+    """
+    # Generate list of valid subpackages
+    valid_subpackages = ["downstream", "rpi", "rpi2", "longts", "shortts"]
+    for path in glob.glob(args.aports + "/main/linux-postmarketos-*"):
+        suffix = os.path.basename(path)[len("linux-postmarketos-"):]
+        valid_subpackages.append(suffix)
+
+    # Iterate over device aports
+    for path in glob.glob(args.aports + "/device/device-*/APKBUILD"):
+        # Parse apkbuild and kernels from subpackages
+        apkbuild = pmb.parse.apkbuild(args, path)
+        device = apkbuild["pkgname"][len("device-"):]
+        kernels_subpackages = pmb.parse._apkbuild.kernels(args, device)
+
+        # Parse kernels from depends
+        kernels_depends = []
+        for depend in apkbuild["depends"]:
+            if not depend.startswith("linux-"):
+                continue
+            kernels_depends.append(depend)
+
+            # Kernel in subpackages *and* depends
+            if kernels_subpackages:
+                raise RuntimeError("Kernel package '" + depend + "' needs to"
+                                   " be removed when using kernel" +
+                                   " subpackages: " + path)
+
+        # No kernel
+        if not kernels_depends and not kernels_subpackages:
+            raise RuntimeError("Device doesn't have a kernel in depends or"
+                               " subpackages: " + path)
+
+        # Multiple kernels in depends
+        if len(kernels_depends) > 1:
+            raise RuntimeError("Please use kernel subpackages instead of"
+                               " multiple kernels in depends (see"
+                               " <https://postmarketos.org/devicepkg>): " +
+                               path)
+
+        # Verify subpackages
+        if kernels_subpackages:
+            for subpackage in kernels_subpackages:
+                if subpackage not in valid_subpackages:
+                    raise RuntimeError("Invalid kernel subpackage name '" +
+                                       subpackage + "', valid: " +
+                                       str(valid_subpackages))

.gitlab-ci/testcases/test_aports_framework_versions.py

@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+""" Make sure that components of frameworks (Qt, KDE, ...) have the same
+    version in all packages. We scan all packages, categorize them by URL
+    and then compare the versions of all packages in each category. """
+
+import glob
+import logging
+import os
+import pytest
+import sys
+
+import add_pmbootstrap_to_import_path
+import pmb.config
+import pmb.parse
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    sys.argv = ["pmbootstrap",
+                "--aports", os.path.dirname(__file__) + "/../..",
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+def get_categorized_packages(args):
+    """
+    Parse all aports and categorize them.
+
+    :returns: {"plasma": {"kwin": "5.13.3", ...},
+               "kde": {"kcrash": "5.48.0", ...},
+               "qt": {"qt5-qtbase": "5.12.0", ...},
+               "other": {"konsole": "1234", ...}}
+    """
+    ret = {}
+
+    for path in glob.glob(args.aports + "/*/*/APKBUILD"):
+        # Parse APKBUILD
+        apkbuild = pmb.parse.apkbuild(args, path)
+        url = apkbuild["url"]
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+        if pkgver == "9999":
+            pkgver = apkbuild["_pkgver"]
+
+        # Categorize by URL
+        category = "other"
+        if "https://www.kde.org/workspaces/plasmadesktop" in url:
+            category = "plasma"
+        elif "https://community.kde.org/Frameworks" in url:
+            category = "kde"
+        elif url in ["http://qt-project.org/",
+                     "https://www.qt.io/developers/"]:
+            category = "qt"
+
+        # Save result
+        if category not in ret:
+            ret[category] = {}
+        ret[category][pkgname] = pkgver
+    return ret
+
+
+def check_categories(categories):
+    """
+    Make sure that all packages in one framework (kde, plasma, ...) have the
+    same package version (and that there is at least one package in each
+    category).
+
+    :param categories: see return of get_categorized_packages()
+    :returns: True when the check passed, False otherwise
+    """
+    ret = True
+    for category, packages in categories.items():
+        reference = None
+        for pkgname, pkgver in packages.items():
+
+            # Use the first package as reference and print a summary
+            if not reference:
+                logging.info("---")
+                logging.info("Package category: " + category)
+                logging.info("Packages count: " + str(len(packages)))
+
+                # Category "other": done after printing the basic summary, no
+                # need to print each package or compare the package versions
+                if category == "other":
+                    reference = True
+                    break
+
+                # Print all packages
+                logging.info("Packages: " + ", ".join(sorted(packages.keys())))
+
+                # Print the reference and skip checking it against itself
+                reference = {"pkgname": pkgname, "pkgver": pkgver}
+                logging.info("Reference pkgver: " + pkgver + " (from '" +
+                             pkgname + "')")
+                continue
+
+            # Check version against reference
+            if pkgver != reference["pkgver"]:
+                logging.info("ERROR: " + pkgname + " has version " + pkgver)
+                ret = False
+
+        # Each category must at least have one package
+        if not reference:
+            logging.info("ERROR: could not find any packages in category: " +
+                         category)
+            ret = False
+    return ret
+
+
+def test_framework_versions(args):
+    """
+    Make sure that packages of the same framework have the same version.
+    """
+    categories = get_categorized_packages(args)
+    if not check_categories(categories):
+        raise RuntimeError("Framework version check failed!")

.gitlab-ci/testcases/test_soname_bump.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""
+This file uses pmb.helper.pkgrel_bump to check if the aports need a pkgrel bump
+for any package, caused by a soname bump. Example: A new libressl/openssl
+version was released, which increased the soname version, and now all packages
+that link against it, need to be rebuilt.
+"""
+
+import os
+import pytest
+import sys
+
+import add_pmbootstrap_to_import_path
+import pmb.helpers.pkgrel_bump
+import pmb.helpers.logging
+import pmb.parse
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    sys.argv = ["pmbootstrap",
+                "--aports", os.path.dirname(__file__) + "/../..",
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_soname_bump(args):
+    if pmb.helpers.pkgrel_bump.auto(args, True):
+        raise RuntimeError("One or more packages need to be rebuilt, because"
+                           " a library they link against had an incompatible"
+                           " upgrade (soname bump). Run 'pmbootstrap"
+                           " pkgrel_bump --auto' to automatically increase the"
+                           " pkgrel in order to trigger a rebuild. If this"
+                           " test case failed during a pull request, the issue"
+                           " needs to be fixed on the 'master' branch first,"
+                           " then rebase your PR on 'master' afterwards.")

.gitlab-ci/testcases/test_upstream_compatibility.py

@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import os
+import sys
+import glob
+import pytest
+
+import add_pmbootstrap_to_import_path
+import pmb.helpers.logging
+import pmb.parse.apkindex
+import pmb.parse
+
+
+@pytest.fixture
+def args(request):
+    # Initialize args
+    sys.argv = ["pmbootstrap",
+                "--aports", os.path.dirname(__file__) + "/../..",
+                "--log", "$WORK/log_testsuite_pmaports.txt"
+                "chroot"]
+    args = pmb.parse.arguments()
+
+    # Initialize logging
+    pmb.helpers.logging.init(args)
+    request.addfinalizer(args.logfd.close)
+    return args
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_qt_versions(args):
+    """
+    Verify, that all postmarketOS qt5- package versions match with Alpine's
+    qt5-qtbase version.
+    """
+    # Upstream version
+    index = pmb.helpers.repo.alpine_apkindex_path(args, "community", "x86_64")
+    index_data = pmb.parse.apkindex.package(args, "qt5-qtbase",
+                                            indexes=[index])
+    pkgver_upstream = index_data["version"].split("-r")[0]
+
+    # Iterate over our packages
+    failed = []
+    for path in glob.glob(args.aports + "/*/qt5-*/APKBUILD"):
+        # Read the pkgver
+        apkbuild = pmb.parse.apkbuild(args, path)
+        pkgname = apkbuild["pkgname"]
+        pkgver = apkbuild["pkgver"]
+
+        # When we temporarily override packages from Alpine, we set the pkgver
+        # to 9999 and _pkgver contains the real version (see #994).
+        if pkgver == "9999":
+            pkgver = apkbuild["_pkgver"]
+
+        # We had to add a few qt5 git packages for unity8 (!27), obviously we
+        # can't compare the version there.
+        if "_git" in pkgver:
+            continue
+
+        # Compare
+        if pkgver == pkgver_upstream:
+            continue
+        failed.append(pkgname + ": " + pkgver + " != " +
+                      pkgver_upstream)
+
+    assert [] == failed
+
+
+@pytest.mark.pmaports_upstream_compat
+def test_aportgen_versions(args):
+    """
+    Verify that the packages generated by 'pmbootstrap aportgen' have
+    the same version (pkgver *and* pkgrel!) as the upstream packages
+    they are based on.
+    """
+    # Get Alpine's "main" repository APKINDEX path
+    index = pmb.helpers.repo.alpine_apkindex_path(args, "main", "x86_64")
+
+    # Alpine packages and patterns for our derivatives
+    # binutils: frozen at 2.31 for now, until #295 is resolved!
+    map = {"busybox": "busybox-static-*",
+           "gcc": "gcc-*",
+           "grub": "grub-efi-*",
+           "musl": "musl-*"}
+
+    # Iterate over Alpine packages
+    failed = []
+    generated = "# Automatically generated aport, do not edit!"
+    for pkgname, pattern in map.items():
+        # Upstream version
+        index_data = pmb.parse.apkindex.package(args, pkgname,
+                                                indexes=[index])
+        version_upstream = index_data["version"]
+
+        # Iterate over our packages
+        for path in glob.glob(args.aports + "/*/" + pattern + "/APKBUILD"):
+            # Skip non-aportgen APKBUILDs
+            with open(path) as handle:
+                if generated not in handle.read():
+                    continue
+
+            # Compare the version
+            print("Checking " + path)
+            apkbuild = pmb.parse.apkbuild(args, path)
+            version = apkbuild["pkgver"] + "-r" + apkbuild["pkgrel"]
+            if version != version_upstream:
+                failed.append(apkbuild["pkgname"] + ": " + version +
+                              " != " + version_upstream +
+                              " (from " + pkgname + ")")
+                continue
+
+    assert [] == failed

.mrhlpr.json

@@ -1,19 +0,0 @@
-{
-    "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+\\)|)$",
-            "^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+\\)|)$"
-        ],
-        "unknown": [
-            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
-        ]
-    }
-}
-

.sr.ht/install_pmbootstrap.sh

@@ -0,0 +1,31 @@
+#!/bin/sh -e
+# Copyright 2019 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Config: pmbootstrap tag (or branch)
+
+if [ "$1" != "" ]; then
+	tag="$1"
+else
+	tag="master"
+fi
+
+# Get download URL and pmaports path
+url="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/$tag/pmbootstrap-$tag.tar.bz2"
+pmaports="$(cd $(dirname $0)/..; pwd -P)"
+
+# Set up binfmt_misc
+echo "Setting-up binfmt_misc"
+sudo mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+
+# Download pmbootstrap (to /tmp/pmbootstrap)
+echo "Downloading pmbootstrap ($tag): $url"
+cd /tmp
+wget -q -O "pmb.tar.bz2" "$url"
+tar -xf "pmb.tar.bz2"
+mv pmbootstrap-* pmbootstrap
+
+# Install to $PATH and init
+sudo ln -s /tmp/pmbootstrap/pmbootstrap.py /usr/bin/pmbootstrap
+echo "Initializing pmbootstrap with aports at '$pmaports'"
+yes '' | pmbootstrap -q --aports "$pmaports" init

.sr.ht/submit.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+import os
+import argparse
+import json
+
+import requests
+
+commit_default = os.environ['COMMIT'] if 'COMMIT' in os.environ else None
+
+parser = argparse.ArgumentParser(description='tool to send data to build.postmarketos.org')
+parser.add_argument('--token', default='~/.pmos_token', help='secret token to authenticate to build.postmarketos.org')
+parser.add_argument('--host', default='https://build.postmarketos.org', help='base url for the submit request')
+parser.add_argument('--commit', default=commit_default, help='value for the X-Commit header')
+parser.add_argument('--arch', default='x86_64', help='value for the X-Arch header')
+parser.add_argument('--id', help='id of the job in the queue, value for the X-Id header')
+parser.add_argument('--json', action='store_true', help='datafile is a json file, do extra sanity checks')
+parser.add_argument('--verbose', '-v', action='store_true', help='show more debug info')
+parser.add_argument('endpoint', help='endpoint name on the API')
+parser.add_argument('datafile', help='file containing the data to be submitted', nargs='+')
+args = parser.parse_args()
+
+if args.commit is None:
+    print('You need to either add COMMIT to the environment or specify --commit')
+    exit(1)
+
+if args.verbose:
+    print('Environment:')
+    print(os.environ)
+
+with open(os.path.expanduser(args.token), encoding="utf-8") as handle:
+    secret = handle.read().strip()
+
+url = '{}/api/{}'.format(args.host, args.endpoint)
+
+if args.json:
+    if len(args.datafile) > 1:
+        print("json mode doesn't support multiple input files")
+        exit(1)
+
+    # Send contents of file as HTTP POST with json payload
+    with open(args.datafile[0], encoding="utf-8") as handle:
+        data = handle.read()
+    data = json.loads(data)
+
+    print('Sending json data to {}'.format(url))
+    response = requests.post(url, json=data, headers={
+        'X-Secret': secret,
+        'X-Commit': args.commit,
+        'X-Arch': args.arch
+    })
+else:
+    files = []
+
+    for file in args.datafile:
+        filename = os.path.basename(file)
+        # Send contents of file as HTTP POST with multipart/formdata payload
+        files.append(('file[]', (filename, open(file, 'rb'), 'application/octet-stream')))
+
+        print('Uploading {} to {}'.format(filename, url))
+
+    response = requests.post(url, files=files, headers={
+        'X-Secret': secret,
+        'X-Commit': args.commit,
+        'X-Arch': args.arch,
+        'X-Id': args.id
+    })
+
+if response.status_code > 399:
+    print('Error occurred:')
+    print(response.content.decode())
+    exit(1)
+
+else:
+    print(response.content.decode())

CODEOWNERS

@@ -1,10 +0,0 @@
-# https://docs.gitlab.com/ee/user/project/code_owners.html
-
-device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
-device/*/*-purism-librem5/          @craftyguy @bshah
-main/osk-sdl/                       @craftyguy
-main/mesa-pvr-dri-classic/          @xc-racer99
-main/postmarketos-ui-plasma-mobile/ @bshah
-temp/u-boot-librem5/                @craftyguy @bshah
-
-# vim: ts=4 sw=4 et

README.md

@@ -3,6 +3,5 @@
 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
 * [APKBUILD reference](https://wiki.alpinelinux.org/wiki/APKBUILD_Reference)
-* [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)
+* [Alpine Linux aports](https://git.alpinelinux.org/cgit/aports)
+* [Alpine Linux package search](https://pkgs.alpinelinux.org/packages)

channels.cfg

@@ -1,33 +0,0 @@
-# Reference: https://postmarketos.org/channels.cfg
-[channels.cfg]
-recommended=edge
-
-[edge]
-description=Rolling release / Most devices / Occasional breakage: https://postmarketos.org/edge
-branch_pmaports=master
-branch_aports=master
-mirrordir_alpine=edge
-
-[v21.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v21.12
-branch_aports=3.15-stable
-mirrordir_alpine=v3.15
-
-[v21.06]
-description=Old release (unsupported)
-branch_pmaports=v21.06
-branch_aports=3.14-stable
-mirrordir_alpine=v3.14
-
-[v21.03]
-description=Old release (unsupported)
-branch_pmaports=v21.03
-branch_aports=3.13-stable
-mirrordir_alpine=v3.13
-
-[v20.05]
-description=Old release (unsupported)
-branch_pmaports=v20.05
-branch_aports=3.12-stable
-mirrordir_alpine=v3.12

cross/arch-bin-masquerade/APKBUILD

@@ -12,7 +12,7 @@ pkgdesc="Wrappers for ccache + distcc (native and foreign chroots)"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
-options="!check !tracedeps pmb:cross-native"
+options="!check !tracedeps"
 
 package() {
 	# Architectures and binaries

cross/binutils-aarch64/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
----
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
---- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
--	  /* Don't transfer these tags from dynamic objects.  */
--	  if ((ibfd->flags & DYNAMIC) != 0)
--	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
--
--      /* If the input bfd has no contents, it shouldn't set the
--	 private data of the output bfd.  */
--      else if (!file->flags.just_syms
--	       && ((input_bfd->flags & DYNAMIC) != 0
--		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
--- 
-2.33.0
-

cross/binutils-aarch64/APKBUILD

@@ -2,28 +2,28 @@
 # Generator: pmbootstrap aportgen binutils-aarch64
 # Based on: main/binutils
 
-pkgname=binutils-aarch64
-pkgver=2.38
-pkgrel=1
+
+pkgname="binutils-aarch64"
+pkgver=2.31.1
+pkgrel=2
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="armhf armv7 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+subpackages=""
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
+	x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+	x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+	x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -31,18 +31,12 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
 #   2.28-r1:
-#     - CVE-2017-7614
+#   - CVE-2017-7614
 
 build() {
 	_target="$(arch_to_hostspec aarch64)"
+	cd "$builddir"
 	"$builddir"/configure \
 		--build="$CBUILD" \
 		--target=$_target \
@@ -60,23 +54,18 @@ build() {
 }
 
 package() {
+	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 
 	# remove man, info folders
 	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
 
 
-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
+d95fd77e1c2c4670a2a11979d6811b358ba0f067b917b33d241eca20cfe66553f6a6fccc5ec26d8d29045e487cb74389fbf86426f80cf81df95608835a566cfc  x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+ce5d3c935057d624c1ce75722e7b5e4583812d46797edce8c381a94b2643f44f7bd0165e7e9b8e358955f4d979074ee487598efbf24389a4013681f99ff7c595  x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+1878bed194529afb2430af21ba9712d6819c5fdfdc5c8db652175bf86d0a0c710ac2bd3ec728bf874887301bd187d91bf60a374c47850c7bd2eafbf6653d74d8  x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch"

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/binutils-ppc-fix-machine-options.patch

@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
--	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else

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-aarch64/x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch

@@ -0,0 +1,567 @@
+From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 20 Jul 2018 09:18:47 -0700
+Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed
+
+When -z separate-code, which is enabled by default for Linux/x86, is
+used to create executable, ld won't place any data in the code-only
+PT_LOAD segment.  If there are no data sections placed before the
+code-only PT_LOAD segment, the program headers won't be mapped into
+any PT_LOAD segment.  When the executable tries to access it (based
+on the program header address passed in AT_PHDR), it will lead to
+segfault.  This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if
+there may be no data sections before the text section so that the
+first PT_LOAD segment won't be code-only and will contain the program
+header.
+
+Testcases are adjusted to either pass "-z noseparate-code" to ld or
+discard the .note.gnu.property section.  A Linux/x86 run-time test is
+added.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
+	separate code program header is needed, make sure that the first
+	read-only PT_LOAD segment has no code by adding a
+	GNU_PROPERTY_X86_ISA_1_USED note.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/linux-x86.S: New file.
+	* testsuite/ld-elf/linux-x86.exp: Likewise.
+	* testsuite/ld-elf/pr23428.c: Likewise.
+	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
+	for Linux/x86 targets.
+	* testsuite/ld-i386/abs-iamcu.d: Likewise.
+	* testsuite/ld-i386/abs.d: Likewise.
+	* testsuite/ld-i386/pr12718.d: Likewise.
+	* testsuite/ld-i386/pr12921.d: Likewise.
+	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
+	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
+	* testsuite/ld-x86-64/abs.d: Likewise.
+	* testsuite/ld-x86-64/pr12718.d: Likewise.
+	* testsuite/ld-x86-64/pr12921.d: Likewise.
+	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
+	section.
+	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
+	* testsuite/ld-scripts/size-2.t: Likewise.
+	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld
+	to create executable if language is "asm".
+
+(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
+---
+ bfd/ChangeLog                                |  8 ++++
+ bfd/elfxx-x86.c                              | 60 +++++++++++++++++++-------
+ ld/ChangeLog                                 | 24 +++++++++++
+ ld/testsuite/ld-elf/linux-x86.S              | 63 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp            | 46 ++++++++++++++++++++
+ ld/testsuite/ld-elf/pr23428.c                | 43 +++++++++++++++++++
+ ld/testsuite/ld-elf/sec64k.exp               |  2 +
+ ld/testsuite/ld-i386/abs-iamcu.d             |  2 +-
+ ld/testsuite/ld-i386/abs.d                   |  2 +-
+ ld/testsuite/ld-i386/pr12718.d               |  2 +-
+ ld/testsuite/ld-i386/pr12921.d               |  2 +-
+ ld/testsuite/ld-linkonce/zeroeh.ld           |  1 +
+ ld/testsuite/ld-scripts/print-memory-usage.t |  2 +
+ ld/testsuite/ld-scripts/size-2.t             |  1 +
+ ld/testsuite/ld-x86-64/abs-k1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs-l1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs.d                 |  2 +-
+ ld/testsuite/ld-x86-64/pr12718.d             |  2 +-
+ ld/testsuite/ld-x86-64/pr12921.d             |  2 +-
+ ld/testsuite/lib/ld-lib.exp                  |  5 ++-
+ 20 files changed, 248 insertions(+), 25 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.S
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
+ create mode 100644 ld/testsuite/ld-elf/pr23428.c
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 1c1174a..d3831b7 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,11 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
++	separate code program header is needed, make sure that the first
++	read-only PT_LOAD segment has no code by adding a
++	GNU_PROPERTY_X86_ISA_1_USED note.
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* development.sh: Set to true.
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index a2497aa..2e4ff88 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   const struct elf_backend_data *bed;
+   unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
+   unsigned int got_align;
++  bfd_boolean has_text = FALSE;
+ 
+   features = 0;
+   if (info->ibt)
+@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties
+     if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
+ 	&& bfd_count_sections (pbfd) != 0)
+       {
++	if (!has_text)
++	  {
++	    /* Check if there is no non-empty text section.  */
++	    sec = bfd_get_section_by_name (pbfd, ".text");
++	    if (sec != NULL && sec->size != 0)
++	      has_text = TRUE;
++	  }
++
+ 	ebfd = pbfd;
+ 
+ 	if (elf_properties (pbfd) != NULL)
+ 	  break;
+       }
+ 
+-  if (ebfd != NULL && features)
++  bed = get_elf_backend_data (info->output_bfd);
++
++  htab = elf_x86_hash_table (info, bed->target_id);
++  if (htab == NULL)
++    return pbfd;
++
++  if (ebfd != NULL)
+     {
+-      /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
+-	 GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
+-      prop = _bfd_elf_get_property (ebfd,
+-				    GNU_PROPERTY_X86_FEATURE_1_AND,
+-				    4);
+-      prop->u.number |= features;
+-      prop->pr_kind = property_number;
++      prop = NULL;
++      if (features)
++	{
++	  /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
++	     GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_FEATURE_1_AND,
++					4);
++	  prop->u.number |= features;
++	  prop->pr_kind = property_number;
++	}
++      else if (has_text
++	       && elf_properties (ebfd) == NULL
++	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
++	       && !htab->elf.dynamic_sections_created
++	       && !info->traditional_format
++	       && (info->output_bfd->flags & D_PAGED) != 0
++	       && info->separate_code)
++	{
++	  /* If the separate code program header is needed, make sure
++	     that the first read-only PT_LOAD segment has no code by
++	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_ISA_1_USED,
++					4);
++	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	  prop->pr_kind = property_number;
++	}
+ 
+       /* Create the GNU property note section if needed.  */
+-      if (pbfd == NULL)
++      if (prop != NULL && pbfd == NULL)
+ 	{
+ 	  sec = bfd_make_section_with_flags (ebfd,
+ 					     NOTE_GNU_PROPERTY_SECTION_NAME,
+@@ -2581,12 +2617,6 @@ error_alignment:
+ 
+   pbfd = _bfd_elf_link_setup_gnu_properties (info);
+ 
+-  bed = get_elf_backend_data (info->output_bfd);
+-
+-  htab = elf_x86_hash_table (info, bed->target_id);
+-  if (htab == NULL)
+-    return pbfd;
+-
+   htab->r_info = init_table->r_info;
+   htab->r_sym = init_table->r_sym;
+ 
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index c07e442..cfadbd4 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,27 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* testsuite/ld-elf/linux-x86.S: New file.
++	* testsuite/ld-elf/linux-x86.exp: Likewise.
++	* testsuite/ld-elf/pr23428.c: Likewise.
++	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
++	for Linux/x86 targets.
++	* testsuite/ld-i386/abs-iamcu.d: Likewise.
++	* testsuite/ld-i386/abs.d: Likewise.
++	* testsuite/ld-i386/pr12718.d: Likewise.
++	* testsuite/ld-i386/pr12921.d: Likewise.
++	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
++	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
++	* testsuite/ld-x86-64/abs.d: Likewise.
++	* testsuite/ld-x86-64/pr12718.d: Likewise.
++	* testsuite/ld-x86-64/pr12921.d: Likewise.
++	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
++	section.
++	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
++	* testsuite/ld-scripts/size-2.t: Likewise.
++	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to
++	create executable if language is "asm".
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	2.31.1 Release point.
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+new file mode 100644
+index 0000000..bdf40c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -0,0 +1,63 @@
++	.text
++	.globl _start
++	.type _start,@function
++	.p2align 4
++_start:
++	xorl %ebp, %ebp
++#ifdef __LP64__
++	popq %rdi
++	movq %rsp, %rsi
++	andq  $~15, %rsp
++#elif defined __x86_64__
++	mov (%rsp),%edi
++	addl $4,%esp
++	movl %esp, %esi
++	andl  $~15, %esp
++#else
++	popl %esi
++	movl %esp, %ecx
++	andl  $~15, %esp
++
++	subl $8,%esp
++	pushl %ecx
++	pushl %esi
++#endif
++
++	call main
++
++	hlt
++
++	.type syscall,  @function
++	.globl syscall
++	.p2align 4
++syscall:
++#ifdef __x86_64__
++	movq %rdi, %rax		/* Syscall number -> rax.  */
++	movq %rsi, %rdi		/* shift arg1 - arg5.  */
++	movq %rdx, %rsi
++	movq %rcx, %rdx
++	movq %r8, %r10
++	movq %r9, %r8
++	movq 8(%rsp),%r9	/* arg6 is on the stack.  */
++	syscall			/* Do the system call.  */
++#else
++	push %ebp
++	push %edi
++	push %esi
++	push %ebx
++	mov 0x2c(%esp),%ebp
++	mov 0x28(%esp),%edi
++	mov 0x24(%esp),%esi
++	mov 0x20(%esp),%edx
++	mov 0x1c(%esp),%ecx
++	mov 0x18(%esp),%ebx
++	mov 0x14(%esp),%eax
++	int $0x80
++	pop %ebx
++	pop %esi
++	pop %edi
++	pop %ebp
++#endif
++	ret			/* Return to caller.  */
++	.size syscall, .-syscall
++	.section .note.GNU-stack,"",@progbits
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+new file mode 100644
+index 0000000..36217c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -0,0 +1,46 @@
++# Expect script for simple native Linux/x86 tests.
++#   Copyright (C) 2018 Free Software Foundation, Inc.
++#
++# This file is part of the GNU Binutils.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
++# MA 02110-1301, USA.
++#
++
++# Test very simple native Linux/x86 programs with linux-x86.S.
++if { ![isnative] || [which $CC] == 0 \
++     || (![istarget "i?86-*-linux*"] \
++         && ![istarget "x86_64-*-linux*"] \
++         && ![istarget "amd64-*-linux*"]) } {
++    return
++}
++
++# Add $PLT_CFLAGS if PLT is expected.
++global PLT_CFLAGS
++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
++global NOPIE_CFLAGS NOPIE_LDFLAGS
++
++run_ld_link_exec_tests [list \
++    [list \
++	"Run PR ld/23428 test" \
++	"--no-dynamic-linker -z separate-code" \
++	"" \
++	{ linux-x86.S pr23428.c } \
++	"pr23428" \
++	"pass.out" \
++	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
++	"asm" \
++    ] \
++]
+diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
+new file mode 100644
+index 0000000..3631ed7
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr23428.c
+@@ -0,0 +1,43 @@
++#include <unistd.h>
++#include <link.h>
++#include <syscall.h>
++
++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
++
++int
++main (int argc, char **argv)
++{
++  char **ev = &argv[argc + 1];
++  char **evp = ev;
++  ElfW(auxv_t) *av;
++  const ElfW(Phdr) *phdr = NULL;
++  size_t phnum = 0;
++  size_t loadnum = 0;
++  int fd = STDOUT_FILENO;
++  size_t i;
++
++  while (*evp++ != NULL)
++    ;
++
++  av = (ElfW(auxv_t) *) evp;
++
++  for (; av->a_type != AT_NULL; ++av)
++    switch (av->a_type)
++      {
++      case AT_PHDR:
++	phdr = (const void *) av->a_un.a_val;
++	break;
++      case AT_PHNUM:
++	phnum = av->a_un.a_val;
++	break;
++      }
++
++  for (i = 0; i < phnum; i++, phdr++)
++    if (phdr->p_type == PT_LOAD)
++      loadnum++;
++
++  syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n"));
++
++  syscall (SYS_exit, !loadnum);
++  return 0;
++}
+diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
+index b58139e..3909c0e 100644
+--- a/ld/testsuite/ld-elf/sec64k.exp
++++ b/ld/testsuite/ld-elf/sec64k.exp
+@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"]
+     foreach sfile $sfiles { puts $ofd "#source: $sfile" }
+     if { [istarget spu*-*-*] } {
+ 	puts $ofd "#ld: --local-store 0:0"
++    } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
++	puts $ofd "#ld: -z noseparate-code"
+     } else {
+ 	puts $ofd "#ld:"
+     }
+diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d
+index ac9beff..aba7d6b 100644
+--- a/ld/testsuite/ld-i386/abs-iamcu.d
++++ b/ld/testsuite/ld-i386/abs-iamcu.d
+@@ -2,7 +2,7 @@
+ #source: abs.s
+ #source: zero.s
+ #as: --32 -march=iamcu
+-#ld: -m elf_iamcu
++#ld: -m elf_iamcu -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
+index e660aca..191ee44 100644
+--- a/ld/testsuite/ld-i386/abs.d
++++ b/ld/testsuite/ld-i386/abs.d
+@@ -2,7 +2,7 @@
+ #as: --32
+ #source: abs.s
+ #source: zero.s
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
+index ec51540..7eba52d 100644
+--- a/ld/testsuite/ld-i386/pr12718.d
++++ b/ld/testsuite/ld-i386/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
+index e49079b..ea2da3e 100644
+--- a/ld/testsuite/ld-i386/pr12921.d
++++ b/ld/testsuite/ld-i386/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
+index b22eaa1..f89855a 100644
+--- a/ld/testsuite/ld-linkonce/zeroeh.ld
++++ b/ld/testsuite/ld-linkonce/zeroeh.ld
+@@ -2,4 +2,5 @@ SECTIONS {
+  .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) }
+  .gcc_except_table 0x2000 : { *(.gcc_except_table) }
+  .eh_frame 0x4000 : { *(.eh_frame) }
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t
+index 5ff057a..6eda1d2 100644
+--- a/ld/testsuite/ld-scripts/print-memory-usage.t
++++ b/ld/testsuite/ld-scripts/print-memory-usage.t
+@@ -11,4 +11,6 @@ SECTIONS
+     *(.data)
+     *(.rw)
+   }
++
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
+index 7238639..c3c4edd 100644
+--- a/ld/testsuite/ld-scripts/size-2.t
++++ b/ld/testsuite/ld-scripts/size-2.t
+@@ -18,4 +18,5 @@ SECTIONS
+     LONG (SIZEOF (.tdata))
+     LONG (SIZEOF (.tbss))
+   } :image
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
+index 2c26639..6b0fde0 100644
+--- a/ld/testsuite/ld-x86-64/abs-k1om.d
++++ b/ld/testsuite/ld-x86-64/abs-k1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=k1om
+-#ld: -m elf_k1om
++#ld: -m elf_k1om -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
+index 1fb96d4..f87869f 100644
+--- a/ld/testsuite/ld-x86-64/abs-l1om.d
++++ b/ld/testsuite/ld-x86-64/abs-l1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=l1om
+-#ld: -m elf_l1om
++#ld: -m elf_l1om -z noseparate-code
+ #objdump: -rs -j .text
+ #target: x86_64-*-linux*
+ 
+diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
+index b24b018..d99ab46 100644
+--- a/ld/testsuite/ld-x86-64/abs.d
++++ b/ld/testsuite/ld-x86-64/abs.d
+@@ -1,7 +1,7 @@
+ #name: Absolute non-overflowing relocs
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+-#ld:
++#ld: -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
+index 07d1732..2c503ff 100644
+--- a/ld/testsuite/ld-x86-64/pr12718.d
++++ b/ld/testsuite/ld-x86-64/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
+index 6fe6abe..1162d55 100644
+--- a/ld/testsuite/ld-x86-64/pr12921.d
++++ b/ld/testsuite/ld-x86-64/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
+index cfbefe9..1095091 100644
+--- a/ld/testsuite/lib/ld-lib.exp
++++ b/ld/testsuite/lib/ld-lib.exp
+@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } {
+ 	    continue
+ 	}
+ 
+-	if { [ string match "c++" $lang ] } {
++	if { [ string match "asm" $lang ] } {
++	    set link_proc ld_link
++	    set link_cmd $ld
++	} elseif { [ string match "c++" $lang ] } {
+ 	    set link_proc ld_link
+ 	    set link_cmd $CXX
+ 	} else {
+-- 
+2.9.3
+

cross/binutils-aarch64/x86-Properly-add-X86_ISA_1_NEEDED-property.patch

@@ -0,0 +1,139 @@
+From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Sat, 11 Aug 2018 06:41:33 -0700
+Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property
+
+Existing properties may be removed during property merging.  We avoid
+adding X86_ISA_1_NEEDED property only if existing properties won't be
+removed.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
+	add X86_ISA_1_NEEDED property only if existing properties won't
+	be removed.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/dummy.s: New file.
+	* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
+	* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
+
+(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
+---
+ bfd/ChangeLog                     |  7 +++++++
+ bfd/elfxx-x86.c                   | 28 ++++++++++++++++++++++------
+ ld/ChangeLog                      |  7 +++++++
+ ld/testsuite/ld-elf/dummy.s       |  1 +
+ ld/testsuite/ld-elf/linux-x86.S   | 28 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp |  2 +-
+ 6 files changed, 66 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/dummy.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 7ccfd25..2d8f7b6 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  prop->pr_kind = property_number;
+ 	}
+       else if (has_text
+-	       && elf_properties (ebfd) == NULL
+ 	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
+ 	       && !htab->elf.dynamic_sections_created
+ 	       && !info->traditional_format
+@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+ 	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+-	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_NEEDED,
+-					4);
+-	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+-	  prop->pr_kind = property_number;
++	  elf_property_list *list;
++	  bfd_boolean need_property = TRUE;
++
++	  for (list = elf_properties (ebfd); list; list = list->next)
++	    switch (list->property.pr_type)
++	      {
++	      case GNU_PROPERTY_STACK_SIZE:
++	      case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
++	      case GNU_PROPERTY_X86_ISA_1_NEEDED:
++		/* These properties won't be removed during merging.  */
++		need_property = FALSE;
++		break;
++	      }
++
++	  if (need_property)
++	    {
++	      prop = _bfd_elf_get_property (ebfd,
++					    GNU_PROPERTY_X86_ISA_1_NEEDED,
++					    4);
++	      prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	      prop->pr_kind = property_number;
++	    }
+ 	}
+ 
+       /* Create the GNU property note section if needed.  */
+diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
+new file mode 100644
+index 0000000..403f980
+--- /dev/null
++++ b/ld/testsuite/ld-elf/dummy.s
+@@ -0,0 +1 @@
++# Dummy
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+index bdf40c6..d94abc1 100644
+--- a/ld/testsuite/ld-elf/linux-x86.S
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -61,3 +61,31 @@ syscall:
+ 	ret			/* Return to caller.  */
+ 	.size syscall, .-syscall
+ 	.section .note.GNU-stack,"",@progbits
++
++	.section ".note.gnu.property", "a"
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++	.long 1f - 0f		/* name length */
++	.long 5f - 2f		/* data length */
++	.long 5			/* note type */
++0:	.asciz "GNU"		/* vendor name */
++1:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++2:	.long 0xc0000002	/* pr_type.  */
++	.long 4f - 3f		/* pr_datasz.  */
++3:
++	.long 0x2
++4:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++5:
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+index 36217c6..f6f5a80 100644
+--- a/ld/testsuite/ld-elf/linux-x86.exp
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \
+ 	"Run PR ld/23428 test" \
+ 	"--no-dynamic-linker -z separate-code" \
+ 	"" \
+-	{ linux-x86.S pr23428.c } \
++	{ linux-x86.S pr23428.c dummy.s } \
+ 	"pr23428" \
+ 	"pass.out" \
+ 	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
+-- 
+2.9.3
+

cross/binutils-aarch64/x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch

@@ -0,0 +1,587 @@
+From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 8 Aug 2018 06:09:15 -0700
+Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used.
+If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the
+corresponding x86 instruction set isn’t used.  When merging properties
+from 2 input files and one input file doesn't have the
+GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have
+it neither.  This patch removes the GNU_PROPERTY_X86_ISA_1_USED
+property if an input file doesn't have it.
+
+This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the
+GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA
+requirement.
+
+bfd/
+
+	PR ld/23486
+	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
+	GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
+	(_bfd_x86_elf_link_setup_gnu_properties): Adding the
+	GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
+	GNU_PROPERTY_X86_ISA_1_USED, property.
+
+ld/
+
+	PR ld/23486
+	* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* testsuite/ld-i386/pr23486a.d: New file.
+	* testsuite/ld-i386/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.s: Likewise.
+	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.s: Likewise.
+	* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
+	* testsuite/ld-i386/property-4.r: Likewise.
+	* testsuite/ld-i386/property-5.r: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
+	* testsuite/ld-x86-64/property-3.r: Likewise.
+	* testsuite/ld-x86-64/property-4.r: Likewise.
+	* testsuite/ld-x86-64/property-5.r: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
+
+(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
+---
+ bfd/ChangeLog                                     |  9 +++++++
+ bfd/elfxx-x86.c                                   | 25 ++++++++++++++----
+ ld/ChangeLog                                      | 32 +++++++++++++++++++++++
+ ld/testsuite/ld-i386/i386.exp                     |  2 ++
+ ld/testsuite/ld-i386/pr23486a.d                   | 10 +++++++
+ ld/testsuite/ld-i386/pr23486b.d                   | 10 +++++++
+ ld/testsuite/ld-i386/property-3.r                 |  1 -
+ ld/testsuite/ld-i386/property-4.r                 |  1 -
+ ld/testsuite/ld-i386/property-5.r                 |  1 -
+ ld/testsuite/ld-i386/property-x86-ibt3a.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-ibt3b.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3a.d       |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/pr23486a-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/pr23486b-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/property-3.r               |  1 -
+ ld/testsuite/ld-x86-64/property-4.r               |  1 -
+ ld/testsuite/ld-x86-64/property-5.r               |  1 -
+ ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3a.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a.d     |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b.d     |  5 ++--
+ ld/testsuite/ld-x86-64/x86-64.exp                 |  4 +++
+ 31 files changed, 211 insertions(+), 47 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/pr23486a.d
+ create mode 100644 ld/testsuite/ld-i386/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 2e4ff88..7ccfd25 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+   switch (pr_type)
+     {
+     case GNU_PROPERTY_X86_ISA_1_USED:
++      if (aprop == NULL || bprop == NULL)
++	{
++	  /* Only one of APROP and BPROP can be NULL.  */
++	  if (aprop != NULL)
++	    {
++	      /* Remove this property since the other input file doesn't
++		 have it.  */
++	      aprop->pr_kind = property_remove;
++	      updated = TRUE;
++	    }
++	  break;
++	}
++      goto or_property;
++
+     case GNU_PROPERTY_X86_ISA_1_NEEDED:
+       if (aprop != NULL && bprop != NULL)
+ 	{
++or_property:
+ 	  number = aprop->u.number;
+ 	  aprop->u.number = number | bprop->u.number;
+-	  /* Remove the property if ISA bits are empty.  */
++	  /* Remove the property if all bits are empty.  */
+ 	  if (aprop->u.number == 0)
+ 	    {
+ 	      aprop->pr_kind = property_remove;
+@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+ 	    {
+ 	      if (aprop->u.number == 0)
+ 		{
+-		  /* Remove APROP if ISA bits are empty.  */
++		  /* Remove APROP if all bits are empty.  */
+ 		  aprop->pr_kind = property_remove;
+ 		  updated = TRUE;
+ 		}
+ 	    }
+ 	  else
+ 	    {
+-	      /* Return TRUE if APROP is NULL and ISA bits of BPROP
++	      /* Return TRUE if APROP is NULL and all bits of BPROP
+ 		 aren't empty to indicate that BPROP should be added
+ 		 to ABFD.  */
+ 	      updated = bprop->u.number != 0;
+@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	{
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+-	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+ 	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_USED,
++					GNU_PROPERTY_X86_ISA_1_NEEDED,
+ 					4);
+ 	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+ 	  prop->pr_kind = property_number;
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index 6d794fe..78dad02 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -462,6 +462,8 @@ run_dump_test "pr23189"
+ run_dump_test "pr23194"
+ run_dump_test "pr23372a"
+ run_dump_test "pr23372b"
++run_dump_test "pr23486a"
++run_dump_test "pr23486b"
+ 
+ if { !([istarget "i?86-*-linux*"]
+        || [istarget "i?86-*-gnu*"]
+diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d
+new file mode 100644
+index 0000000..41a6dcf
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486a.s
++#source: ../ld-x86-64/pr23486b.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d
+new file mode 100644
+index 0000000..08019b7
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486b.s
++#source: ../ld-x86-64/pr23486a.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-i386/property-3.r
++++ b/ld/testsuite/ld-i386/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-i386/property-4.r
++++ b/ld/testsuite/ld-i386/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-i386/property-5.r
++++ b/ld/testsuite/ld-i386/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+index 4bb35b0..0aedea1 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+index 418d58a..bd69ac6 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+index e261038..76d2a39 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+index 25f3d23..e770ecf 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+new file mode 100644
+index 0000000..6d9fa68
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s
+new file mode 100644
+index 0000000..a07d0c7
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_USED */
++	.long 0xc0000000	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0xa
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+new file mode 100644
+index 0000000..0445e69
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486b.s
++#source: pr23486a.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s
+new file mode 100644
+index 0000000..c5167ee
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
++	.long 0xc0000001	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0x3
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-x86-64/property-3.r
++++ b/ld/testsuite/ld-x86-64/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-x86-64/property-4.r
++++ b/ld/testsuite/ld-x86-64/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-x86-64/property-5.r
++++ b/ld/testsuite/ld-x86-64/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+index 011426f..4cec728 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+index 1b4229a..a8df49a 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+index 290ed6a..c112626 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+index 1142e03..f10dffd 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+index 819542d..0147a3c 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+index 4c5d0e0..1f8c2dc 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+index ba181e0..7ca2539 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+index 5216f38..f66a40e 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 6edb9e8..ae21e55 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -403,6 +403,10 @@ run_dump_test "pr23372a"
+ run_dump_test "pr23372a-x32"
+ run_dump_test "pr23372b"
+ run_dump_test "pr23372b-x32"
++run_dump_test "pr23486a"
++run_dump_test "pr23486a-x32"
++run_dump_test "pr23486b"
++run_dump_test "pr23486b-x32"
+ 
+ if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+     return
+-- 
+2.9.3
+

cross/binutils-armhf/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
----
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
---- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
--	  /* Don't transfer these tags from dynamic objects.  */
--	  if ((ibfd->flags & DYNAMIC) != 0)
--	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
--
--      /* If the input bfd has no contents, it shouldn't set the
--	 private data of the output bfd.  */
--      else if (!file->flags.just_syms
--	       && ((input_bfd->flags & DYNAMIC) != 0
--		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
--- 
-2.33.0
-

cross/binutils-armhf/APKBUILD

@@ -2,28 +2,28 @@
 # Generator: pmbootstrap aportgen binutils-armhf
 # Based on: main/binutils
 
-pkgname=binutils-armhf
-pkgver=2.38
-pkgrel=1
+
+pkgname="binutils-armhf"
+pkgver=2.31.1
+pkgrel=2
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="armv7 aarch64 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+subpackages=""
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
+	x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+	x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+	x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -31,18 +31,12 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
 #   2.28-r1:
-#     - CVE-2017-7614
+#   - CVE-2017-7614
 
 build() {
 	_target="$(arch_to_hostspec armhf)"
+	cd "$builddir"
 	"$builddir"/configure \
 		--build="$CBUILD" \
 		--target=$_target \
@@ -60,23 +54,18 @@ build() {
 }
 
 package() {
+	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 
 	# remove man, info folders
 	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
 
 
-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
+d95fd77e1c2c4670a2a11979d6811b358ba0f067b917b33d241eca20cfe66553f6a6fccc5ec26d8d29045e487cb74389fbf86426f80cf81df95608835a566cfc  x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+ce5d3c935057d624c1ce75722e7b5e4583812d46797edce8c381a94b2643f44f7bd0165e7e9b8e358955f4d979074ee487598efbf24389a4013681f99ff7c595  x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+1878bed194529afb2430af21ba9712d6819c5fdfdc5c8db652175bf86d0a0c710ac2bd3ec728bf874887301bd187d91bf60a374c47850c7bd2eafbf6653d74d8  x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch"

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/binutils-ppc-fix-machine-options.patch

@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
--	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else

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-armhf/x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch

@@ -0,0 +1,567 @@
+From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 20 Jul 2018 09:18:47 -0700
+Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed
+
+When -z separate-code, which is enabled by default for Linux/x86, is
+used to create executable, ld won't place any data in the code-only
+PT_LOAD segment.  If there are no data sections placed before the
+code-only PT_LOAD segment, the program headers won't be mapped into
+any PT_LOAD segment.  When the executable tries to access it (based
+on the program header address passed in AT_PHDR), it will lead to
+segfault.  This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if
+there may be no data sections before the text section so that the
+first PT_LOAD segment won't be code-only and will contain the program
+header.
+
+Testcases are adjusted to either pass "-z noseparate-code" to ld or
+discard the .note.gnu.property section.  A Linux/x86 run-time test is
+added.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
+	separate code program header is needed, make sure that the first
+	read-only PT_LOAD segment has no code by adding a
+	GNU_PROPERTY_X86_ISA_1_USED note.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/linux-x86.S: New file.
+	* testsuite/ld-elf/linux-x86.exp: Likewise.
+	* testsuite/ld-elf/pr23428.c: Likewise.
+	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
+	for Linux/x86 targets.
+	* testsuite/ld-i386/abs-iamcu.d: Likewise.
+	* testsuite/ld-i386/abs.d: Likewise.
+	* testsuite/ld-i386/pr12718.d: Likewise.
+	* testsuite/ld-i386/pr12921.d: Likewise.
+	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
+	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
+	* testsuite/ld-x86-64/abs.d: Likewise.
+	* testsuite/ld-x86-64/pr12718.d: Likewise.
+	* testsuite/ld-x86-64/pr12921.d: Likewise.
+	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
+	section.
+	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
+	* testsuite/ld-scripts/size-2.t: Likewise.
+	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld
+	to create executable if language is "asm".
+
+(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
+---
+ bfd/ChangeLog                                |  8 ++++
+ bfd/elfxx-x86.c                              | 60 +++++++++++++++++++-------
+ ld/ChangeLog                                 | 24 +++++++++++
+ ld/testsuite/ld-elf/linux-x86.S              | 63 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp            | 46 ++++++++++++++++++++
+ ld/testsuite/ld-elf/pr23428.c                | 43 +++++++++++++++++++
+ ld/testsuite/ld-elf/sec64k.exp               |  2 +
+ ld/testsuite/ld-i386/abs-iamcu.d             |  2 +-
+ ld/testsuite/ld-i386/abs.d                   |  2 +-
+ ld/testsuite/ld-i386/pr12718.d               |  2 +-
+ ld/testsuite/ld-i386/pr12921.d               |  2 +-
+ ld/testsuite/ld-linkonce/zeroeh.ld           |  1 +
+ ld/testsuite/ld-scripts/print-memory-usage.t |  2 +
+ ld/testsuite/ld-scripts/size-2.t             |  1 +
+ ld/testsuite/ld-x86-64/abs-k1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs-l1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs.d                 |  2 +-
+ ld/testsuite/ld-x86-64/pr12718.d             |  2 +-
+ ld/testsuite/ld-x86-64/pr12921.d             |  2 +-
+ ld/testsuite/lib/ld-lib.exp                  |  5 ++-
+ 20 files changed, 248 insertions(+), 25 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.S
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
+ create mode 100644 ld/testsuite/ld-elf/pr23428.c
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 1c1174a..d3831b7 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,11 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
++	separate code program header is needed, make sure that the first
++	read-only PT_LOAD segment has no code by adding a
++	GNU_PROPERTY_X86_ISA_1_USED note.
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* development.sh: Set to true.
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index a2497aa..2e4ff88 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   const struct elf_backend_data *bed;
+   unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
+   unsigned int got_align;
++  bfd_boolean has_text = FALSE;
+ 
+   features = 0;
+   if (info->ibt)
+@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties
+     if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
+ 	&& bfd_count_sections (pbfd) != 0)
+       {
++	if (!has_text)
++	  {
++	    /* Check if there is no non-empty text section.  */
++	    sec = bfd_get_section_by_name (pbfd, ".text");
++	    if (sec != NULL && sec->size != 0)
++	      has_text = TRUE;
++	  }
++
+ 	ebfd = pbfd;
+ 
+ 	if (elf_properties (pbfd) != NULL)
+ 	  break;
+       }
+ 
+-  if (ebfd != NULL && features)
++  bed = get_elf_backend_data (info->output_bfd);
++
++  htab = elf_x86_hash_table (info, bed->target_id);
++  if (htab == NULL)
++    return pbfd;
++
++  if (ebfd != NULL)
+     {
+-      /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
+-	 GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
+-      prop = _bfd_elf_get_property (ebfd,
+-				    GNU_PROPERTY_X86_FEATURE_1_AND,
+-				    4);
+-      prop->u.number |= features;
+-      prop->pr_kind = property_number;
++      prop = NULL;
++      if (features)
++	{
++	  /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
++	     GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_FEATURE_1_AND,
++					4);
++	  prop->u.number |= features;
++	  prop->pr_kind = property_number;
++	}
++      else if (has_text
++	       && elf_properties (ebfd) == NULL
++	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
++	       && !htab->elf.dynamic_sections_created
++	       && !info->traditional_format
++	       && (info->output_bfd->flags & D_PAGED) != 0
++	       && info->separate_code)
++	{
++	  /* If the separate code program header is needed, make sure
++	     that the first read-only PT_LOAD segment has no code by
++	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_ISA_1_USED,
++					4);
++	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	  prop->pr_kind = property_number;
++	}
+ 
+       /* Create the GNU property note section if needed.  */
+-      if (pbfd == NULL)
++      if (prop != NULL && pbfd == NULL)
+ 	{
+ 	  sec = bfd_make_section_with_flags (ebfd,
+ 					     NOTE_GNU_PROPERTY_SECTION_NAME,
+@@ -2581,12 +2617,6 @@ error_alignment:
+ 
+   pbfd = _bfd_elf_link_setup_gnu_properties (info);
+ 
+-  bed = get_elf_backend_data (info->output_bfd);
+-
+-  htab = elf_x86_hash_table (info, bed->target_id);
+-  if (htab == NULL)
+-    return pbfd;
+-
+   htab->r_info = init_table->r_info;
+   htab->r_sym = init_table->r_sym;
+ 
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index c07e442..cfadbd4 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,27 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* testsuite/ld-elf/linux-x86.S: New file.
++	* testsuite/ld-elf/linux-x86.exp: Likewise.
++	* testsuite/ld-elf/pr23428.c: Likewise.
++	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
++	for Linux/x86 targets.
++	* testsuite/ld-i386/abs-iamcu.d: Likewise.
++	* testsuite/ld-i386/abs.d: Likewise.
++	* testsuite/ld-i386/pr12718.d: Likewise.
++	* testsuite/ld-i386/pr12921.d: Likewise.
++	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
++	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
++	* testsuite/ld-x86-64/abs.d: Likewise.
++	* testsuite/ld-x86-64/pr12718.d: Likewise.
++	* testsuite/ld-x86-64/pr12921.d: Likewise.
++	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
++	section.
++	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
++	* testsuite/ld-scripts/size-2.t: Likewise.
++	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to
++	create executable if language is "asm".
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	2.31.1 Release point.
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+new file mode 100644
+index 0000000..bdf40c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -0,0 +1,63 @@
++	.text
++	.globl _start
++	.type _start,@function
++	.p2align 4
++_start:
++	xorl %ebp, %ebp
++#ifdef __LP64__
++	popq %rdi
++	movq %rsp, %rsi
++	andq  $~15, %rsp
++#elif defined __x86_64__
++	mov (%rsp),%edi
++	addl $4,%esp
++	movl %esp, %esi
++	andl  $~15, %esp
++#else
++	popl %esi
++	movl %esp, %ecx
++	andl  $~15, %esp
++
++	subl $8,%esp
++	pushl %ecx
++	pushl %esi
++#endif
++
++	call main
++
++	hlt
++
++	.type syscall,  @function
++	.globl syscall
++	.p2align 4
++syscall:
++#ifdef __x86_64__
++	movq %rdi, %rax		/* Syscall number -> rax.  */
++	movq %rsi, %rdi		/* shift arg1 - arg5.  */
++	movq %rdx, %rsi
++	movq %rcx, %rdx
++	movq %r8, %r10
++	movq %r9, %r8
++	movq 8(%rsp),%r9	/* arg6 is on the stack.  */
++	syscall			/* Do the system call.  */
++#else
++	push %ebp
++	push %edi
++	push %esi
++	push %ebx
++	mov 0x2c(%esp),%ebp
++	mov 0x28(%esp),%edi
++	mov 0x24(%esp),%esi
++	mov 0x20(%esp),%edx
++	mov 0x1c(%esp),%ecx
++	mov 0x18(%esp),%ebx
++	mov 0x14(%esp),%eax
++	int $0x80
++	pop %ebx
++	pop %esi
++	pop %edi
++	pop %ebp
++#endif
++	ret			/* Return to caller.  */
++	.size syscall, .-syscall
++	.section .note.GNU-stack,"",@progbits
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+new file mode 100644
+index 0000000..36217c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -0,0 +1,46 @@
++# Expect script for simple native Linux/x86 tests.
++#   Copyright (C) 2018 Free Software Foundation, Inc.
++#
++# This file is part of the GNU Binutils.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
++# MA 02110-1301, USA.
++#
++
++# Test very simple native Linux/x86 programs with linux-x86.S.
++if { ![isnative] || [which $CC] == 0 \
++     || (![istarget "i?86-*-linux*"] \
++         && ![istarget "x86_64-*-linux*"] \
++         && ![istarget "amd64-*-linux*"]) } {
++    return
++}
++
++# Add $PLT_CFLAGS if PLT is expected.
++global PLT_CFLAGS
++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
++global NOPIE_CFLAGS NOPIE_LDFLAGS
++
++run_ld_link_exec_tests [list \
++    [list \
++	"Run PR ld/23428 test" \
++	"--no-dynamic-linker -z separate-code" \
++	"" \
++	{ linux-x86.S pr23428.c } \
++	"pr23428" \
++	"pass.out" \
++	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
++	"asm" \
++    ] \
++]
+diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
+new file mode 100644
+index 0000000..3631ed7
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr23428.c
+@@ -0,0 +1,43 @@
++#include <unistd.h>
++#include <link.h>
++#include <syscall.h>
++
++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
++
++int
++main (int argc, char **argv)
++{
++  char **ev = &argv[argc + 1];
++  char **evp = ev;
++  ElfW(auxv_t) *av;
++  const ElfW(Phdr) *phdr = NULL;
++  size_t phnum = 0;
++  size_t loadnum = 0;
++  int fd = STDOUT_FILENO;
++  size_t i;
++
++  while (*evp++ != NULL)
++    ;
++
++  av = (ElfW(auxv_t) *) evp;
++
++  for (; av->a_type != AT_NULL; ++av)
++    switch (av->a_type)
++      {
++      case AT_PHDR:
++	phdr = (const void *) av->a_un.a_val;
++	break;
++      case AT_PHNUM:
++	phnum = av->a_un.a_val;
++	break;
++      }
++
++  for (i = 0; i < phnum; i++, phdr++)
++    if (phdr->p_type == PT_LOAD)
++      loadnum++;
++
++  syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n"));
++
++  syscall (SYS_exit, !loadnum);
++  return 0;
++}
+diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
+index b58139e..3909c0e 100644
+--- a/ld/testsuite/ld-elf/sec64k.exp
++++ b/ld/testsuite/ld-elf/sec64k.exp
+@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"]
+     foreach sfile $sfiles { puts $ofd "#source: $sfile" }
+     if { [istarget spu*-*-*] } {
+ 	puts $ofd "#ld: --local-store 0:0"
++    } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
++	puts $ofd "#ld: -z noseparate-code"
+     } else {
+ 	puts $ofd "#ld:"
+     }
+diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d
+index ac9beff..aba7d6b 100644
+--- a/ld/testsuite/ld-i386/abs-iamcu.d
++++ b/ld/testsuite/ld-i386/abs-iamcu.d
+@@ -2,7 +2,7 @@
+ #source: abs.s
+ #source: zero.s
+ #as: --32 -march=iamcu
+-#ld: -m elf_iamcu
++#ld: -m elf_iamcu -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
+index e660aca..191ee44 100644
+--- a/ld/testsuite/ld-i386/abs.d
++++ b/ld/testsuite/ld-i386/abs.d
+@@ -2,7 +2,7 @@
+ #as: --32
+ #source: abs.s
+ #source: zero.s
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
+index ec51540..7eba52d 100644
+--- a/ld/testsuite/ld-i386/pr12718.d
++++ b/ld/testsuite/ld-i386/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
+index e49079b..ea2da3e 100644
+--- a/ld/testsuite/ld-i386/pr12921.d
++++ b/ld/testsuite/ld-i386/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
+index b22eaa1..f89855a 100644
+--- a/ld/testsuite/ld-linkonce/zeroeh.ld
++++ b/ld/testsuite/ld-linkonce/zeroeh.ld
+@@ -2,4 +2,5 @@ SECTIONS {
+  .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) }
+  .gcc_except_table 0x2000 : { *(.gcc_except_table) }
+  .eh_frame 0x4000 : { *(.eh_frame) }
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t
+index 5ff057a..6eda1d2 100644
+--- a/ld/testsuite/ld-scripts/print-memory-usage.t
++++ b/ld/testsuite/ld-scripts/print-memory-usage.t
+@@ -11,4 +11,6 @@ SECTIONS
+     *(.data)
+     *(.rw)
+   }
++
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
+index 7238639..c3c4edd 100644
+--- a/ld/testsuite/ld-scripts/size-2.t
++++ b/ld/testsuite/ld-scripts/size-2.t
+@@ -18,4 +18,5 @@ SECTIONS
+     LONG (SIZEOF (.tdata))
+     LONG (SIZEOF (.tbss))
+   } :image
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
+index 2c26639..6b0fde0 100644
+--- a/ld/testsuite/ld-x86-64/abs-k1om.d
++++ b/ld/testsuite/ld-x86-64/abs-k1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=k1om
+-#ld: -m elf_k1om
++#ld: -m elf_k1om -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
+index 1fb96d4..f87869f 100644
+--- a/ld/testsuite/ld-x86-64/abs-l1om.d
++++ b/ld/testsuite/ld-x86-64/abs-l1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=l1om
+-#ld: -m elf_l1om
++#ld: -m elf_l1om -z noseparate-code
+ #objdump: -rs -j .text
+ #target: x86_64-*-linux*
+ 
+diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
+index b24b018..d99ab46 100644
+--- a/ld/testsuite/ld-x86-64/abs.d
++++ b/ld/testsuite/ld-x86-64/abs.d
+@@ -1,7 +1,7 @@
+ #name: Absolute non-overflowing relocs
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+-#ld:
++#ld: -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
+index 07d1732..2c503ff 100644
+--- a/ld/testsuite/ld-x86-64/pr12718.d
++++ b/ld/testsuite/ld-x86-64/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
+index 6fe6abe..1162d55 100644
+--- a/ld/testsuite/ld-x86-64/pr12921.d
++++ b/ld/testsuite/ld-x86-64/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
+index cfbefe9..1095091 100644
+--- a/ld/testsuite/lib/ld-lib.exp
++++ b/ld/testsuite/lib/ld-lib.exp
+@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } {
+ 	    continue
+ 	}
+ 
+-	if { [ string match "c++" $lang ] } {
++	if { [ string match "asm" $lang ] } {
++	    set link_proc ld_link
++	    set link_cmd $ld
++	} elseif { [ string match "c++" $lang ] } {
+ 	    set link_proc ld_link
+ 	    set link_cmd $CXX
+ 	} else {
+-- 
+2.9.3
+

cross/binutils-armhf/x86-Properly-add-X86_ISA_1_NEEDED-property.patch

@@ -0,0 +1,139 @@
+From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Sat, 11 Aug 2018 06:41:33 -0700
+Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property
+
+Existing properties may be removed during property merging.  We avoid
+adding X86_ISA_1_NEEDED property only if existing properties won't be
+removed.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
+	add X86_ISA_1_NEEDED property only if existing properties won't
+	be removed.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/dummy.s: New file.
+	* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
+	* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
+
+(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
+---
+ bfd/ChangeLog                     |  7 +++++++
+ bfd/elfxx-x86.c                   | 28 ++++++++++++++++++++++------
+ ld/ChangeLog                      |  7 +++++++
+ ld/testsuite/ld-elf/dummy.s       |  1 +
+ ld/testsuite/ld-elf/linux-x86.S   | 28 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp |  2 +-
+ 6 files changed, 66 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/dummy.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 7ccfd25..2d8f7b6 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  prop->pr_kind = property_number;
+ 	}
+       else if (has_text
+-	       && elf_properties (ebfd) == NULL
+ 	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
+ 	       && !htab->elf.dynamic_sections_created
+ 	       && !info->traditional_format
+@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+ 	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+-	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_NEEDED,
+-					4);
+-	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+-	  prop->pr_kind = property_number;
++	  elf_property_list *list;
++	  bfd_boolean need_property = TRUE;
++
++	  for (list = elf_properties (ebfd); list; list = list->next)
++	    switch (list->property.pr_type)
++	      {
++	      case GNU_PROPERTY_STACK_SIZE:
++	      case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
++	      case GNU_PROPERTY_X86_ISA_1_NEEDED:
++		/* These properties won't be removed during merging.  */
++		need_property = FALSE;
++		break;
++	      }
++
++	  if (need_property)
++	    {
++	      prop = _bfd_elf_get_property (ebfd,
++					    GNU_PROPERTY_X86_ISA_1_NEEDED,
++					    4);
++	      prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	      prop->pr_kind = property_number;
++	    }
+ 	}
+ 
+       /* Create the GNU property note section if needed.  */
+diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
+new file mode 100644
+index 0000000..403f980
+--- /dev/null
++++ b/ld/testsuite/ld-elf/dummy.s
+@@ -0,0 +1 @@
++# Dummy
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+index bdf40c6..d94abc1 100644
+--- a/ld/testsuite/ld-elf/linux-x86.S
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -61,3 +61,31 @@ syscall:
+ 	ret			/* Return to caller.  */
+ 	.size syscall, .-syscall
+ 	.section .note.GNU-stack,"",@progbits
++
++	.section ".note.gnu.property", "a"
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++	.long 1f - 0f		/* name length */
++	.long 5f - 2f		/* data length */
++	.long 5			/* note type */
++0:	.asciz "GNU"		/* vendor name */
++1:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++2:	.long 0xc0000002	/* pr_type.  */
++	.long 4f - 3f		/* pr_datasz.  */
++3:
++	.long 0x2
++4:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++5:
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+index 36217c6..f6f5a80 100644
+--- a/ld/testsuite/ld-elf/linux-x86.exp
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \
+ 	"Run PR ld/23428 test" \
+ 	"--no-dynamic-linker -z separate-code" \
+ 	"" \
+-	{ linux-x86.S pr23428.c } \
++	{ linux-x86.S pr23428.c dummy.s } \
+ 	"pr23428" \
+ 	"pass.out" \
+ 	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
+-- 
+2.9.3
+

cross/binutils-armhf/x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch

@@ -0,0 +1,587 @@
+From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 8 Aug 2018 06:09:15 -0700
+Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used.
+If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the
+corresponding x86 instruction set isn’t used.  When merging properties
+from 2 input files and one input file doesn't have the
+GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have
+it neither.  This patch removes the GNU_PROPERTY_X86_ISA_1_USED
+property if an input file doesn't have it.
+
+This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the
+GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA
+requirement.
+
+bfd/
+
+	PR ld/23486
+	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
+	GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
+	(_bfd_x86_elf_link_setup_gnu_properties): Adding the
+	GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
+	GNU_PROPERTY_X86_ISA_1_USED, property.
+
+ld/
+
+	PR ld/23486
+	* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* testsuite/ld-i386/pr23486a.d: New file.
+	* testsuite/ld-i386/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.s: Likewise.
+	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.s: Likewise.
+	* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
+	* testsuite/ld-i386/property-4.r: Likewise.
+	* testsuite/ld-i386/property-5.r: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
+	* testsuite/ld-x86-64/property-3.r: Likewise.
+	* testsuite/ld-x86-64/property-4.r: Likewise.
+	* testsuite/ld-x86-64/property-5.r: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
+
+(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
+---
+ bfd/ChangeLog                                     |  9 +++++++
+ bfd/elfxx-x86.c                                   | 25 ++++++++++++++----
+ ld/ChangeLog                                      | 32 +++++++++++++++++++++++
+ ld/testsuite/ld-i386/i386.exp                     |  2 ++
+ ld/testsuite/ld-i386/pr23486a.d                   | 10 +++++++
+ ld/testsuite/ld-i386/pr23486b.d                   | 10 +++++++
+ ld/testsuite/ld-i386/property-3.r                 |  1 -
+ ld/testsuite/ld-i386/property-4.r                 |  1 -
+ ld/testsuite/ld-i386/property-5.r                 |  1 -
+ ld/testsuite/ld-i386/property-x86-ibt3a.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-ibt3b.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3a.d       |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/pr23486a-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/pr23486b-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/property-3.r               |  1 -
+ ld/testsuite/ld-x86-64/property-4.r               |  1 -
+ ld/testsuite/ld-x86-64/property-5.r               |  1 -
+ ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3a.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a.d     |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b.d     |  5 ++--
+ ld/testsuite/ld-x86-64/x86-64.exp                 |  4 +++
+ 31 files changed, 211 insertions(+), 47 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/pr23486a.d
+ create mode 100644 ld/testsuite/ld-i386/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 2e4ff88..7ccfd25 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+   switch (pr_type)
+     {
+     case GNU_PROPERTY_X86_ISA_1_USED:
++      if (aprop == NULL || bprop == NULL)
++	{
++	  /* Only one of APROP and BPROP can be NULL.  */
++	  if (aprop != NULL)
++	    {
++	      /* Remove this property since the other input file doesn't
++		 have it.  */
++	      aprop->pr_kind = property_remove;
++	      updated = TRUE;
++	    }
++	  break;
++	}
++      goto or_property;
++
+     case GNU_PROPERTY_X86_ISA_1_NEEDED:
+       if (aprop != NULL && bprop != NULL)
+ 	{
++or_property:
+ 	  number = aprop->u.number;
+ 	  aprop->u.number = number | bprop->u.number;
+-	  /* Remove the property if ISA bits are empty.  */
++	  /* Remove the property if all bits are empty.  */
+ 	  if (aprop->u.number == 0)
+ 	    {
+ 	      aprop->pr_kind = property_remove;
+@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+ 	    {
+ 	      if (aprop->u.number == 0)
+ 		{
+-		  /* Remove APROP if ISA bits are empty.  */
++		  /* Remove APROP if all bits are empty.  */
+ 		  aprop->pr_kind = property_remove;
+ 		  updated = TRUE;
+ 		}
+ 	    }
+ 	  else
+ 	    {
+-	      /* Return TRUE if APROP is NULL and ISA bits of BPROP
++	      /* Return TRUE if APROP is NULL and all bits of BPROP
+ 		 aren't empty to indicate that BPROP should be added
+ 		 to ABFD.  */
+ 	      updated = bprop->u.number != 0;
+@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	{
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+-	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+ 	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_USED,
++					GNU_PROPERTY_X86_ISA_1_NEEDED,
+ 					4);
+ 	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+ 	  prop->pr_kind = property_number;
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index 6d794fe..78dad02 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -462,6 +462,8 @@ run_dump_test "pr23189"
+ run_dump_test "pr23194"
+ run_dump_test "pr23372a"
+ run_dump_test "pr23372b"
++run_dump_test "pr23486a"
++run_dump_test "pr23486b"
+ 
+ if { !([istarget "i?86-*-linux*"]
+        || [istarget "i?86-*-gnu*"]
+diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d
+new file mode 100644
+index 0000000..41a6dcf
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486a.s
++#source: ../ld-x86-64/pr23486b.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d
+new file mode 100644
+index 0000000..08019b7
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486b.s
++#source: ../ld-x86-64/pr23486a.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-i386/property-3.r
++++ b/ld/testsuite/ld-i386/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-i386/property-4.r
++++ b/ld/testsuite/ld-i386/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-i386/property-5.r
++++ b/ld/testsuite/ld-i386/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+index 4bb35b0..0aedea1 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+index 418d58a..bd69ac6 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+index e261038..76d2a39 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+index 25f3d23..e770ecf 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+new file mode 100644
+index 0000000..6d9fa68
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s
+new file mode 100644
+index 0000000..a07d0c7
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_USED */
++	.long 0xc0000000	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0xa
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+new file mode 100644
+index 0000000..0445e69
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486b.s
++#source: pr23486a.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s
+new file mode 100644
+index 0000000..c5167ee
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
++	.long 0xc0000001	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0x3
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-x86-64/property-3.r
++++ b/ld/testsuite/ld-x86-64/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-x86-64/property-4.r
++++ b/ld/testsuite/ld-x86-64/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-x86-64/property-5.r
++++ b/ld/testsuite/ld-x86-64/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+index 011426f..4cec728 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+index 1b4229a..a8df49a 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+index 290ed6a..c112626 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+index 1142e03..f10dffd 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+index 819542d..0147a3c 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+index 4c5d0e0..1f8c2dc 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+index ba181e0..7ca2539 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+index 5216f38..f66a40e 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 6edb9e8..ae21e55 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -403,6 +403,10 @@ run_dump_test "pr23372a"
+ run_dump_test "pr23372a-x32"
+ run_dump_test "pr23372b"
+ run_dump_test "pr23372b-x32"
++run_dump_test "pr23486a"
++run_dump_test "pr23486a-x32"
++run_dump_test "pr23486b"
++run_dump_test "pr23486b-x32"
+ 
+ if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+     return
+-- 
+2.9.3
+

cross/binutils-armv7/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch

@@ -1,55 +0,0 @@
-From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 21 Sep 2021 14:53:13 +0000
-Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
- libraries"
-
-This revert is needed to avoid wrongly tagging objects with the incompatible
-IBM long double ABI, which is not supported by musl and will result in
-linking errors if used.
-
-This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
----
- bfd/elf32-tic6x.c |  3 ---
- ld/ldlang.c       | 10 ++++------
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
-index 5754f3cb860..3ad1d612749 100644
---- a/bfd/elf32-tic6x.c
-+++ b/bfd/elf32-tic6x.c
-@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
- 
- 	case Tag_ABI_PIC:
- 	case Tag_ABI_PID:
--	  /* Don't transfer these tags from dynamic objects.  */
--	  if ((ibfd->flags & DYNAMIC) != 0)
--	    continue;
- 	  if (out_attr[i].i > in_attr[i].i)
- 	    out_attr[i].i = in_attr[i].i;
- 	  break;
-diff --git a/ld/ldlang.c b/ld/ldlang.c
-index 37b64c89ee1..f13beaef9d9 100644
---- a/ld/ldlang.c
-+++ b/ld/ldlang.c
-@@ -7071,13 +7071,11 @@ lang_check (void)
- 		   bfd_printable_name (input_bfd), input_bfd,
- 		   bfd_printable_name (link_info.output_bfd));
- 	}
--
--      /* If the input bfd has no contents, it shouldn't set the
--	 private data of the output bfd.  */
--      else if (!file->flags.just_syms
--	       && ((input_bfd->flags & DYNAMIC) != 0
--		   || bfd_count_sections (input_bfd) != 0))
-+      else if (bfd_count_sections (input_bfd))
- 	{
-+	  /* If the input bfd has no contents, it shouldn't set the
-+	     private data of the output bfd.  */
-+
- 	  bfd_error_handler_type pfn = NULL;
- 
- 	  /* If we aren't supposed to warn about mismatched input
--- 
-2.33.0
-

cross/binutils-armv7/APKBUILD

@@ -2,28 +2,28 @@
 # Generator: pmbootstrap aportgen binutils-armv7
 # Based on: main/binutils
 
-pkgname=binutils-armv7
-pkgver=2.38
-pkgrel=1
+
+pkgname="binutils-armv7"
+pkgver=2.31.1
+pkgrel=2
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
-makedepends="gettext libtool autoconf automake bison texinfo"
-arch="x86_64"
+depends=""
+makedepends_build=""
+makedepends_host=""
+makedepends="gettext libtool autoconf automake bison"
+arch="armhf aarch64 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+subpackages=""
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
+	x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+	x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+	x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
-	ld-bfd-mips.patch
-	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-	binutils-mips-disable-assert.patch
-	binutils-ppc-fix-machine-options.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
-if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ]; then
-	subpackages=""
-fi
-
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
 	subpackages=""
@@ -31,18 +31,12 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
-#   2.35.2-r1:
-#     - CVE-2021-3487
-#   2.32-r0:
-#     - CVE-2018-19931
-#     - CVE-2018-19932
-#     - CVE-2018-20002
-#     - CVE-2018-20712
 #   2.28-r1:
-#     - CVE-2017-7614
+#   - CVE-2017-7614
 
 build() {
 	_target="$(arch_to_hostspec armv7)"
+	cd "$builddir"
 	"$builddir"/configure \
 		--build="$CBUILD" \
 		--target=$_target \
@@ -60,23 +54,18 @@ build() {
 }
 
 package() {
+	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 
 	# remove man, info folders
 	rm -rf "$pkgdir"/usr/share
-
-	# remove files that conflict with non-cross binutils
-	rm -rf "$pkgdir"/usr/lib/bfd-plugins
 }
 
 
 
-sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+sha512sums="b42954e6f49a0adcd2676bdd77dfb59bfc25cec8184b007521d1e2b1d5d0593b58639e3d9448d5a40fe024c3cea386a37743627d6bb16d502f52a4a32b9573bd  binutils-2.31.1.tar.bz2
+d95fd77e1c2c4670a2a11979d6811b358ba0f067b917b33d241eca20cfe66553f6a6fccc5ec26d8d29045e487cb74389fbf86426f80cf81df95608835a566cfc  x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+ce5d3c935057d624c1ce75722e7b5e4583812d46797edce8c381a94b2643f44f7bd0165e7e9b8e358955f4d979074ee487598efbf24389a4013681f99ff7c595  x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+1878bed194529afb2430af21ba9712d6819c5fdfdc5c8db652175bf86d0a0c710ac2bd3ec728bf874887301bd187d91bf60a374c47850c7bd2eafbf6653d74d8  x86-Properly-add-X86_ISA_1_NEEDED-property.patch
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
-70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
-609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
-27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-"
+f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch"

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/binutils-ppc-fix-machine-options.patch

@@ -1,41 +0,0 @@
-Fix for DARN opcode error during ppc64le compilation of rng-tools which
-occurs with binutils 2.38 but not with binutils 2.37..
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=cebc89b9328;hp=9cbed90ee623d75e31994e7943960c997ba565f2
-
-
-diff -aur a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
---- a/gas/config/tc-ppc.c
-+++ b/gas/config/tc-ppc.c
-@@ -5965,7 +5965,30 @@
- 	     options do not count as a new machine, instead they add
- 	     to currently selected opcodes.  */
- 	  ppc_cpu_t machine_sticky = 0;
--	  new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string);
-+	  /* Unfortunately, some versions of gcc emit a .machine
-+	     directive very near the start of the compiler's assembly
-+	     output file.  This is bad because it overrides user -Wa
-+	     cpu selection.  Worse, there are versions of gcc that
-+	     emit the *wrong* cpu, not even respecting the -mcpu given
-+	     to gcc.  See gcc pr101393.  And to compound the problem,
-+	     as of 20220222 gcc doesn't pass the correct cpu option to
-+	     gas on the command line.  See gcc pr59828.  Hack around
-+	     this by keeping sticky options for an early .machine.  */
-+	  asection *sec;
-+	  for (sec = stdoutput->sections; sec != NULL; sec = sec->next)
-+	    {
-+	      segment_info_type *info = seg_info (sec);
-+	      /* Are the frags for this section perturbed from their
-+	         initial state?  Even .align will count here.  */
-+	      if (info != NULL
-+	          && (info->frchainP->frch_root != info->frchainP->frch_last
-+	              || info->frchainP->frch_root->fr_type != rs_fill
-+	              || info->frchainP->frch_root->fr_fix != 0))
-+	        break;
-+	    }
-+	  new_cpu = ppc_parse_cpu (ppc_cpu,
-+	                           sec == NULL ? &sticky : &machine_sticky,
-+	                           cpu_string);
- 	  if (new_cpu != 0)
- 	    ppc_cpu = new_cpu;
- 	  else

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-armv7/x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch

@@ -0,0 +1,567 @@
+From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 20 Jul 2018 09:18:47 -0700
+Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed
+
+When -z separate-code, which is enabled by default for Linux/x86, is
+used to create executable, ld won't place any data in the code-only
+PT_LOAD segment.  If there are no data sections placed before the
+code-only PT_LOAD segment, the program headers won't be mapped into
+any PT_LOAD segment.  When the executable tries to access it (based
+on the program header address passed in AT_PHDR), it will lead to
+segfault.  This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if
+there may be no data sections before the text section so that the
+first PT_LOAD segment won't be code-only and will contain the program
+header.
+
+Testcases are adjusted to either pass "-z noseparate-code" to ld or
+discard the .note.gnu.property section.  A Linux/x86 run-time test is
+added.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
+	separate code program header is needed, make sure that the first
+	read-only PT_LOAD segment has no code by adding a
+	GNU_PROPERTY_X86_ISA_1_USED note.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/linux-x86.S: New file.
+	* testsuite/ld-elf/linux-x86.exp: Likewise.
+	* testsuite/ld-elf/pr23428.c: Likewise.
+	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
+	for Linux/x86 targets.
+	* testsuite/ld-i386/abs-iamcu.d: Likewise.
+	* testsuite/ld-i386/abs.d: Likewise.
+	* testsuite/ld-i386/pr12718.d: Likewise.
+	* testsuite/ld-i386/pr12921.d: Likewise.
+	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
+	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
+	* testsuite/ld-x86-64/abs.d: Likewise.
+	* testsuite/ld-x86-64/pr12718.d: Likewise.
+	* testsuite/ld-x86-64/pr12921.d: Likewise.
+	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
+	section.
+	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
+	* testsuite/ld-scripts/size-2.t: Likewise.
+	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld
+	to create executable if language is "asm".
+
+(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
+---
+ bfd/ChangeLog                                |  8 ++++
+ bfd/elfxx-x86.c                              | 60 +++++++++++++++++++-------
+ ld/ChangeLog                                 | 24 +++++++++++
+ ld/testsuite/ld-elf/linux-x86.S              | 63 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp            | 46 ++++++++++++++++++++
+ ld/testsuite/ld-elf/pr23428.c                | 43 +++++++++++++++++++
+ ld/testsuite/ld-elf/sec64k.exp               |  2 +
+ ld/testsuite/ld-i386/abs-iamcu.d             |  2 +-
+ ld/testsuite/ld-i386/abs.d                   |  2 +-
+ ld/testsuite/ld-i386/pr12718.d               |  2 +-
+ ld/testsuite/ld-i386/pr12921.d               |  2 +-
+ ld/testsuite/ld-linkonce/zeroeh.ld           |  1 +
+ ld/testsuite/ld-scripts/print-memory-usage.t |  2 +
+ ld/testsuite/ld-scripts/size-2.t             |  1 +
+ ld/testsuite/ld-x86-64/abs-k1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs-l1om.d            |  2 +-
+ ld/testsuite/ld-x86-64/abs.d                 |  2 +-
+ ld/testsuite/ld-x86-64/pr12718.d             |  2 +-
+ ld/testsuite/ld-x86-64/pr12921.d             |  2 +-
+ ld/testsuite/lib/ld-lib.exp                  |  5 ++-
+ 20 files changed, 248 insertions(+), 25 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.S
+ create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
+ create mode 100644 ld/testsuite/ld-elf/pr23428.c
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 1c1174a..d3831b7 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,11 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
++	separate code program header is needed, make sure that the first
++	read-only PT_LOAD segment has no code by adding a
++	GNU_PROPERTY_X86_ISA_1_USED note.
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* development.sh: Set to true.
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index a2497aa..2e4ff88 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   const struct elf_backend_data *bed;
+   unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2;
+   unsigned int got_align;
++  bfd_boolean has_text = FALSE;
+ 
+   features = 0;
+   if (info->ibt)
+@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties
+     if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour
+ 	&& bfd_count_sections (pbfd) != 0)
+       {
++	if (!has_text)
++	  {
++	    /* Check if there is no non-empty text section.  */
++	    sec = bfd_get_section_by_name (pbfd, ".text");
++	    if (sec != NULL && sec->size != 0)
++	      has_text = TRUE;
++	  }
++
+ 	ebfd = pbfd;
+ 
+ 	if (elf_properties (pbfd) != NULL)
+ 	  break;
+       }
+ 
+-  if (ebfd != NULL && features)
++  bed = get_elf_backend_data (info->output_bfd);
++
++  htab = elf_x86_hash_table (info, bed->target_id);
++  if (htab == NULL)
++    return pbfd;
++
++  if (ebfd != NULL)
+     {
+-      /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
+-	 GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
+-      prop = _bfd_elf_get_property (ebfd,
+-				    GNU_PROPERTY_X86_FEATURE_1_AND,
+-				    4);
+-      prop->u.number |= features;
+-      prop->pr_kind = property_number;
++      prop = NULL;
++      if (features)
++	{
++	  /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and
++	     GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_FEATURE_1_AND,
++					4);
++	  prop->u.number |= features;
++	  prop->pr_kind = property_number;
++	}
++      else if (has_text
++	       && elf_properties (ebfd) == NULL
++	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
++	       && !htab->elf.dynamic_sections_created
++	       && !info->traditional_format
++	       && (info->output_bfd->flags & D_PAGED) != 0
++	       && info->separate_code)
++	{
++	  /* If the separate code program header is needed, make sure
++	     that the first read-only PT_LOAD segment has no code by
++	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	  prop = _bfd_elf_get_property (ebfd,
++					GNU_PROPERTY_X86_ISA_1_USED,
++					4);
++	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	  prop->pr_kind = property_number;
++	}
+ 
+       /* Create the GNU property note section if needed.  */
+-      if (pbfd == NULL)
++      if (prop != NULL && pbfd == NULL)
+ 	{
+ 	  sec = bfd_make_section_with_flags (ebfd,
+ 					     NOTE_GNU_PROPERTY_SECTION_NAME,
+@@ -2581,12 +2617,6 @@ error_alignment:
+ 
+   pbfd = _bfd_elf_link_setup_gnu_properties (info);
+ 
+-  bed = get_elf_backend_data (info->output_bfd);
+-
+-  htab = elf_x86_hash_table (info, bed->target_id);
+-  if (htab == NULL)
+-    return pbfd;
+-
+   htab->r_info = init_table->r_info;
+   htab->r_sym = init_table->r_sym;
+ 
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index c07e442..cfadbd4 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,27 @@
++2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
++
++	PR ld/23428
++	* testsuite/ld-elf/linux-x86.S: New file.
++	* testsuite/ld-elf/linux-x86.exp: Likewise.
++	* testsuite/ld-elf/pr23428.c: Likewise.
++	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
++	for Linux/x86 targets.
++	* testsuite/ld-i386/abs-iamcu.d: Likewise.
++	* testsuite/ld-i386/abs.d: Likewise.
++	* testsuite/ld-i386/pr12718.d: Likewise.
++	* testsuite/ld-i386/pr12921.d: Likewise.
++	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
++	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
++	* testsuite/ld-x86-64/abs.d: Likewise.
++	* testsuite/ld-x86-64/pr12718.d: Likewise.
++	* testsuite/ld-x86-64/pr12921.d: Likewise.
++	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
++	section.
++	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
++	* testsuite/ld-scripts/size-2.t: Likewise.
++	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to
++	create executable if language is "asm".
++
+ 2018-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	2.31.1 Release point.
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+new file mode 100644
+index 0000000..bdf40c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -0,0 +1,63 @@
++	.text
++	.globl _start
++	.type _start,@function
++	.p2align 4
++_start:
++	xorl %ebp, %ebp
++#ifdef __LP64__
++	popq %rdi
++	movq %rsp, %rsi
++	andq  $~15, %rsp
++#elif defined __x86_64__
++	mov (%rsp),%edi
++	addl $4,%esp
++	movl %esp, %esi
++	andl  $~15, %esp
++#else
++	popl %esi
++	movl %esp, %ecx
++	andl  $~15, %esp
++
++	subl $8,%esp
++	pushl %ecx
++	pushl %esi
++#endif
++
++	call main
++
++	hlt
++
++	.type syscall,  @function
++	.globl syscall
++	.p2align 4
++syscall:
++#ifdef __x86_64__
++	movq %rdi, %rax		/* Syscall number -> rax.  */
++	movq %rsi, %rdi		/* shift arg1 - arg5.  */
++	movq %rdx, %rsi
++	movq %rcx, %rdx
++	movq %r8, %r10
++	movq %r9, %r8
++	movq 8(%rsp),%r9	/* arg6 is on the stack.  */
++	syscall			/* Do the system call.  */
++#else
++	push %ebp
++	push %edi
++	push %esi
++	push %ebx
++	mov 0x2c(%esp),%ebp
++	mov 0x28(%esp),%edi
++	mov 0x24(%esp),%esi
++	mov 0x20(%esp),%edx
++	mov 0x1c(%esp),%ecx
++	mov 0x18(%esp),%ebx
++	mov 0x14(%esp),%eax
++	int $0x80
++	pop %ebx
++	pop %esi
++	pop %edi
++	pop %ebp
++#endif
++	ret			/* Return to caller.  */
++	.size syscall, .-syscall
++	.section .note.GNU-stack,"",@progbits
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+new file mode 100644
+index 0000000..36217c6
+--- /dev/null
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -0,0 +1,46 @@
++# Expect script for simple native Linux/x86 tests.
++#   Copyright (C) 2018 Free Software Foundation, Inc.
++#
++# This file is part of the GNU Binutils.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
++# MA 02110-1301, USA.
++#
++
++# Test very simple native Linux/x86 programs with linux-x86.S.
++if { ![isnative] || [which $CC] == 0 \
++     || (![istarget "i?86-*-linux*"] \
++         && ![istarget "x86_64-*-linux*"] \
++         && ![istarget "amd64-*-linux*"]) } {
++    return
++}
++
++# Add $PLT_CFLAGS if PLT is expected.
++global PLT_CFLAGS
++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required.
++global NOPIE_CFLAGS NOPIE_LDFLAGS
++
++run_ld_link_exec_tests [list \
++    [list \
++	"Run PR ld/23428 test" \
++	"--no-dynamic-linker -z separate-code" \
++	"" \
++	{ linux-x86.S pr23428.c } \
++	"pr23428" \
++	"pass.out" \
++	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
++	"asm" \
++    ] \
++]
+diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c
+new file mode 100644
+index 0000000..3631ed7
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr23428.c
+@@ -0,0 +1,43 @@
++#include <unistd.h>
++#include <link.h>
++#include <syscall.h>
++
++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1)
++
++int
++main (int argc, char **argv)
++{
++  char **ev = &argv[argc + 1];
++  char **evp = ev;
++  ElfW(auxv_t) *av;
++  const ElfW(Phdr) *phdr = NULL;
++  size_t phnum = 0;
++  size_t loadnum = 0;
++  int fd = STDOUT_FILENO;
++  size_t i;
++
++  while (*evp++ != NULL)
++    ;
++
++  av = (ElfW(auxv_t) *) evp;
++
++  for (; av->a_type != AT_NULL; ++av)
++    switch (av->a_type)
++      {
++      case AT_PHDR:
++	phdr = (const void *) av->a_un.a_val;
++	break;
++      case AT_PHNUM:
++	phnum = av->a_un.a_val;
++	break;
++      }
++
++  for (i = 0; i < phnum; i++, phdr++)
++    if (phdr->p_type == PT_LOAD)
++      loadnum++;
++
++  syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n"));
++
++  syscall (SYS_exit, !loadnum);
++  return 0;
++}
+diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
+index b58139e..3909c0e 100644
+--- a/ld/testsuite/ld-elf/sec64k.exp
++++ b/ld/testsuite/ld-elf/sec64k.exp
+@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"]
+     foreach sfile $sfiles { puts $ofd "#source: $sfile" }
+     if { [istarget spu*-*-*] } {
+ 	puts $ofd "#ld: --local-store 0:0"
++    } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
++	puts $ofd "#ld: -z noseparate-code"
+     } else {
+ 	puts $ofd "#ld:"
+     }
+diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d
+index ac9beff..aba7d6b 100644
+--- a/ld/testsuite/ld-i386/abs-iamcu.d
++++ b/ld/testsuite/ld-i386/abs-iamcu.d
+@@ -2,7 +2,7 @@
+ #source: abs.s
+ #source: zero.s
+ #as: --32 -march=iamcu
+-#ld: -m elf_iamcu
++#ld: -m elf_iamcu -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d
+index e660aca..191ee44 100644
+--- a/ld/testsuite/ld-i386/abs.d
++++ b/ld/testsuite/ld-i386/abs.d
+@@ -2,7 +2,7 @@
+ #as: --32
+ #source: abs.s
+ #source: zero.s
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
+index ec51540..7eba52d 100644
+--- a/ld/testsuite/ld-i386/pr12718.d
++++ b/ld/testsuite/ld-i386/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
+index e49079b..ea2da3e 100644
+--- a/ld/testsuite/ld-i386/pr12921.d
++++ b/ld/testsuite/ld-i386/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --32
+-#ld: -melf_i386
++#ld: -melf_i386 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld
+index b22eaa1..f89855a 100644
+--- a/ld/testsuite/ld-linkonce/zeroeh.ld
++++ b/ld/testsuite/ld-linkonce/zeroeh.ld
+@@ -2,4 +2,5 @@ SECTIONS {
+  .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) }
+  .gcc_except_table 0x2000 : { *(.gcc_except_table) }
+  .eh_frame 0x4000 : { *(.eh_frame) }
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t
+index 5ff057a..6eda1d2 100644
+--- a/ld/testsuite/ld-scripts/print-memory-usage.t
++++ b/ld/testsuite/ld-scripts/print-memory-usage.t
+@@ -11,4 +11,6 @@ SECTIONS
+     *(.data)
+     *(.rw)
+   }
++
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t
+index 7238639..c3c4edd 100644
+--- a/ld/testsuite/ld-scripts/size-2.t
++++ b/ld/testsuite/ld-scripts/size-2.t
+@@ -18,4 +18,5 @@ SECTIONS
+     LONG (SIZEOF (.tdata))
+     LONG (SIZEOF (.tbss))
+   } :image
++  /DISCARD/ : { *(.note.gnu.property) }
+ }
+diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d
+index 2c26639..6b0fde0 100644
+--- a/ld/testsuite/ld-x86-64/abs-k1om.d
++++ b/ld/testsuite/ld-x86-64/abs-k1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=k1om
+-#ld: -m elf_k1om
++#ld: -m elf_k1om -z noseparate-code
+ #objdump: -rs -j .text
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d
+index 1fb96d4..f87869f 100644
+--- a/ld/testsuite/ld-x86-64/abs-l1om.d
++++ b/ld/testsuite/ld-x86-64/abs-l1om.d
+@@ -2,7 +2,7 @@
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+ #as: --64 -march=l1om
+-#ld: -m elf_l1om
++#ld: -m elf_l1om -z noseparate-code
+ #objdump: -rs -j .text
+ #target: x86_64-*-linux*
+ 
+diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d
+index b24b018..d99ab46 100644
+--- a/ld/testsuite/ld-x86-64/abs.d
++++ b/ld/testsuite/ld-x86-64/abs.d
+@@ -1,7 +1,7 @@
+ #name: Absolute non-overflowing relocs
+ #source: ../ld-i386/abs.s
+ #source: ../ld-i386/zero.s
+-#ld:
++#ld: -z noseparate-code
+ #objdump: -rs
+ 
+ .*:     file format .*
+diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
+index 07d1732..2c503ff 100644
+--- a/ld/testsuite/ld-x86-64/pr12718.d
++++ b/ld/testsuite/ld-x86-64/pr12718.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12718
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 5 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
+index 6fe6abe..1162d55 100644
+--- a/ld/testsuite/ld-x86-64/pr12921.d
++++ b/ld/testsuite/ld-x86-64/pr12921.d
+@@ -1,6 +1,6 @@
+ #name: PR ld/12921
+ #as: --64
+-#ld: -melf_x86_64
++#ld: -melf_x86_64 -z noseparate-code
+ #readelf: -S --wide
+ 
+ There are 7 section headers, starting at offset 0x[0-9a-f]+:
+diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
+index cfbefe9..1095091 100644
+--- a/ld/testsuite/lib/ld-lib.exp
++++ b/ld/testsuite/lib/ld-lib.exp
+@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } {
+ 	    continue
+ 	}
+ 
+-	if { [ string match "c++" $lang ] } {
++	if { [ string match "asm" $lang ] } {
++	    set link_proc ld_link
++	    set link_cmd $ld
++	} elseif { [ string match "c++" $lang ] } {
+ 	    set link_proc ld_link
+ 	    set link_cmd $CXX
+ 	} else {
+-- 
+2.9.3
+

cross/binutils-armv7/x86-Properly-add-X86_ISA_1_NEEDED-property.patch

@@ -0,0 +1,139 @@
+From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Sat, 11 Aug 2018 06:41:33 -0700
+Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property
+
+Existing properties may be removed during property merging.  We avoid
+adding X86_ISA_1_NEEDED property only if existing properties won't be
+removed.
+
+bfd/
+
+	PR ld/23428
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
+	add X86_ISA_1_NEEDED property only if existing properties won't
+	be removed.
+
+ld/
+
+	PR ld/23428
+	* testsuite/ld-elf/dummy.s: New file.
+	* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
+	* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
+
+(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
+---
+ bfd/ChangeLog                     |  7 +++++++
+ bfd/elfxx-x86.c                   | 28 ++++++++++++++++++++++------
+ ld/ChangeLog                      |  7 +++++++
+ ld/testsuite/ld-elf/dummy.s       |  1 +
+ ld/testsuite/ld-elf/linux-x86.S   | 28 ++++++++++++++++++++++++++++
+ ld/testsuite/ld-elf/linux-x86.exp |  2 +-
+ 6 files changed, 66 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-elf/dummy.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 7ccfd25..2d8f7b6 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  prop->pr_kind = property_number;
+ 	}
+       else if (has_text
+-	       && elf_properties (ebfd) == NULL
+ 	       && elf_tdata (info->output_bfd)->o->build_id.sec == NULL
+ 	       && !htab->elf.dynamic_sections_created
+ 	       && !info->traditional_format
+@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+ 	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+-	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_NEEDED,
+-					4);
+-	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+-	  prop->pr_kind = property_number;
++	  elf_property_list *list;
++	  bfd_boolean need_property = TRUE;
++
++	  for (list = elf_properties (ebfd); list; list = list->next)
++	    switch (list->property.pr_type)
++	      {
++	      case GNU_PROPERTY_STACK_SIZE:
++	      case GNU_PROPERTY_NO_COPY_ON_PROTECTED:
++	      case GNU_PROPERTY_X86_ISA_1_NEEDED:
++		/* These properties won't be removed during merging.  */
++		need_property = FALSE;
++		break;
++	      }
++
++	  if (need_property)
++	    {
++	      prop = _bfd_elf_get_property (ebfd,
++					    GNU_PROPERTY_X86_ISA_1_NEEDED,
++					    4);
++	      prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
++	      prop->pr_kind = property_number;
++	    }
+ 	}
+ 
+       /* Create the GNU property note section if needed.  */
+diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
+new file mode 100644
+index 0000000..403f980
+--- /dev/null
++++ b/ld/testsuite/ld-elf/dummy.s
+@@ -0,0 +1 @@
++# Dummy
+diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
+index bdf40c6..d94abc1 100644
+--- a/ld/testsuite/ld-elf/linux-x86.S
++++ b/ld/testsuite/ld-elf/linux-x86.S
+@@ -61,3 +61,31 @@ syscall:
+ 	ret			/* Return to caller.  */
+ 	.size syscall, .-syscall
+ 	.section .note.GNU-stack,"",@progbits
++
++	.section ".note.gnu.property", "a"
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++	.long 1f - 0f		/* name length */
++	.long 5f - 2f		/* data length */
++	.long 5			/* note type */
++0:	.asciz "GNU"		/* vendor name */
++1:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++2:	.long 0xc0000002	/* pr_type.  */
++	.long 4f - 3f		/* pr_datasz.  */
++3:
++	.long 0x2
++4:
++#ifdef __LP64__
++	.p2align 3
++#else
++	.p2align 2
++#endif
++5:
+diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp
+index 36217c6..f6f5a80 100644
+--- a/ld/testsuite/ld-elf/linux-x86.exp
++++ b/ld/testsuite/ld-elf/linux-x86.exp
+@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \
+ 	"Run PR ld/23428 test" \
+ 	"--no-dynamic-linker -z separate-code" \
+ 	"" \
+-	{ linux-x86.S pr23428.c } \
++	{ linux-x86.S pr23428.c dummy.s } \
+ 	"pr23428" \
+ 	"pass.out" \
+ 	"$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \
+-- 
+2.9.3
+

cross/binutils-armv7/x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch

@@ -0,0 +1,587 @@
+From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Wed, 8 Aug 2018 06:09:15 -0700
+Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used.
+If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the
+corresponding x86 instruction set isn’t used.  When merging properties
+from 2 input files and one input file doesn't have the
+GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have
+it neither.  This patch removes the GNU_PROPERTY_X86_ISA_1_USED
+property if an input file doesn't have it.
+
+This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the
+GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA
+requirement.
+
+bfd/
+
+	PR ld/23486
+	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
+	GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
+	(_bfd_x86_elf_link_setup_gnu_properties): Adding the
+	GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
+	GNU_PROPERTY_X86_ISA_1_USED, property.
+
+ld/
+
+	PR ld/23486
+	* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* testsuite/ld-i386/pr23486a.d: New file.
+	* testsuite/ld-i386/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.d: Likewise.
+	* testsuite/ld-x86-64/pr23486a.s: Likewise.
+	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.d: Likewise.
+	* testsuite/ld-x86-64/pr23486b.s: Likewise.
+	* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
+	* testsuite/ld-i386/property-4.r: Likewise.
+	* testsuite/ld-i386/property-5.r: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
+	* testsuite/ld-x86-64/property-3.r: Likewise.
+	* testsuite/ld-x86-64/property-4.r: Likewise.
+	* testsuite/ld-x86-64/property-5.r: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
+
+(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
+---
+ bfd/ChangeLog                                     |  9 +++++++
+ bfd/elfxx-x86.c                                   | 25 ++++++++++++++----
+ ld/ChangeLog                                      | 32 +++++++++++++++++++++++
+ ld/testsuite/ld-i386/i386.exp                     |  2 ++
+ ld/testsuite/ld-i386/pr23486a.d                   | 10 +++++++
+ ld/testsuite/ld-i386/pr23486b.d                   | 10 +++++++
+ ld/testsuite/ld-i386/property-3.r                 |  1 -
+ ld/testsuite/ld-i386/property-4.r                 |  1 -
+ ld/testsuite/ld-i386/property-5.r                 |  1 -
+ ld/testsuite/ld-i386/property-x86-ibt3a.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-ibt3b.d         |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3a.d       |  5 ++--
+ ld/testsuite/ld-i386/property-x86-shstk3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/pr23486a-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486a.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/pr23486b-x32.d             | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.d                 | 10 +++++++
+ ld/testsuite/ld-x86-64/pr23486b.s                 | 30 +++++++++++++++++++++
+ ld/testsuite/ld-x86-64/property-3.r               |  1 -
+ ld/testsuite/ld-x86-64/property-4.r               |  1 -
+ ld/testsuite/ld-x86-64/property-5.r               |  1 -
+ ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3a.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d   |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-ibt3b.d       |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3a.d     |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d |  5 ++--
+ ld/testsuite/ld-x86-64/property-x86-shstk3b.d     |  5 ++--
+ ld/testsuite/ld-x86-64/x86-64.exp                 |  4 +++
+ 31 files changed, 211 insertions(+), 47 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/pr23486a.d
+ create mode 100644 ld/testsuite/ld-i386/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
+ create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
+
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 2e4ff88..7ccfd25 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+   switch (pr_type)
+     {
+     case GNU_PROPERTY_X86_ISA_1_USED:
++      if (aprop == NULL || bprop == NULL)
++	{
++	  /* Only one of APROP and BPROP can be NULL.  */
++	  if (aprop != NULL)
++	    {
++	      /* Remove this property since the other input file doesn't
++		 have it.  */
++	      aprop->pr_kind = property_remove;
++	      updated = TRUE;
++	    }
++	  break;
++	}
++      goto or_property;
++
+     case GNU_PROPERTY_X86_ISA_1_NEEDED:
+       if (aprop != NULL && bprop != NULL)
+ 	{
++or_property:
+ 	  number = aprop->u.number;
+ 	  aprop->u.number = number | bprop->u.number;
+-	  /* Remove the property if ISA bits are empty.  */
++	  /* Remove the property if all bits are empty.  */
+ 	  if (aprop->u.number == 0)
+ 	    {
+ 	      aprop->pr_kind = property_remove;
+@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
+ 	    {
+ 	      if (aprop->u.number == 0)
+ 		{
+-		  /* Remove APROP if ISA bits are empty.  */
++		  /* Remove APROP if all bits are empty.  */
+ 		  aprop->pr_kind = property_remove;
+ 		  updated = TRUE;
+ 		}
+ 	    }
+ 	  else
+ 	    {
+-	      /* Return TRUE if APROP is NULL and ISA bits of BPROP
++	      /* Return TRUE if APROP is NULL and all bits of BPROP
+ 		 aren't empty to indicate that BPROP should be added
+ 		 to ABFD.  */
+ 	      updated = bprop->u.number != 0;
+@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties
+ 	{
+ 	  /* If the separate code program header is needed, make sure
+ 	     that the first read-only PT_LOAD segment has no code by
+-	     adding a GNU_PROPERTY_X86_ISA_1_USED note.  */
++	     adding a GNU_PROPERTY_X86_ISA_1_NEEDED note.  */
+ 	  prop = _bfd_elf_get_property (ebfd,
+-					GNU_PROPERTY_X86_ISA_1_USED,
++					GNU_PROPERTY_X86_ISA_1_NEEDED,
+ 					4);
+ 	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
+ 	  prop->pr_kind = property_number;
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index 6d794fe..78dad02 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -462,6 +462,8 @@ run_dump_test "pr23189"
+ run_dump_test "pr23194"
+ run_dump_test "pr23372a"
+ run_dump_test "pr23372b"
++run_dump_test "pr23486a"
++run_dump_test "pr23486b"
+ 
+ if { !([istarget "i?86-*-linux*"]
+        || [istarget "i?86-*-gnu*"]
+diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d
+new file mode 100644
+index 0000000..41a6dcf
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486a.s
++#source: ../ld-x86-64/pr23486b.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d
+new file mode 100644
+index 0000000..08019b7
+--- /dev/null
++++ b/ld/testsuite/ld-i386/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: ../ld-x86-64/pr23486b.s
++#source: ../ld-x86-64/pr23486a.s
++#as: --32
++#ld: -r -m elf_i386
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-i386/property-3.r
++++ b/ld/testsuite/ld-i386/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-i386/property-4.r
++++ b/ld/testsuite/ld-i386/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-i386/property-5.r
++++ b/ld/testsuite/ld-i386/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+index 4bb35b0..0aedea1 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+index 418d58a..bd69ac6 100644
+--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+index e261038..76d2a39 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+index 25f3d23..e770ecf 100644
+--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: i486, 586, SSE2, SSE3
+-	x86 ISA needed: 586, SSE, SSE3, SSE4_1
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1
+diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+new file mode 100644
+index 0000000..6d9fa68
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s
+new file mode 100644
+index 0000000..a07d0c7
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486a.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_USED */
++	.long 0xc0000000	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0xa
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+new file mode 100644
+index 0000000..0445e69
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d
+@@ -0,0 +1,10 @@
++#source: pr23486b.s
++#source: pr23486a.s
++#as: --x32
++#ld: -r -m elf32_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d
+new file mode 100644
+index 0000000..dc2b7bf
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.d
+@@ -0,0 +1,10 @@
++#source: pr23486a.s
++#source: pr23486b.s
++#as: --64 -defsym __64_bit__=1
++#ld: -r -m elf_x86_64
++#readelf: -n
++
++Displaying notes found in: .note.gnu.property
++  Owner                 Data size	Description
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586
+diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s
+new file mode 100644
+index 0000000..c5167ee
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/pr23486b.s
+@@ -0,0 +1,30 @@
++	.section ".note.gnu.property", "a"
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	.long 1f - 0f		/* name length.  */
++	.long 4f - 1f		/* data length.  */
++	/* NT_GNU_PROPERTY_TYPE_0 */
++	.long 5			/* note type.  */
++0:
++	.asciz "GNU"		/* vendor name.  */
++1:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
++	.long 0xc0000001	/* pr_type.  */
++	.long 3f - 2f		/* pr_datasz.  */
++2:
++	.long 0x3
++3:
++.ifdef __64_bit__
++	.p2align 3
++.else
++	.p2align 2
++.endif
++4:
+diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
+index 0ed91f5..d03203c 100644
+--- a/ld/testsuite/ld-x86-64/property-3.r
++++ b/ld/testsuite/ld-x86-64/property-3.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: 586, SSE
+ 	x86 ISA needed: i486, 586
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
+index cb2bc15..da295eb 100644
+--- a/ld/testsuite/ld-x86-64/property-4.r
++++ b/ld/testsuite/ld-x86-64/property-4.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x800000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
+index 5529650..e414159 100644
+--- a/ld/testsuite/ld-x86-64/property-5.r
++++ b/ld/testsuite/ld-x86-64/property-5.r
+@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+       Properties: stack size: 0x900000
+-	x86 ISA used: i486, 586, SSE
+ 	x86 ISA needed: i486, 586, SSE
+ #pass
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+index 011426f..4cec728 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+index 1b4229a..a8df49a 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+index 290ed6a..c112626 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+index 1142e03..f10dffd 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+index 819542d..0147a3c 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+index 4c5d0e0..1f8c2dc 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+index ba181e0..7ca2539 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x0000000c	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+index 5216f38..f66a40e 100644
+--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d
+@@ -6,6 +6,5 @@
+ 
+ Displaying notes found in: .note.gnu.property
+   Owner                 Data size	Description
+-  GNU                  0x00000020	NT_GNU_PROPERTY_TYPE_0
+-      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+-	x86 ISA needed: i486, 586, SSE2, SSE3
++  GNU                  0x00000010	NT_GNU_PROPERTY_TYPE_0
++      Properties: x86 ISA needed: i486, 586, SSE2, SSE3
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 6edb9e8..ae21e55 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -403,6 +403,10 @@ run_dump_test "pr23372a"
+ run_dump_test "pr23372a-x32"
+ run_dump_test "pr23372b"
+ run_dump_test "pr23372b-x32"
++run_dump_test "pr23486a"
++run_dump_test "pr23486a-x32"
++run_dump_test "pr23486b"
++run_dump_test "pr23486b-x32"
+ 
+ if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+     return
+-- 
+2.9.3
+

cross/busybox-static-aarch64/APKBUILD

@@ -1,36 +1,29 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen busybox-static-aarch64
 
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
 pkgname=busybox-static-aarch64
-pkgver=1.35.0
-pkgrel=5
+pkgver=1.31.0
+pkgrel=0
 
 _arch="aarch64"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-cdn.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="x86_64"
+arch="all"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+    busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
+    mkdir -p "$pkgdir/usr/$_target"
+    cd "$pkgdir/usr/$_target"
+    tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk
+    rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-5be7db2e4793b74ffa487153b1ca52027b6d1a4ca316c152163d1b3030ba3270e645d02522f9c8187b14fc193b5471ccedc7439b38463fabeac08b404f1b6fbb  busybox-static-1.35.0-r5-aarch64-edge.apk
-"
+sha512sums="1b189b920f6a6163ef20128215c25f90f04169d0992ab25f6d1eaa26ae2bf435e0cf553db90bfcf681acbc31eb99d1c9df7ce61738e39355e4ff2c4e8f09e286  busybox-static-1.31.0-r0-aarch64.apk"

cross/busybox-static-armhf/APKBUILD

@@ -1,36 +1,29 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen busybox-static-armhf
 
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
 pkgname=busybox-static-armhf
-pkgver=1.35.0
-pkgrel=5
+pkgver=1.31.0
+pkgrel=0
 
 _arch="armhf"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-cdn.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="x86_64"
+arch="all"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+    busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
+    mkdir -p "$pkgdir/usr/$_target"
+    cd "$pkgdir/usr/$_target"
+    tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk
+    rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-dcfd4a8af7c0f2ae33cacdc933f38906c9173b9a6476b04624d0dce7bf03277328bc3422182cbf0cf784495ff663326779a39d4a259064d5a740f8bea4f5a3be  busybox-static-1.35.0-r5-armhf-edge.apk
-"
+sha512sums="05645d2ffc8e3af2c17ebd7881c777e392e1bbaeaef2da0bbbb73d0045a218b00da54df99ac64570c4a3f1c6e1a43dfe5657b8b3d2ed69f52683d12c88d8d932  busybox-static-1.31.0-r0-armhf.apk"

cross/busybox-static-armv7/APKBUILD

@@ -1,36 +1,29 @@
 # Automatically generated aport, do not edit!
 # Generator: pmbootstrap aportgen busybox-static-armv7
 
-# Stub for apkbuild-lint
-if [ -z "$(type -t arch_to_hostspec)" ]; then
-	arch_to_hostspec() { :; }
-fi
-
 pkgname=busybox-static-armv7
-pkgver=1.35.0
-pkgrel=5
+pkgver=1.31.0
+pkgrel=0
 
 _arch="armv7"
-_mirror="http://dl-4.alpinelinux.org/alpine/"
+_mirror="http://dl-cdn.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="x86_64"
+arch="all"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
 
 source="
-	busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
+    busybox-static-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/busybox-static-$pkgver-r$pkgrel.apk
 "
 
 package() {
-	mkdir -p "$pkgdir/usr/$_target"
-	cd "$pkgdir/usr/$_target"
-	tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-edge.apk
-	rm .PKGINFO .SIGN.*
+    mkdir -p "$pkgdir/usr/$_target"
+    cd "$pkgdir/usr/$_target"
+    tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch.apk
+    rm .PKGINFO .SIGN.*
 }
 
-sha512sums="
-2b2ff67a0cf0ab1b1fc67458f328c7b2e91a24a6c57d4d7707c5c88a68b715af11b2ee29381aaa15946d6bccaf3d6f899f8a760ff87df2156a59bd12e67af71d  busybox-static-1.35.0-r5-armv7-edge.apk
-"
+sha512sums="f2f11245bb9fb6056341c57c51185045309470c3de3a32150e716b6e28c12d87fe72faf69edcaffb73297d15af4928a07f8d2b29dd373dd86c9af7ba53165b30  busybox-static-1.31.0-r0-armv7.apk"

cross/ccache-cross-symlinks/APKBUILD

@@ -4,7 +4,7 @@
 # ccache, which can then cache the results.
 
 pkgname=ccache-cross-symlinks
-pkgver=3
+pkgver=2
 pkgrel=0
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
@@ -30,11 +30,5 @@ package() {
 			# /native/usr/bin/ccache)
 			ln -v -s ../../../bin/ccache ${_hostspec}-${_bin}
 		done
-
-		ln -v -s ../../../bin/ccache gcc4-${_hostspec}-gcc
-		ln -v -s ../../../bin/ccache gcc6-${_hostspec}-gcc
 	done
-
-	ln -v -s ../../../bin/ccache gcc4-gcc
-	ln -v -s ../../../bin/ccache gcc6-gcc
 }

cross/crossdirect/APKBUILD

@@ -5,25 +5,22 @@
 #
 # /native/usr/lib/crossdirect/armhf/gcc
 # -> /native/usr/bin/armv6-alpine-linux-muslgnueabihf-gcc
-# /native/usr/lib/crossdirect/armhf/rustc
-# -> /native/usr/bin/rustc --target=armv6-alpine-linux-musleabihf ...
 #
 # When building packages in the armhf chroot, PATH will get prepended with
 # "/native/usr/lib/crossdirect/armhf". The end game is of course invoking the
 # cross compiler from the native chroot, running at native speed, whenever
 # calling the compiler from the foreign arch chroot. See crossdirect.c for
-# implementation details of the C version (llvm, fakeroot, rpath). The rust
-# version is implemented as simple shell wrappers.
+# implementation details (llvm, fakeroot, rpath).
 
 pkgname=crossdirect
-pkgver=4
-pkgrel=3
+pkgver=3
+pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
 license="MIT"
-options="!check"
-source="crossdirect.c rustc.sh rust-qemu-linker.sh"
+options=""
+source="crossdirect.c"
 
 build() {
 	cd "$srcdir"
@@ -40,9 +37,6 @@ build() {
 			-Werror \
 			-DHOSTSPEC="\"$_hostspec\"" \
 			crossdirect.c
-
-		# rustc
-		sed "s/@ARCH@/$_arch/g" rustc.sh >rustc-"$_arch"
 	done
 }
 
@@ -51,32 +45,22 @@ package() {
 	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"
 
-	# Rust: qemu-linker
-	install -Dm755 "$srcdir/rust-qemu-linker.sh" \
-		"$pkgdir/usr/lib/crossdirect/rust-qemu-linker"
-
 	# Iterate over architectures
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 
-		# GCC: put arch-specific crossdirect wrapper in arch-specific
-		# bin folder
+		# Put arch-specific crossdirect wrapper in arch-specific bin folder
 		_bindir="$pkgdir/usr/lib/crossdirect/$_arch"
 		_hostspec="$(arch_to_hostspec $_arch)"
 		mkdir -p "$_bindir"
 		cd "$_bindir"
 		cp "$srcdir/crossdirect-$_arch" "./"
 
-		# GCC: create compiler symlinks
+		# Create compiler symlinks
 		for _bin in $_bins; do
 			ln -s "crossdirect-$_arch" "$_bin"
 			ln -s "crossdirect-$_arch" "$_hostspec-$_bin"
 		done
-
-		# Rust: arch-specific rustc wrapper
-		install -Dm755 "$srcdir/rustc-$_arch" "$_bindir/rustc"
 	done
 }
-sha512sums="500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
-6be16ba88720e628a3ecc8fa53f8e7a21d2af268b0509745d989139874d6b94b640bfcff09575eaa19073810be6ef91169c1f83e94f5cf8e6819f2670d9408de  rustc.sh
-ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh"
+sha512sums="20b963322820de038257304c1eefa85767b78e242eda7459f06d70a1cfae5540a445aa7d5587024bf4d88a4bee28120ef9f5c2d24a648e71b542b9618318deb2  crossdirect.c"

cross/crossdirect/crossdirect.c

@@ -1,34 +1,4 @@
-/* Copyright 2020 Zhuowei Zhang, Oliver Smith
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * This program gets built to a set of wrapper executables, which launch native
- * cross compilers inside foreign arch chroots. Speeds up cross compilation a
- * lot, compared to using just qemu user mode emulation or using the previous
- * distcc-based methods.
- *
- * How this program gets called:
- * - pmbootstrap creates one native arch chroot and one foreign arch chroot.
- * - The native chroot gets mounted as /native in the foreign chroot.
- * - When calling "abuild", pmbootstrap sets PATH to:
- *   /native/usr/lib/crossdirect/<ARCH>:$PATH
- * - That crossdirect directory contains a crossdirect-<ARCH> binary built with
- *   the matching HOSTSPEC (e.g. crossdirect-aarch64 binary with HOSTSPEC
- *   aarch64-alpine-linux-musl). This binary is symlinked to:
- *	- <HOSTSPEC>-c++
- *	- <HOSTSPEC>-cc
- *	- <HOSTSPEC>-clang
- *	- <HOSTSPEC>-clang++
- *	- <HOSTSPEC>-cpp
- *	- <HOSTSPEC>-g++
- *	- <HOSTSPEC>-gcc
- *	- c++
- *	- cc
- *	- clang
- *	- clang++
- *	- cpp
- *	- g++
- *	- gcc
- */
+// HOSTSPEC is defined at compile time, see APKBUILD
 
 #include <errno.h>
 #include <libgen.h>
@@ -82,31 +52,20 @@ int main(int argc, char **argv)
 		}
 	}
 
-	// Translate "cc" to "gcc": /usr/bin/cc is a symlink to /usr/bin/gcc,
-	// but there is no <HOSTSPEC>-cc symlink (pmaports#732)
-	if (strcmp(executableName, "cc") == 0)
-		executableName = "gcc";
-
-	// prepend the HOSTSPEC to GCC binaries
 	if (isClang || startsWithHostSpec) {
 		snprintf(newExecutable, sizeof(newExecutable), NATIVE_BIN_DIR "/%s", executableName);
 	} else {
 		snprintf(newExecutable, sizeof(newExecutable), NATIVE_BIN_DIR "/" HOSTSPEC "-%s", executableName);
 	}
 
-	// prepare new arguments for GCC / clang
 	char **newArgsPtr = newargv;
 	*newArgsPtr++ = newExecutable;
 	if (isClang) {
-		// clang does not use a HOSTSPEC prefix for the cross compiler
-		// binary, but instead have a -target argument
 		*newArgsPtr++ = "-target";
 		*newArgsPtr++ = HOSTSPEC;
 	}
 	*newArgsPtr++ = "--sysroot=/";
 
-	// add all arguments passed to this executable to GCC / clang and set
-	// the last arg in newargv to NULL to mark its end
 	memcpy(newArgsPtr, argv + 1, sizeof(char *) * (argc - 1));
 	newArgsPtr += (argc - 1);
 	*newArgsPtr = NULL;
@@ -126,7 +85,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	// finally exec GCC / clang
 	if (execve(newExecutable, newargv, env) == -1) {
 		fprintf(stderr, "ERROR: crossdirect: failed to execute %s: %s\n", newExecutable, strerror(errno));
 		fprintf(stderr, "Maybe the target arch is missing in the ccache-cross-symlinks package?\n");

cross/crossdirect/rust-qemu-linker.sh

@@ -1,8 +0,0 @@
-#!/bin/sh -e
-# This wrapper gets called from the native rustc, and runs the qemu gcc for
-# linking, with LD_LIBRARY_PATH reset so it does not point to /native anymore.
-# It isn't possible to use the native cross compiler's linker with crossdirect
-# currently (pmaports#233).
-
-LD_LIBRARY_PATH=/lib:/usr/lib \
-	gcc "$@"

cross/crossdirect/rustc.sh

@@ -1,48 +0,0 @@
-#!/bin/sh -e
-
-rust_triplet() {
-	# Find the triplets in Alpine's rust APKBUILD or with:
-	# pmbootstrap chroot -barmhf --add=rust -- ls /usr/lib/rustlib
-	case "$1" in
-		x86_64)
-			echo "x86_64-alpine-linux-musl"
-			;;
-		armhf)
-			echo "armv6-alpine-linux-musleabihf"
-			;;
-		armv7)
-			echo "armv7-alpine-linux-musleabihf"
-			;;
-		aarch64)
-			echo "aarch64-alpine-linux-musl"
-			;;
-		*)
-			echo "ERROR: don't know the rust triple for $1!" >&2
-			exit 1
-			;;
-	esac
-}
-
-arch="@ARCH@" # filled in by APKBUILD
-
-if ! LD_LIBRARY_PATH=/native/lib:/native/usr/lib \
-	/native/usr/bin/rustc \
-		-Clinker=/native/usr/lib/crossdirect/rust-qemu-linker \
-		--target=$(rust_triplet "$arch") \
-		--sysroot=/usr \
-		"$@"; then
-	echo "---" >&2
-	echo "WARNING: crossdirect: cross compiling with rustc failed, trying"\
-		"again with rustc + qemu" >&2
-	echo "---" >&2
-	# Usually the crossdirect approach works; however, when passing
-	# --extern to rustc with a dynamic library (.so), it fails with an
-	# error like 'can't find crate for `serde_derive`' (although the crate
-	# does exist). I think it fails to parse the metadata of the so file
-	# for some reason. We probably need to adjust rustc's
-	# librustc_metadata/locator.rs or something (and upstream that
-	# change!), but I've spent enough time on this already. Let's simply
-	# fall back to compiling in qemu in the very few cases where this is
-	# necessary.
-	/usr/bin/rustc "$@"
-fi

cross/gcc-aarch64/0001-posix_memalign.patch

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

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

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

cross/gcc-aarch64/0002-posix_memalign.patch

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

cross/gcc-aarch64/0003-gcc-poison-system-directories.patch

@@ -0,0 +1,194 @@
+From 48c670d2678e0323d88eb72205e039f393cabe05 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 08:59:00 +0400
+Subject: [PATCH 03/39] gcc: poison-system-directories
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+---
+ gcc/common.opt      |  4 ++++
+ gcc/config.in       |  6 ++++++
+ gcc/configure       | 16 ++++++++++++++++
+ gcc/configure.ac    | 10 ++++++++++
+ gcc/doc/invoke.texi |  9 +++++++++
+ gcc/gcc.c           |  2 ++
+ gcc/incpath.c       | 19 +++++++++++++++++++
+ 7 files changed, 66 insertions(+)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index d6ef85928f3..7b29efe3882 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -679,6 +679,10 @@ Wreturn-local-addr
+ Common Var(warn_return_local_addr) Init(1) Warning
+ Warn about returning a pointer/reference to a local or temporary variable.
+ 
++Wpoison-system-directories
++Common Var(flag_poison_system_directories) Init(1) Warning
++Warn for -I and -L options using system directories if cross compiling
++
+ Wshadow
+ Common Var(warn_shadow) Warning
+ Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 5bccb408016..1c784a8276b 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -194,6 +194,12 @@
+ #endif
+ 
+ 
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++#endif
++
++
+ /* Define if you want all operations on RTL (the basic data structure of the
+    optimizer and back end) to be checked for dynamic type safety at runtime.
+    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index 5c345ce0fd7..cafd05fd150 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -953,6 +953,7 @@ with_system_zlib
+ enable_maintainer_mode
+ enable_link_mutex
+ enable_version_specific_runtime_libs
++enable_poison_system_directories
+ enable_plugin
+ enable_host_shared
+ enable_libquadmath_support
+@@ -1696,6 +1697,8 @@ Optional Features:
+   --enable-version-specific-runtime-libs
+                           specify that runtime libraries should be installed
+                           in a compiler-specific directory
++  --enable-poison-system-directories
++                          warn for use of native system header directories
+   --enable-plugin         enable plugin support
+   --enable-host-shared    build host code as shared libraries
+   --disable-libquadmath-support
+@@ -29715,6 +29718,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
++
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
++
+ # Substitute configuration variables
+ 
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 65dbf1f2f80..dd5b38195ce 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -6341,6 +6341,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+                 [specify that runtime libraries should be
+                  installed in a compiler-specific directory])])
+ 
++AC_ARG_ENABLE([poison-system-directories],
++             AS_HELP_STRING([--enable-poison-system-directories],
++                            [warn for use of native system header directories]),,
++             [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++           [1],
++           [Define to warn for use of native system header directories])
++fi
++
+ # Substitute configuration variables
+ AC_SUBST(subdirs)
+ AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 255149fcfb8..cb71b60fe3c 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -303,6 +303,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked  -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
+ -Wparentheses  -Wno-pedantic-ms-format @gol
+ -Wplacement-new  -Wplacement-new=@var{n} @gol
++-Wno-poison-system-directories @gol
+ -Wpointer-arith  -Wpointer-compare  -Wno-pointer-to-int-cast @gol
+ -Wno-pragmas  -Wredundant-decls  -Wrestrict  -Wno-return-local-addr @gol
+ -Wreturn-type  -Wsequence-point  -Wshadow  -Wno-shadow-ivar @gol
+@@ -5712,6 +5713,14 @@ made up of data only and thus requires no special treatment.  But, for
+ most targets, it is made up of code and thus requires the stack to be
+ made executable in order for the program to work properly.
+ 
++@item -Wno-poison-system-directories
++@opindex Wno-poison-system-directories
++Do not warn for @option{-I} or @option{-L} options using system
++directories such as @file{/usr/include} when cross compiling.  This
++option is intended for use in chroot environments when such
++directories contain the correct headers and libraries for the target
++system rather than the host.
++
+ @item -Wfloat-equal
+ @opindex Wfloat-equal
+ @opindex Wno-float-equal
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index a716f708259..02b3cd39fc2 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1037,6 +1037,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \
++    %{Wno-poison-system-directories:--no-poison-system-directories} \
++    %{Werror=poison-system-directories:--error-poison-system-directories} \
+     %{static|no-pie|static-pie:} %{L*} %(mfwrap) %(link_libgcc) " \
+     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \
+     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index b11c6a57939..e3b7a21966f 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
+@@ -26,6 +26,7 @@
+ #include "intl.h"
+ #include "incpath.h"
+ #include "cppdefault.h"
++#include "diagnostic-core.h"
+ 
+ /* Microsoft Windows does not natively support inodes.
+    VMS has non-numeric inodes.  */
+@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+ 	}
+       fprintf (stderr, _("End of search list.\n"));
+     }
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (flag_poison_system_directories)
++    {
++       struct cpp_dir *p;
++
++       for (p = heads[INC_QUOTE]; p; p = p->next)
++         {
++          if ((!strncmp (p->name, "/usr/include", 12))
++              || (!strncmp (p->name, "/usr/local/include", 18))
++              || (!strncmp (p->name, "/usr/X11R6/include", 18))
++              || (!strncmp (p->name, "/sw/include", 11))
++              || (!strncmp (p->name, "/opt/include", 12)))
++            warning (OPT_Wpoison_system_directories,
++                     "include location \"%s\" is unsafe for "
++                     "cross-compilation",
++                     p->name);
++         }
++    }
++#endif
+ }
+ 
+ /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.17.0
+

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

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

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

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

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

@@ -1,272 +0,0 @@
-From 8de5d46c530ceca9f4add46d5cae3cd52c38eba3 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:46:56 +0000
-Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
- but always link the sanitizer libraries with --no-as-needed.
-
----
- gcc/config/aarch64/aarch64-linux.h |  1 +
- gcc/config/alpha/linux-elf.h       |  2 +-
- gcc/config/arm/linux-elf.h         |  1 +
- gcc/config/gnu-user.h              |  6 +++---
- gcc/config/i386/gnu-user.h         |  2 +-
- gcc/config/i386/gnu-user64.h       |  1 +
- gcc/config/ia64/linux.h            |  2 +-
- gcc/config/mips/gnu-user.h         |  1 +
- gcc/config/riscv/linux.h           |  1 +
- gcc/config/rs6000/linux64.h        |  4 ++--
- gcc/config/rs6000/sysv4.h          |  2 +-
- gcc/config/s390/linux.h            |  2 +-
- gcc/config/sparc/linux.h           |  2 +-
- gcc/gcc.c                          | 28 ++++++++++++++++++++--------
- 14 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 7f2529a2a1d..b097e1688aa 100644
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
-index c1dae8ca2cf..a87dc740171 100644
---- a/gcc/config/alpha/linux-elf.h
-+++ b/gcc/config/alpha/linux-elf.h
-@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 0c1c4e70b6b..8b581afacdd 100644
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 5ebbf42a13d..902378e1bad 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
-   "%{static-libasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBHWASAN_EARLY_SPEC
- #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
-@@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
- 
- #undef TARGET_F951_OPTIONS
-diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
-index a23e7ab3eb7..12ac8cb93a9 100644
---- a/gcc/config/i386/gnu-user.h
-+++ b/gcc/config/i386/gnu-user.h
-@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index f3e25b1412a..712b0f1c30e 100644
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
-@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
-index ac40c3dfd3f..6e19e25c35a 100644
---- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
-index a390bcece83..be0ee289367 100644
---- a/gcc/config/mips/gnu-user.h
-+++ b/gcc/config/mips/gnu-user.h
-@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
-index fce5b896e6e..ee29979dd34 100644
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3.  If not see
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{mbig-endian:-EB} \
-diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index e3f2cd254f6..43499ed29cf 100644
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,13 +374,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
--#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
--#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
-index 510abe169c5..3c1f3a8ec5d 100644
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
- #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
- #endif
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index daa48fdfc2b..2fcfc5d770f 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 2550d7ee8f0..7596d0b2757 100644
---- a/gcc/config/sparc/linux.h
-+++ b/gcc/config/sparc/linux.h
-@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index faf9ce76b3d..1ad5da6d769 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -737,8 +737,11 @@ proper position among the other output files.  */
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
--		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -773,8 +776,11 @@ proper position among the other output files.  */
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
--		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -791,8 +797,11 @@ proper position among the other output files.  */
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
--		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -807,8 +816,11 @@ proper position among the other output files.  */
- #define STATIC_LIBUBSAN_LIBS \
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
--		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
--- 
-2.35.1
-

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

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

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

@@ -1,25 +0,0 @@
-From f1e92f5f3576779776c9f3d6aeef76e1569e719a Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:48:24 +0000
-Subject: [PATCH] Enable -Wtrampolines by default.
-
----
- gcc/common.opt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index d15105a73f3..29f9504cb68 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -775,7 +775,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtype-limits
--- 
-2.35.1
-

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

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

cross/gcc-aarch64/0008-s390x-muslldso.patch

@@ -0,0 +1,26 @@
+From b693804c8dba92fea7beee98f0aa520853a0532b Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Thu, 22 Dec 2016 11:22:28 +0000
+Subject: [PATCH 08/12] s390x muslldso
+
+---
+ gcc/config/s390/linux.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 525c17c2c9f..2d4f4a0654e 100644
+--- a/gcc/config/s390/linux.h
++++ b/gcc/config/s390/linux.h
+@@ -76,6 +76,9 @@ along with GCC; see the file COPYING3.  If not see
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+ 
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
++
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+   "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
+-- 
+2.17.1
+

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

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

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

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

cross/gcc-aarch64/0010-ldbl128-config.patch

@@ -0,0 +1,76 @@
+From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Wed, 28 Feb 2018 00:54:05 +0000
+Subject: [PATCH 10/12] ldbl128 config
+
+---
+ gcc/configure    | 13 +++++++++++++
+ gcc/configure.ac | 16 ++++++++++++++--
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 6121e163259..07ff8597d48 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then :
+   withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
+ else
+ 
++      case "$target" in
++	s390*-*-linux-musl*)
++	  gcc_cv_target_ldbl128=yes
++	  ;;
++	powerpc*-*-linux-musl*)
++	  gcc_cv_target_ldbl128=no
++	  ;;
++	*)
++
+ if test $glibc_version_major -gt 2 \
+   || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
+   gcc_cv_target_ldbl128=yes
+@@ -29320,6 +29329,10 @@ else
+       && gcc_cv_target_ldbl128=yes
+ 
+ fi
++
++	  ;;
++      esac
++
+ fi
+ 
+     ;;
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index b066cc609e1..6c15ed898c0 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -5971,13 +5971,25 @@ case "$target" in
+     AC_ARG_WITH(long-double-128,
+       [AS_HELP_STRING([--with-long-double-128],
+ 		      [use 128-bit long double by default])],
+-      gcc_cv_target_ldbl128="$with_long_double_128",
++      gcc_cv_target_ldbl128="$with_long_double_128", [
++      case "$target" in
++	s390*-*-linux-musl*)
++	  gcc_cv_target_ldbl128=yes
++	  ;;
++	powerpc*-*-linux-musl*)
++	  gcc_cv_target_ldbl128=no
++	  ;;
++	*)]
+       [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
+       [gcc_cv_target_ldbl128=no
+       grep '^[ 	]*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
+         $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+       && gcc_cv_target_ldbl128=yes
+-      ]])])
++      ]])]
++      [
++	  ;;
++      esac
++      ])
+     ;;
+ esac
+ if test x$gcc_cv_target_ldbl128 = xyes; then
+-- 
+2.17.1
+

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

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

cross/gcc-aarch64/0012-libitm-disable-FORTIFY.patch

@@ -1,33 +0,0 @@
-From 3b732288ce771348cbcc9fb633a36b7aff2b4ad4 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:53:36 +0000
-Subject: [PATCH] libitm: disable FORTIFY
-
----
- libitm/configure.tgt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index a3d84896cc5..ecb281d5919 100644
---- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
-@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then
-   esac
- fi
- 
-+# FIXME: error: inlining failed in call to always_inline 
-+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’
-+# : function body can be overwritten at link time
-+# Disable Fortify in libitm for now. #508852
-+case "${target}" in
-+    *-*-linux*)
-+	XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE"
-+	;;
-+esac
-+
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
--- 
-2.35.1
-

cross/gcc-aarch64/0012-static-pie.patch

@@ -0,0 +1,138 @@
+From a4aa319f7c19e564dced3daeb7222c9315af936c Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 18 Aug 2018 23:58:45 +0000
+Subject: [PATCH 12/12] static-pie
+
+in gcc-8 -static means static non-pie, even if -pie or -static-pie
+are specified, -static-pie can be used to build static pie.
+
+in musl toolchains -static -pie always meant static pie, so this
+patch fixes the link specs accordingly, the new -static-pie is just
+an alias to -static -pie.
+---
+ gcc/common.opt            |  4 ++--
+ gcc/config/gnu-user.h     | 12 +++++-------
+ gcc/config/rs6000/sysv4.h | 11 +++++------
+ gcc/gcc.c                 |  6 +++---
+ 4 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index b52ef0b38c8..0ce5857e01d 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -3197,11 +3197,11 @@ Driver
+ 
+ no-pie
+ Driver RejectNegative Negative(shared)
+-Don't create a dynamically linked position independent executable.
++Don't create a position independent executable.
+ 
+ pie
+ Driver RejectNegative Negative(no-pie)
+-Create a dynamically linked position independent executable.
++Create a position independent executable.
+ 
+ static-pie
+ Driver RejectNegative Negative(pie)
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index 8620de3e42d..235328a2642 100644
+--- a/gcc/config/gnu-user.h
++++ b/gcc/config/gnu-user.h
+@@ -52,13 +52,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define GNU_USER_TARGET_STARTFILE_SPEC \
+   "%{shared:; \
+      pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \
+-     static:crt1.o%s; \
+-     static-pie:rcrt1.o%s; \
++     static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
+      " PIE_SPEC ":Scrt1.o%s; \
+      :crt1.o%s} \
+    crti.o%s \
+-   %{static:crtbeginT.o%s; \
+-     shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
++   %{shared|" PIE_SPEC ":crtbeginS.o%s; \
++     static:crtbeginT.o%s; \
+      :crtbegin.o%s} \
+    %{fvtable-verify=none:%s; \
+      fvtable-verify=preinit:vtv_start_preinit.o%s; \
+@@ -92,8 +91,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   "%{fvtable-verify=none:%s; \
+      fvtable-verify=preinit:vtv_end_preinit.o%s; \
+      fvtable-verify=std:vtv_end.o%s} \
+-   %{static:crtend.o%s; \
+-     shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
++   %{shared|" PIE_SPEC ":crtendS.o%s; \
+      :crtend.o%s} \
+    crtn.o%s \
+    " CRTOFFLOADEND
+@@ -133,7 +131,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
+ 
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+-#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
++#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} "
+ #endif
+ 
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index bb19d0dcd41..bb2a2324eb0 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -763,12 +763,12 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+ #define	STARTFILE_LINUX_SPEC \
+   "%{shared:; \
+      pg|p|profile:gcrt1.o%s; \
+-     static:crt1.o%s; \
+-     static-pie|" PIE_SPEC ":Scrt1.o%s; \
++     static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
++     " PIE_SPEC ":Scrt1.o%s; \
+      :crt1.o%s} \
+    %{mnewlib:ecrti.o%s;:crti.o%s} \
+-   %{static:crtbeginT.o%s; \
+-     shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
++   %{shared|" PIE_SPEC ":crtbeginS.o%s; \
++     static:crtbeginT.o%s; \
+      :crtbegin.o%s} \
+    %{fvtable-verify=none:%s; \
+      fvtable-verify=preinit:vtv_start_preinit.o%s; \
+@@ -781,8 +781,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
+   "%{fvtable-verify=none:%s; \
+      fvtable-verify=preinit:vtv_end_preinit.o%s; \
+      fvtable-verify=std:vtv_end.o%s} \
+-   %{static:crtend.o%s; \
+-     shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
++   %{shared|" PIE_SPEC ":crtendS.o%s; \
+      :crtend.o%s} \
+    %{mnewlib:ecrtn.o%s;:crtn.o%s} \
+    " CRTOFFLOADEND
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index eb1610ba8b0..87560afb03c 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -900,7 +900,7 @@ proper position among the other output files.  */
+ #define NO_FPIE_AND_FPIC_SPEC	NO_FPIE_SPEC "|" NO_FPIC_SPEC
+ #define FPIE_OR_FPIC_SPEC	NO_FPIE_AND_FPIC_SPEC ":;"
+ #else
+-#define PIE_SPEC		"pie"
++#define PIE_SPEC		"pie|static-pie"
+ #define FPIE1_SPEC		"fpie"
+ #define NO_FPIE1_SPEC		FPIE1_SPEC ":;"
+ #define FPIE2_SPEC		"fPIE"
+@@ -924,12 +924,12 @@ proper position among the other output files.  */
+ #ifndef LINK_PIE_SPEC
+ #ifdef HAVE_LD_PIE
+ #ifndef LD_PIE_SPEC
+-#define LD_PIE_SPEC "-pie"
++#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}"
+ #endif
+ #else
+ #define LD_PIE_SPEC ""
+ #endif
+-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
++#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
+ #endif
+ 
+ #ifndef LINK_BUILDID_SPEC
+-- 
+2.17.1
+

cross/gcc-aarch64/0013-libgcc_s.patch

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

cross/gcc-aarch64/0014-nopie.patch

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

cross/gcc-aarch64/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch

@@ -1,25 +0,0 @@
-From 37310cabb8bc7256899c4d45cc68a47ca2a3232b Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:57:09 +0000
-Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl
-
----
- libffi/src/closures.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libffi/src/closures.c b/libffi/src/closures.c
-index 721ff00ea43..22a699c6340 100644
---- a/libffi/src/closures.c
-+++ b/libffi/src/closures.c
-@@ -34,7 +34,7 @@
- #include <ffi_common.h>
- 
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
--- 
-2.35.1
-

cross/gcc-aarch64/0016-dlang-update-zlib-binding.patch

@@ -1,425 +0,0 @@
-From 586e82425a024d85d1bd9952ca51d8a671aa9b5d Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:57:51 +0000
-Subject: [PATCH] dlang: update zlib binding
-
----
- libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++-----------
- 1 file changed, 196 insertions(+), 70 deletions(-)
-
-diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
-index e6cce240fd5..bd2fe37ebec 100644
---- a/libphobos/src/std/zlib.d
-+++ b/libphobos/src/std/zlib.d
-@@ -1,7 +1,7 @@
- // Written in the D programming language.
- 
- /**
-- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library).
-+ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library).
-  *
-  * Examples:
-  *
-@@ -43,12 +43,12 @@
-  * References:
-  *  $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia)
-  *
-- * Copyright: Copyright Digital Mars 2000 - 2011.
-+ * Copyright: Copyright The D Language Foundation 2000 - 2011.
-  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-  * Authors:   $(HTTP digitalmars.com, Walter Bright)
-- * Source:    $(PHOBOSSRC std/_zlib.d)
-+ * Source:    $(PHOBOSSRC std/zlib.d)
-  */
--/*          Copyright Digital Mars 2000 - 2011.
-+/*          Copyright The D Language Foundation 2000 - 2011.
-  * Distributed under the Boost Software License, Version 1.0.
-  *    (See accompanying file LICENSE_1_0.txt or copy at
-  *          http://www.boost.org/LICENSE_1_0.txt)
-@@ -75,9 +75,9 @@ enum
- 
- class ZlibException : Exception
- {
--    this(int errnum)
--    {   string msg;
--
-+    private static string getmsg(int errnum) nothrow @nogc pure @safe
-+    {
-+        string msg;
-         switch (errnum)
-         {
-             case Z_STREAM_END:      msg = "stream end"; break;
-@@ -90,7 +90,12 @@ class ZlibException : Exception
-             case Z_VERSION_ERROR:   msg = "version error"; break;
-             default:                msg = "unknown error";  break;
-         }
--        super(msg);
-+        return msg;
-+    }
-+
-+    this(int errnum)
-+    {
-+        super(getmsg(errnum));
-     }
- }
- 
-@@ -104,7 +109,7 @@ class ZlibException : Exception
-  *     buf = buffer containing input data
-  *
-  * Returns:
-- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Adler-32)
-@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf)
-  *     buf = buffer containing input data
-  *
-  * Returns:
-- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
-@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf)
- ubyte[] compress(const(void)[] srcbuf, int level)
- in
- {
--    assert(-1 <= level && level <= 9);
-+    assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9].");
- }
--body
-+do
- {
-     import core.memory : GC;
-+    import std.array : uninitializedArray;
-     auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
--    auto destbuf = new ubyte[destlen];
-+    auto destbuf = uninitializedArray!(ubyte[])(destlen);
-     auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
-     if (err)
-     {
-@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15)
-                 throw new ZlibException(err);
-         }
-     }
--    assert(0);
-+    assert(0, "Unreachable code");
- }
- 
- @system unittest
-@@ -370,9 +376,9 @@ class Compress
-     this(int level, HeaderFormat header = HeaderFormat.deflate)
-     in
-     {
--        assert(1 <= level && level <= 9);
-+        assert(1 <= level && level <= 9, "Legal compression level are in [1, 9].");
-     }
--    body
-+    do
-     {
-         this.level = level;
-         this.gzip = header == HeaderFormat.gzip;
-@@ -406,6 +412,7 @@ class Compress
-     const(void)[] compress(const(void)[] buf)
-     {
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
-         ubyte[] destbuf;
- 
-@@ -420,7 +427,7 @@ class Compress
-             inited = 1;
-         }
- 
--        destbuf = new ubyte[zs.avail_in + buf.length];
-+        destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length);
-         zs.next_out = destbuf.ptr;
-         zs.avail_out = to!uint(destbuf.length);
- 
-@@ -461,9 +468,10 @@ class Compress
-     void[] flush(int mode = Z_FINISH)
-     in
-     {
--        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH);
-+        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH,
-+                "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH.");
-     }
--    body
-+    do
-     {
-         import core.memory : GC;
-         ubyte[] destbuf;
-@@ -523,6 +531,7 @@ class UnCompress
-     z_stream zs;
-     int inited;
-     int done;
-+    bool inputEnded;
-     size_t destbufsize;
- 
-     HeaderFormat format;
-@@ -571,16 +580,16 @@ class UnCompress
-     const(void)[] uncompress(const(void)[] buf)
-     in
-     {
--        assert(!done);
-+        assert(!done, "Buffer has been flushed.");
-     }
--    body
-+    do
-     {
-+        if (inputEnded || !buf.length)
-+            return null;
-+
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
--        ubyte[] destbuf;
--
--        if (buf.length == 0)
--            return null;
- 
-         if (!inited)
-         {
-@@ -598,26 +607,152 @@ class UnCompress
- 
-         if (!destbufsize)
-             destbufsize = to!uint(buf.length) * 2;
--        destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
--        zs.next_out = destbuf.ptr;
--        zs.avail_out = to!uint(destbuf.length);
--
--        if (zs.avail_in)
--            buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf;
-+        auto destbuf = uninitializedArray!(ubyte[])(destbufsize);
-+        size_t destFill;
- 
-         zs.next_in = cast(ubyte*) buf.ptr;
-         zs.avail_in = to!uint(buf.length);
- 
--        err = inflate(&zs, Z_NO_FLUSH);
--        if (err != Z_STREAM_END && err != Z_OK)
-+        while (true)
-         {
--            GC.free(destbuf.ptr);
--            error(err);
-+            auto oldAvailIn = zs.avail_in;
-+
-+            zs.next_out = destbuf[destFill .. $].ptr;
-+            zs.avail_out = to!uint(destbuf.length - destFill);
-+
-+            err = inflate(&zs, Z_NO_FLUSH);
-+            if (err == Z_STREAM_END)
-+            {
-+                inputEnded = true;
-+                break;
-+            }
-+            else if (err != Z_OK)
-+            {
-+                GC.free(destbuf.ptr);
-+                error(err);
-+            }
-+            else if (!zs.avail_in)
-+                break;
-+
-+            /*
-+                According to the zlib manual inflate() stops when either there's
-+                no more data to uncompress or the output buffer is full
-+                So at this point, the output buffer is too full
-+            */
-+
-+            destFill = destbuf.length;
-+
-+            if (destbuf.capacity)
-+            {
-+                if (destbuf.length < destbuf.capacity)
-+                    destbuf.length = destbuf.capacity;
-+                else
-+                {
-+                    auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize);
-+
-+                    if (newLength && destbuf.length < destbuf.capacity)
-+                        destbuf.length = destbuf.capacity;
-+                    else
-+                        destbuf.length += destbufsize;
-+                }
-+            }
-+            else
-+                destbuf.length += destbufsize;
-         }
-+
-         destbuf.length = destbuf.length - zs.avail_out;
-         return destbuf;
-     }
- 
-+    // Test for issues 3191 and 9505
-+    @system unittest
-+    {
-+        import std.algorithm.comparison;
-+        import std.array;
-+        import std.file;
-+        import std.zlib;
-+
-+        // Data that can be easily compressed
-+        ubyte[1024] originalData;
-+
-+        // This should yield a compression ratio of at least 1/2
-+        auto compressedData = compress(originalData, 9);
-+        assert(compressedData.length < originalData.length / 2,
-+                "The compression ratio is too low to accurately test this situation");
-+
-+        auto chunkSize = compressedData.length / 4;
-+        assert(chunkSize < compressedData.length,
-+                "The length of the compressed data is too small to accurately test this situation");
-+
-+        auto decompressor = new UnCompress();
-+        ubyte[originalData.length] uncompressedData;
-+        ubyte[] reusedBuf;
-+        int progress;
-+
-+        reusedBuf.length = chunkSize;
-+
-+        for (int i = 0; i < compressedData.length; i += chunkSize)
-+        {
-+            auto len = min(chunkSize, compressedData.length - i);
-+            // simulate reading from a stream in small chunks
-+            reusedBuf[0 .. len] = compressedData[i .. i + len];
-+
-+            // decompress using same input buffer
-+            auto chunk = decompressor.uncompress(reusedBuf);
-+            assert(progress + chunk.length <= originalData.length,
-+                    "The uncompressed result is bigger than the original data");
-+
-+            uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+            progress += chunk.length;
-+        }
-+
-+        auto chunk = decompressor.flush();
-+        assert(progress + chunk.length <= originalData.length,
-+                "The uncompressed result is bigger than the original data");
-+
-+        uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+        progress += chunk.length;
-+
-+        assert(progress == originalData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[1024] invalidData;
-+        auto decompressor = new UnCompress();
-+
-+        try
-+        {
-+            auto uncompressedData = decompressor.uncompress(invalidData);
-+        }
-+        catch (ZlibException e)
-+        {
-+            assert(e.msg == "data error");
-+            return;
-+        }
-+
-+        assert(false, "Corrupted data didn't result in an error");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[2014] originalData = void;
-+        auto compressedData = compress(originalData, 9);
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever");
-+
-+        assert(originalData.length == uncompressedData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+        assert(!decompressor.uncompress("whatever").length,
-+                "Compression continued after the end");
-+    }
-+
-     /**
-      * Decompress and return any remaining data.
-      * The returned data should be appended to that returned by uncompress().
-@@ -626,49 +761,40 @@ class UnCompress
-     void[] flush()
-     in
-     {
--        assert(!done);
-+        assert(!done, "Buffer has been flushed before.");
-     }
-     out
-     {
--        assert(done);
-+        assert(done, "Flushing failed.");
-     }
--    body
-+    do
-     {
--        import core.memory : GC;
--        ubyte[] extra;
--        ubyte[] destbuf;
--        int err;
--
-         done = 1;
--        if (!inited)
--            return null;
-+        return null;
-+    }
- 
--      L1:
--        destbuf = new ubyte[zs.avail_in * 2 + 100];
--        zs.next_out = destbuf.ptr;
--        zs.avail_out = to!uint(destbuf.length);
-+    /// Returns true if all input data has been decompressed and no further data
-+    /// can be decompressed (inflate() returned Z_STREAM_END)
-+    @property bool empty() const
-+    {
-+        return inputEnded;
-+    }
- 
--        err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
--        if (err == Z_OK && zs.avail_out == 0)
--        {
--            extra ~= destbuf;
--            goto L1;
--        }
--        if (err != Z_STREAM_END)
--        {
--            GC.free(destbuf.ptr);
--            if (err == Z_OK)
--                err = Z_BUF_ERROR;
--            error(err);
--        }
--        destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
--        err = etc.c.zlib.inflateEnd(&zs);
--        inited = 0;
--        if (err)
--            error(err);
--        if (extra.length)
--            destbuf = extra ~ destbuf;
--        return destbuf;
-+    ///
-+    @system unittest
-+    {
-+        // some random data
-+        ubyte[1024] originalData = void;
-+
-+        // append garbage data (or don't, this works in both cases)
-+        auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever";
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData);
-+
-+        assert(uncompressedData[] == originalData[],
-+                "The uncompressed and the original data differ");
-+        assert(decompressor.empty, "The UnCompressor reports not being done");
-     }
- }
- 
--- 
-2.35.1
-

cross/gcc-aarch64/0016-invalid_tls_model.patch

@@ -0,0 +1,25 @@
+--- ./libgomp/configure.tgt.orig	2018-09-25 13:44:16.654561098 -0400
++++ ./libgomp/configure.tgt	2018-09-25 13:44:50.452688100 -0400
+@@ -10,23 +10,6 @@
+ #  XCFLAGS		Add extra compile flags to use.
+ #  XLDFLAGS		Add extra link flags to use.
+ 
+-# Optimize TLS usage by avoiding the overhead of dynamic allocation.
+-if test $gcc_cv_have_tls = yes ; then
+-  case "${target}" in
+-
+-    *-*-k*bsd*-gnu*)
+-	;;
+-
+-    *-*-linux* | *-*-gnu*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
+-	;;
+-
+-    *-*-rtems*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
+-	;;
+-  esac
+-fi
+-
+ # Since we require POSIX threads, assume a POSIX system by default.
+ config_path="posix"

cross/gcc-aarch64/0017-dlang-use-libucontext-on-mips64.patch

@@ -1,24 +0,0 @@
-From 26daa73d678b87a6950df1d79d171ba40ecbce15 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:18:32 +0000
-Subject: [PATCH] dlang: use libucontext on mips64
-
----
- libphobos/configure.tgt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt
-index 0643daeb613..b74d9fb3f25 100644
---- a/libphobos/configure.tgt
-+++ b/libphobos/configure.tgt
-@@ -38,6 +38,7 @@ case "${target}" in
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   power*-*-freebsd*)
- 	LIBPHOBOS_SUPPORTED=yes
--- 
-2.35.1
-

cross/gcc-aarch64/0018-dlang-libdruntime-define-fcntl.h-constants-for-mips6.patch

@@ -1,38 +0,0 @@
-From caeae8288593dbd5a1a6d93508d875eb0d8fdf49 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 6 Jan 2022 03:19:12 +0000
-Subject: [PATCH] dlang: libdruntime: define fcntl.h constants for mips64
-
----
- libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
-index 59df921ba41..9ee9f943948 100644
---- a/libphobos/libdruntime/core/sys/posix/fcntl.d
-+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -871,6 +871,21 @@ else version (CRuntime_Musl)
-             F_SETLKW       = 7,
-         }
-     }
-+    else version (MIPS_Any)
-+    {
-+        enum 
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x008000, // octal   0100000
-+            O_LARGEFILE     = 0x002000, // octal   0020000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 33,
-+            F_SETLK        = 34,
-+            F_SETLKW       = 35,
-+        }
-+    }
-     else
-         static assert(0, "Platform not supported");
- 
--- 
-2.35.1
-

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

@@ -1,42 +0,0 @@
-From 374a19de60fcd5c31321c3f4d26dcc4b631e8c3f Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 21 Aug 2020 06:59:16 +0000
-Subject: [PATCH] ada: fix shared linking
-
----
- gcc/ada/link.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 5cd5ef64f56..1c611a82cab 100644
---- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
-    || defined (__NetBSD__) || defined (__OpenBSD__) \
-    || defined (__QNX__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
- 
- #elif defined (__linux__) || defined (__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
--- 
-2.35.1
-

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

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