From nobody Wed Oct 23 00:24:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729109613676905.2159200185805; Wed, 16 Oct 2024 13:13:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1AM6-0004pB-Rf; Wed, 16 Oct 2024 16:10:51 -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 1t1AM5-0004o7-6A; Wed, 16 Oct 2024 16:10:49 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1AM3-0000gN-Hd; Wed, 16 Oct 2024 16:10:48 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 4566998F98; Wed, 16 Oct 2024 23:10:07 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 260E9156378; Wed, 16 Oct 2024 23:10:27 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Tokarev , Paolo Bonzini Subject: [Stable-9.1.1 38/49] meson: fix machine option for x86_version Date: Wed, 16 Oct 2024 23:09:57 +0300 Message-Id: <20241016201025.256294-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1729109615241116600 From: Pierrick Bouvier s/mbmi1/mbmi/ When configuring with -Dx86_version >=3D 3, meson step works, but compilation fails because option -mbmi1 is unknown. Signed-off-by: Pierrick Bouvier Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Link: https://lore.kernel.org/r/20241004223715.1275428-1-pierrick.bouvier@l= inaro.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 (cherry picked from commit 461a9252e249adab5f0bae3b9634be77dd5be17e) Signed-off-by: Michael Tokarev diff --git a/meson.build b/meson.build index fbda17c987..6e467cbe7d 100644 --- a/meson.build +++ b/meson.build @@ -362,7 +362,7 @@ if host_arch in ['i386', 'x86_64'] qemu_common_flags =3D cc.get_supported_arguments('-mneeded') + qemu_co= mmon_flags endif if get_option('x86_version') >=3D '3' - qemu_common_flags =3D ['-mmovbe', '-mabm', '-mbmi1', '-mbmi2', '-mfma'= , '-mf16c'] + qemu_common_flags + qemu_common_flags =3D ['-mmovbe', '-mabm', '-mbmi', '-mbmi2', '-mfma',= '-mf16c'] + qemu_common_flags endif =20 # add required vector instruction set (each level implies those below) --=20 2.39.5