diff options
author | Atemu <atemu.main@gmail.com> | 2023-03-07 19:25:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-07 19:25:32 +0100 |
commit | 19e81a926926b159e426c58be1a0fbb6eb8225de (patch) | |
tree | 5ca535f07ab7df0eb5db2b734a8a73999cb5c397 /lib | |
parent | 02cd0a5dfcb99b162791bade2d2888c8187a6a92 (diff) | |
parent | 44e5b41871ed5afdaa927e4bbf7c00362ebf54cb (diff) |
Merge pull request #211950 from Atemu/armv8-no-more-armv7
lib/systems/parse: stop considering armv8a able to execute armv7l
Diffstat (limited to 'lib')
-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 8fb13af1f530f..5987cf1b5d245 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -182,23 +182,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) |