diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2024-03-06 09:14:03 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-03-07 13:04:27 +0200 |
| commit | 7700dc2cf5e1ada04a6fbcbffbe150f8274ab502 (patch) | |
| tree | c3d749026a2efc57abe2a4b1266682a18b04ca63 /gnu | |
| parent | 63165a94862c2b338e329cbd781712c7a7a1b475 (diff) | |
cpu: Rename x86-64-v1 to x86-64.
This is the actual micro-architecture designation used by compilers.
* gnu/packages/gcc.scm (%gcc-11-x86_64-micro-architectures): Rename
x86-64-v1 to x86-64.
* gnu/packages/golang.scm (%go-1.18-x86_64-micro-architectures): Same.
* guix/cpu.scm (cpu->micro-architecture-level): Same.
(gcc-architecture->micro-architecture-level): Same.
Change-Id: I19ed556a7e8deb4a77f4c63fca3b794f25092788
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gcc.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/golang.scm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3abecdeadd..3555d12c44 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -624,7 +624,7 @@ Go. It also includes runtime support libraries for these languages.") "btver1" "btver2" ;AMD ;; psABI micro-architecture levels - "x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4"))) + "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4"))) ;; Suitable '-march' values for GCC 12. (define %gcc-12-aarch64-micro-architectures diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 670056f8a0..49e25320fa 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -870,7 +870,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)))))) (define %go-1.18-x86_64-micro-architectures - (list "x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4")) + ;; GOAMD defaults to 'v1' so we match the default elsewhere. + (list "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) (define-public go-1.18 (package |