Unverified Commit 92a47030 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

Merge pull request #238133 from LibreCybernetics/add-znver4-arch 

lib.systems: add znver4 architecture
parents a7b22181 1b7776a3

lib/systems/architectures.nix

+2 −0
Original line number Diff line number Diff line
@@ -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        = [ ];

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

+3 −0
Original line number Diff line number Diff line
@@ -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;