From patchwork Wed Oct 9 09:46:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 833945 Delivered-To: patch@linaro.org Received: by 2002:adf:a1de:0:b0:37d:45d0:187 with SMTP id v30csp10717wrv; Wed, 9 Oct 2024 02:51:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsOI4YFwDV5UKJLPNTXPXDWLXQlEmVs0v2ycmgvISzQbLILomMV6bQDK1T8kRAwy/2E7uVkA==@linaro.org X-Google-Smtp-Source: AGHT+IFD/kBzL1OzN6ilifOqhBsovUn201u/NBtOaVfem24acrpb/h58SARNBg1yQp31JBMfEXSf X-Received: by 2002:ac8:7e92:0:b0:458:59e3:2b4c with SMTP id d75a77b69052e-45fa5ef5754mr33169791cf.24.1728467466894; Wed, 09 Oct 2024 02:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728467466; cv=none; d=google.com; s=arc-20240605; b=YzHsG4CWj+uN0jU7i1wrAaJ8iYXmUCk9vI2kumYcLsBzb4LKcgcUPwpEX/LIuMqfPq mdASi1zeibG8WeECW9dGtfIxJPI+ro3IdgOfe4Hwg0g88ELxqG96PkSxMz3+c5uCiVvf Sbox69OwsORnSiYD2BJVqY+xjf1fc/XQxIGJvr0L42RLagxzBEQORN6L8jggGxKgly4g YyirHF6mp599WMsxwD0lVdtPJJHLXA2PobhjvO9nYhBBnUMreHRBBY4Zi2alsg53UApN ynsMuKega5RW7f6VmA5sTtkSA8PA7+jJuDwlDe/dvcfjIaPD0yu+YCpobtv/UThXzEFP ifIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I1CI3G168F3cDdpDRHRzVTftyK0R2VTAU16G+izB978=; fh=GlLk/sh8LENN52m2Vr5VWtfStTcx2+7REzHY9sltXPA=; b=V2RiQoROqB/zHSa8qblOupqJuq2DNpfJaI/mqhZwEw++LjCNh4Pn/QhwqHm20izQtv ND4sT21TESK96knukSgHJFI85JIF0vViKO5/QL8MGT1T+FOVq2pcIY5vMkw2QRFl2SQv tnxPQoujTahaOS5rBG/FLxRAVBxycK0fq2qzEP0N9vEl0O4svFA0mXBClW7RrHz4v1P8 E3Gb05LkXQR+IjakRR9D7wqWwJcSU05PIjCbXt67O/p2jrUC7sVZLGhhF8+Hql5F1FwZ Tsad+SIcSZjTg9exg94AONTetmYLaJoQ4RwHsXNR1OuRYGbBSCaWaYZgr9TGRwkko2Hx KEDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WhFcb477; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4603a1e5461si3979931cf.725.2024.10.09.02.51.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Oct 2024 02:51:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=WhFcb477; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1syTHt-0001TB-ED; Wed, 09 Oct 2024 05:47:21 -0400 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 1syTHl-0001KC-Kg for qemu-devel@nongnu.org; Wed, 09 Oct 2024 05:47:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1syTHe-0008UF-36 for qemu-devel@nongnu.org; Wed, 09 Oct 2024 05:47:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728467224; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=I1CI3G168F3cDdpDRHRzVTftyK0R2VTAU16G+izB978=; b=WhFcb477KsG8e4k9LAiUUVu/QhYAE7h2bUKx2dVmq28bgHcoictBlEQgeUmt9KT8NOnTqE M9c3Ia8gtqhU3hHEVvEeMlU5ffHdC2j+kPHxqhlp4+qVKO6VEZVp8j/Tf0/wUVCFBLlnk/ 8lQIqZ1fDiNzIc+pugmkUdTe/d9KZIE= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-K3KqFFXYNQGx2gLgkn-fJA-1; Wed, 09 Oct 2024 05:47:03 -0400 X-MC-Unique: K3KqFFXYNQGx2gLgkn-fJA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-42cb89fbb8bso42681755e9.3 for ; Wed, 09 Oct 2024 02:47:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728467221; x=1729072021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I1CI3G168F3cDdpDRHRzVTftyK0R2VTAU16G+izB978=; b=Cy4wzEZ5I/ye04yDmlUGpYrgMSVKuJab1m08bDmK8KYexZxh+tYkSkEYDb7KwfE/jD Da2+oxDmj6p+eKIUJpqiT0Rs9/GPrRHjDzxHdL2l4SzqfLlIA81DG/l+GSzaf68dOR59 wlBuALC24pC4x9eoeXb7vD5syZ7kYPEafBIWQDy/Qdpw2UjEb+cneF1CV14AMY9pJr+k EJYQnR+IEVBSJKTX5QQSDolNR/1e7noe87hgDAdDwQ7QxtehTuXT+MjTwu/l6fo7apUX j2QE0+2EyhKV9ibzF4jQ9DMD1QS8+EowGHKVeC8brRKpXO4Y+AnMWrQTJgjdLlca6EaB s0fg== X-Gm-Message-State: AOJu0Yzr6IPNwN7eZnv80TAHl8oaaU/mJ7jjzclFoURgdQGMvDFBbd8P kvlAu3x3TnLONCxICb4UWos4QxsT1H/nu6yriu9oxCIl0+JKhSVngVOZ9YgZ99F5x5bodW9Lc/j 9ILXNfRxKpu1gtkBoaCjHLsi+2aFoWJMY8/gWjiGbPIZwOc3u7GbeqB3lPaarVIL2JAmz1Lbn3C 9KEBWi9wVwj6UJ5rU0HoRtAeKSZ/kenwrhQ6uQgGU= X-Received: by 2002:a05:600c:4ec7:b0:426:5ef5:bcb1 with SMTP id 5b1f17b1804b1-430ccf1b2ddmr12148545e9.6.1728467221015; Wed, 09 Oct 2024 02:47:01 -0700 (PDT) X-Received: by 2002:a05:600c:4ec7:b0:426:5ef5:bcb1 with SMTP id 5b1f17b1804b1-430ccf1b2ddmr12148345e9.6.1728467220531; Wed, 09 Oct 2024 02:47:00 -0700 (PDT) Received: from avogadro.local ([151.62.111.131]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-430d748f0a5sm14550845e9.48.2024.10.09.02.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 02:46:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-stable@nongnu.org, Michael Tokarev Subject: [PULL 10/14] meson: fix machine option for x86_version Date: Wed, 9 Oct 2024 11:46:11 +0200 Message-ID: <20241009094616.1648511-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241009094616.1648511-1-pbonzini@redhat.com> References: <20241009094616.1648511-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.151, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier s/mbmi1/mbmi/ When configuring with -Dx86_version >= 3, meson step works, but compilation fails because option -mbmi1 is unknown. Signed-off-by: Pierrick Bouvier Reviewed-by: Alex Bennée Tested-by: Alex Bennée Link: https://lore.kernel.org/r/20241004223715.1275428-1-pierrick.bouvier@linaro.org Cc: qemu-stable@nongnu.org Fixes: ef7d1adfa85 ("meson: allow configuring the x86-64 baseline", 2024-06-28) Revieved-by: Michael Tokarev Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b91863736ea..76335bb2a51 100644 --- a/meson.build +++ b/meson.build @@ -375,7 +375,7 @@ if host_arch in ['i386', 'x86_64'] qemu_common_flags = cc.get_supported_arguments('-mneeded') + qemu_common_flags endif if get_option('x86_version') >= '3' - qemu_common_flags = ['-mmovbe', '-mabm', '-mbmi1', '-mbmi2', '-mfma', '-mf16c'] + qemu_common_flags + qemu_common_flags = ['-mmovbe', '-mabm', '-mbmi', '-mbmi2', '-mfma', '-mf16c'] + qemu_common_flags endif # add required vector instruction set (each level implies those below)