diff options
| author | Atemu <atemu.main@gmail.com> | 2023-01-21 16:03:35 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-03-08 07:30:31 +0000 |
| commit | 92d167755e1c1928234806b6145aa642f04af975 (patch) | |
| tree | d747e95fa1842ba1b46099593639224a38e6331a | |
| parent | Merge pull request #220012 from NixOS/backport-216957-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-211950-to-release-22.11.tar.gz | |
lib/systems/parse: stop considering armv8a able to execute armv7lorigin/backport-211950-to-release-22.11
In the past, most (if not all) armv8 CPUs could also execute armv7. However,
with the advent of Apple Silicon, aarch64 CPUs without any aarch32 capabilities
are now wide-spread among users.
(cherry picked from commit 44e5b41871ed5afdaa927e4bbf7c00362ebf54cb)
| -rw-r--r-- | lib/systems/parse.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 43e4473667d5..0e8f6f9297ac 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -178,23 +178,12 @@ rec { (b == armv7l && isCompatible a armv7a) (b == armv7l && isCompatible a armv7r) (b == armv7l && isCompatible a armv7m) - (b == armv7a && isCompatible a armv8a) - (b == armv7r && isCompatible a armv8a) - (b == armv7m && isCompatible a armv8a) - (b == armv7a && isCompatible a armv8r) - (b == armv7r && isCompatible a armv8r) - (b == armv7m && isCompatible a armv8r) - (b == armv7a && isCompatible a armv8m) - (b == armv7r && isCompatible a armv8m) - (b == armv7m && isCompatible a armv8m) # ARMv8 - (b == armv8r && isCompatible a armv8a) - (b == armv8m && isCompatible a armv8a) - - # XXX: not always true! Some arm64 cpus don’t support arm32 mode. (b == aarch64 && a == armv8a) (b == armv8a && isCompatible a aarch64) + (b == armv8r && isCompatible a armv8a) + (b == armv8m && isCompatible a armv8a) # PowerPC (b == powerpc && isCompatible a powerpc64) |