From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0CFOFe9O6GWWtwAA62LTzQ:P1 (envelope-from ) for ; Wed, 06 Mar 2024 12:09:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 0CFOFe9O6GWWtwAA62LTzQ (envelope-from ) for ; Wed, 06 Mar 2024 12:09:35 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GRW3VvrV; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709723375; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=haIdqHDAYsBUwWxc1th8krb6BdFhKfDBY38n7LZmi+8=; b=BD1Xg7/aEgYdQ6Wm58fXTApmlfG+V01oRPb6yMO1vlw/QOpT5nlupc7AAtwZeGd/3Y8LsE SveexKvzuR8EvpBj0N+/dUGymRNzgBoAyc6fnD3bILq538Vb8pA1A2/wR0gJJ7tYaODZ7z AoXkFQOkht9vrVjeDO8DUEvrciFYOuRAZ9hUf+UJQ+gk/HArTesPF5wqz/wKR34TwHFaR7 tt00Wtlxx0hhj/857f3v7OmQ1xtSd9vnxkQrNCZfuVP0tUJhvHBKW1rBclnSqVS05rtffF 5P3vM4Fo7hX7fKEd1B32dQb0byqnb0gMIRaVcrN0g3l0JN/DDpDFy3HcKPvaJQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GRW3VvrV; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709723375; a=rsa-sha256; cv=none; b=SCHzqnJ2VPtJjYv+iwu16OqZC42D5n/WNW8PEn3Pe7OfYjXffsYD3bPkI/jQ8Y9+2+Rzb4 TG6Zw1IWUTiluYUS65FDIB8TilBg7yeikO5g+KQ/XzPUSRB+FH+HLg4ixNiR1NKGblM7B4 g3hAxVpG8PLUsFRVu8QWTRRYgrLTeZz1RpQhxG7z+L4KOox/CNTDdI4lKlzJXrcXfgXcza uQiALIP8gm+9SHQCmuTKSfG6Ii5HJ6ug5QpSzZgZPcoWbDelv/ZLYxN2C/4B0JtC9GY1xq oBPhmjKAFFgzY6MDm8HmwKYHoMIh24qC4Kno+iYRk5dXpZqFYdZsXj92+GiKrw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1E3D042769 for ; Wed, 6 Mar 2024 12:09:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhp9D-00011u-Pu; Wed, 06 Mar 2024 06:09:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhp8V-0000oB-Np for guix-patches@gnu.org; Wed, 06 Mar 2024 06:08:35 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhp8U-0007cT-HN; Wed, 06 Mar 2024 06:08:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhp8x-0005Gj-Nu; Wed, 06 Mar 2024 06:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69581] [PATCH 04/11] guix: cpu: Rename x86-64-v1 to x86-64. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 11:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69581@debbugs.gnu.org Cc: Efraim Flashner , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69581-submit@debbugs.gnu.org id=B69581.170972331320105 (code B ref 69581); Wed, 06 Mar 2024 11:09:03 +0000 Received: (at 69581) by debbugs.gnu.org; 6 Mar 2024 11:08:33 +0000 Received: from localhost ([127.0.0.1]:49806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8T-0005E8-7n for submit@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:33 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:51335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8P-0005D9-Sv for 69581@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:30 -0500 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-412eddd14b9so11973005e9.2 for <69581@debbugs.gnu.org>; Wed, 06 Mar 2024 03:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709723213; x=1710328013; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=haIdqHDAYsBUwWxc1th8krb6BdFhKfDBY38n7LZmi+8=; b=GRW3VvrV0jWJdubdUNA1f3K/equh5RiqhwHyT4dN7zxTLUKU3ErE7J+YRlEDEwYTR+ Ou6IGEvPA/255SzyzJuSVsH6Hsx0tA55Ta45O3d4MTLUnPesCkqgUGgOX2LESSy/nZ6G ojPhUsruBGIIeVLMe3La4K9ASl/n+bxYcIZ7htkTqcQdfmqC9a5uz9u2JYGGxLFrkZC3 rpisk3kgTodBefPgk6qRIyVjCOGnuTlrqS872W9BjgOhncDqPjg+ACYdUnT2CYfGArMw cKuzjr2ZNYmbGldDsx/oUNKlIprua718TftynAIX/E4Uo2TATILviiNszdPIbXmY7Ez4 Ppqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709723213; x=1710328013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=haIdqHDAYsBUwWxc1th8krb6BdFhKfDBY38n7LZmi+8=; b=qF71cdbpHUV9TcU1uvLLl134ABuWhOPBHGPhJvDOInwtUhXv/dWa0wHa8u+TmDgczn p8t+YfW6wST+Mm1/VLCYlbj+kxOCQiGj3Fh4wzfsetVmzpHAXYywW4v93iTrx1i/chly 0PnQ1E0Rj6VXL8PgTVHcyh3Vqbr36oMXoLzEJIux5UIeyxIQPymI77oKTn2Z265k63ci nwt1uQeCNZ69RgBotnaSD9rmKd7MW8BD3uuHmaq4uB9NMnAgLksL9oy4oToyt7BpaGyf g12O5c/4g3o8C2SCXXp3l+StcC+4MA4yj/uYgrzR17eV9uCixzP8QR3J/jN0ak5/d01J ydww== X-Gm-Message-State: AOJu0YyZXieS0sFOxqwF7U+eZrmFbLbeMoRUEv45W8kvytWL1KB7AyJZ lIzIN1+fmd5nUmRgnmWRJGs6XMi1NYQuA1nyVXtAU3p1pyIT+/K4GU92TucR3lc= X-Google-Smtp-Source: AGHT+IGqmqua08gj7zL4zAOaEv7dXJAkVdBRH63EYZAns2S4UZb7+JAeG4gBH+lg2FFkmqOxWQtezw== X-Received: by 2002:a05:600c:1c81:b0:412:e556:ccbc with SMTP id k1-20020a05600c1c8100b00412e556ccbcmr5441139wms.10.1709723213241; Wed, 06 Mar 2024 03:06:53 -0800 (PST) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id r15-20020a05600c35cf00b00412e3717ae6sm9193267wmq.36.2024.03.06.03.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 03:06:52 -0800 (PST) From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:05 +0200 Message-ID: <9bc22284736b8908d1be4e3f3cc408fd853e7888.1709722620.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.23 X-Spam-Score: 0.23 X-Migadu-Queue-Id: 1E3D042769 X-Migadu-Scanner: mx13.migadu.com X-TUID: R8urzJPqf+Kp 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 --- gnu/packages/gcc.scm | 2 +- gnu/packages/golang.scm | 3 ++- guix/cpu.scm | 6 +++--- 3 files changed, 6 insertions(+), 5 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 @@ (define %gcc-11-x86_64-micro-architectures "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 d781cc6055..c4ae3a4673 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -870,7 +870,8 @@ (define-public go-1.17 ("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 diff --git a/guix/cpu.scm b/guix/cpu.scm index b69c9b5360..6f9e8daa61 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -294,8 +294,8 @@ (define (cpu->micro-architecture-level cpu) ("avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe" "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v3") ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v2") - (_ => "x86-64-v1"))) - "x86-64-v1")) + (_ => "x86-64"))) + "x86-64")) (architecture ;; TODO: More architectures architecture))) @@ -321,5 +321,5 @@ (define (gcc-architecture->micro-architecture-level gcc-architecture) "btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1" "amdfam10" "lujiazui" "yongfeng" "x86-64") - "x86-64-v1") + "x86-64") (_ gcc-architecture))) -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted