summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-06-19 16:45:45 +0300
committerEfraim Flashner <efraim@flashner.co.il>2023-07-12 16:48:28 +0300
commitb93057256fa982d985a80b3d3d52f783f2d3ef7b (patch)
treeb50bcb80451279b35af2ecaa0e690869756ea11e
parentcb0cab2db05cc0264e7ed66f9b6336ed9b0eae64 (diff)
downloadguix-b93057256fa982d985a80b3d3d52f783f2d3ef7b.tar.gz
guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture.
* guix/cpu.scm (cpu->gcc-architecture): Adjust the fallback case to use
cpu->micro-architecture-level.
-rw-r--r--guix/cpu.scm16
1 files changed, 1 insertions, 15 deletions
diff --git a/guix/cpu.scm b/guix/cpu.scm
index 3fc12327ed..1a75b8ac62 100644
--- a/guix/cpu.scm
+++ b/guix/cpu.scm
@@ -209,21 +209,7 @@ corresponds to CPU, a record as returned by 'current-cpu'."
            (if (and (= 7 (cpu-family cpu))
                     (= #x3b (cpu-model cpu)))
              "lujiazui"
-             (if-flags ("avx512" => "knl")
-                       ("adx" => "broadwell")
-                       ("avx2" => "haswell")
-                       ;; TODO: tigerlake, cooperlake, etc.
-                       ("avx" => "sandybridge")
-                       ("sse4_2" "gfni" => "tremont")
-                       ("sse4_2" "sgx" => "goldmont-plus")
-                       ("sse4_2" "xsave" => "goldmont")
-                       ("sse4_2" "movbe" => "silvermont")
-                       ("sse4_2" => "nehalem")
-                       ("ssse3" "movbe" => "bonnell")
-                       ("ssse3" "sse3" "longmode" => "nocona")
-                       ("ssse3" "sse3" "lm" => "nocona")
-                       ("ssse3" "sse3" => "prescott")
-                       ("ssse3" => "core2"))))
+             (cpu->micro-architecture-level cpu))
 
          ;; TODO: Recognize CENTAUR/CYRIX/NSC?