From 8722c7acbdc204d8131daf94ccd28c3baed1b39e Mon Sep 17 00:00:00 2001 From: Mathias Koehler Date: Sun, 9 Feb 2025 15:13:34 +0100 Subject: [PATCH] lib.systems: add znver5 architecture --- lib/systems/architectures.nix | 2 ++ pkgs/build-support/cc-wrapper/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index a31b25772f29..d277ac9ce70f 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -40,6 +40,7 @@ rec { znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; znver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; znver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ]; + znver5 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ]; # other armv5te = [ ]; armv6 = [ ]; @@ -113,6 +114,7 @@ rec { znver2 = [ "znver1" ] ++ inferiors.znver1; znver3 = [ "znver2" ] ++ inferiors.znver2; znver4 = lib.unique ([ "znver3" "x86-64-v4" ] ++ inferiors.znver3 ++ inferiors.x86-64-v4); + znver5 = [ "znver4" ] ++ inferiors.znver4; # other armv5te = [ ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 54c1158e5dae..134fe3782799 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -172,6 +172,7 @@ let znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; znver4 = versionAtLeast ccVersion "13.0"; + znver5 = versionAtLeast ccVersion "14.0"; }.${arch} or true else if isClang then { #Generic @@ -193,6 +194,7 @@ let znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "12.0"; znver4 = versionAtLeast ccVersion "16.0"; + znver5 = versionAtLeast ccVersion "19.1"; }.${arch} or true else false;