Skip to content

Commit 8722c7a

Browse files
interrualyssais
authored andcommitted
lib.systems: add znver5 architecture
1 parent d9867f6 commit 8722c7a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

lib/systems/architectures.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ rec {
4040
znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
4141
znver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ];
4242
znver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ];
43+
znver5 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "avx512" "fma" ];
4344
# other
4445
armv5te = [ ];
4546
armv6 = [ ];
@@ -113,6 +114,7 @@ rec {
113114
znver2 = [ "znver1" ] ++ inferiors.znver1;
114115
znver3 = [ "znver2" ] ++ inferiors.znver2;
115116
znver4 = lib.unique ([ "znver3" "x86-64-v4" ] ++ inferiors.znver3 ++ inferiors.x86-64-v4);
117+
znver5 = [ "znver4" ] ++ inferiors.znver4;
116118

117119
# other
118120
armv5te = [ ];

pkgs/build-support/cc-wrapper/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ let
172172
znver2 = versionAtLeast ccVersion "9.0";
173173
znver3 = versionAtLeast ccVersion "11.0";
174174
znver4 = versionAtLeast ccVersion "13.0";
175+
znver5 = versionAtLeast ccVersion "14.0";
175176
}.${arch} or true
176177
else if isClang then
177178
{ #Generic
@@ -193,6 +194,7 @@ let
193194
znver2 = versionAtLeast ccVersion "9.0";
194195
znver3 = versionAtLeast ccVersion "12.0";
195196
znver4 = versionAtLeast ccVersion "16.0";
197+
znver5 = versionAtLeast ccVersion "19.1";
196198
}.${arch} or true
197199
else
198200
false;

0 commit comments

Comments
 (0)