From 1b7776a3fb8962b6ea985ec8bf9d95d0403e373a Mon Sep 17 00:00:00 2001 From: Fabián Heredia Montiel Date: Wed, 14 Jun 2023 22:41:43 -0600 Subject: lib.systems: add znver4 architecture --- lib/systems/architectures.nix | 2 ++ pkgs/build-support/cc-wrapper/default.nix | 3 +++ 2 files changed, 5 insertions(+) diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index 57b9184ca60cd..f8cf0e2b933f3 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -28,6 +28,7 @@ rec { znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; 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" ]; # other armv5te = [ ]; armv6 = [ ]; @@ -86,6 +87,7 @@ rec { znver1 = [ "skylake" ] ++ inferiors.skylake; znver2 = [ "znver1" ] ++ inferiors.znver1; znver3 = [ "znver2" ] ++ inferiors.znver2; + znver4 = [ "znver3" ] ++ inferiors.znver3; # other armv5te = [ ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e4dcb81346697..84c5a78b877bf 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -120,6 +120,7 @@ let znver1 = versionAtLeast ccVersion "6.0"; znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; + znver4 = versionAtLeast ccVersion "13.0"; }.${arch} or true else if isClang then { # Intel @@ -130,6 +131,8 @@ let # AMD znver1 = versionAtLeast ccVersion "4.0"; znver2 = versionAtLeast ccVersion "9.0"; + znver3 = versionAtLeast ccVersion "12.0"; + znver4 = versionAtLeast ccVersion "16.0"; }.${arch} or true else false; -- cgit 1.4.1