From b93057256fa982d985a80b3d3d52f783f2d3ef7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Jun 2023 16:45:45 +0300 Subject: 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. --- guix/cpu.scm | 16 +--------------- 1 file changed, 1 insertion(+), 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? -- cgit 1.4.1