From nobody Mon Feb 9 15:40:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1768773935; cv=none; d=zohomail.com; s=zohoarc; b=KDaFLI4naTF5xl2q5+zXPRDFFl9XPS49yfgxgWvLQZpSgij8BKlKYCOViQBA7+PUpyKSCXb/7Cetj957R0MatZmR4zI+f/b7Ch1f7ymU2e9AwSIKQQc5O1inQBw4f4ieA/xp2JgJgIIDBZvVznGw632l7unrDTEGrwhiq7OJmj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768773935; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RAjiwiRuOWizs0EGl+79VhmlGSH6tR7oUS2c/1ByVNA=; b=jLY0rjTRxfpKAugx52VmvdlLlCKrZ5V35cH5SK5T2zw0g8CKirw2JW4vgYmSiPpIOuN01Ev75Mr5ikrYMDrGbZEfA9ydw5dxhgiLogaPiRfsZRQS8DXyu8ENXhN0WiLsO8FbiGtBL+8lOeh1pFqtZ1pMAqk1nzHbaPyUDzxq2y0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176877393534666.195231573059; Sun, 18 Jan 2026 14:05:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vhatA-0001i8-85; Sun, 18 Jan 2026 17:04:52 -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 1vhat7-0001PQ-J6 for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:04:49 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vhat5-0000Vm-Qk for qemu-devel@nongnu.org; Sun, 18 Jan 2026 17:04:49 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2a110548cdeso24515255ad.0 for ; Sun, 18 Jan 2026 14:04:47 -0800 (PST) Received: from stoup.. ([180.233.125.201]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dbb74sm74402865ad.56.2026.01.18.14.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jan 2026 14:04:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768773886; x=1769378686; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RAjiwiRuOWizs0EGl+79VhmlGSH6tR7oUS2c/1ByVNA=; b=d+8B6wk0fKB5AfoXB7xKQW05B5qN8lwZbMxRWDsHyP4Vbzu0KVgjcfS8ljIQbx+6Jy UclqxclpgWxMs/hz3VztzHdJ8NYQaPggZAyFoCqP2tcFuuJ8S7zx385sUgdRFIso7Vik Tu80Y49W1MVtJ3/1vK7FIPIE26thY2/RSAs4zSPR8oq9ljCoC1o3l05WF8N9OTtUHAMT V5bcMzIFvTyyX4tmjebC7EICo9hjKr5A2L+yuxVMK/sKNe9wQ58BggoHr4ejkT5nOK71 RQLjjSIhCN/WJ9QPHAwe7UqmmD18kI2/56StD+Yc2Sm2hfY7rn0YrsCj9R2qWgs6TXoJ vfng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768773886; x=1769378686; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RAjiwiRuOWizs0EGl+79VhmlGSH6tR7oUS2c/1ByVNA=; b=cJVZLphq0xd4CU2oAnamUc+E4Xn+eRpoASw2CSpxC2zc06MAr25qdoKFzfr17u3Kao SA37DvM3596tOBprIW64AkSvxzgnZy+tbaRUPuGM4h+PWQTqq4KxHDITuaosHodk1a0P QP/JqB6J/a1xQ0nJH/K5tdENrk+PI4l+txlJOUc4B4P3Q0EdwyHFAy5sWxfxlWZyTkCf 2avbcJr0tOORP/l7BkMt7d3DSBPLgtB+wPHs+VXIAcRVRxg0vdRWzkYegKOpwTfDgntt EVeQwNaJZqnwf1tRPH7tipji81ttebAGg4edD3anR4hifYsbmF7DxrDiV4SGMQ5h8wfK vC4A== X-Gm-Message-State: AOJu0YzB0mXgXer1JjWRqU5SyKPu4+yvPkCsOPCcQepPVtzVrtiB/76K ebpBuJuQ/yj6Yv/FM+Fsd6dbQ/HObgAWP5ohx/uXJyLDsdALlSZjSvakj6E/4ed+EcJrsPL3cBD Xu+Yxggat/g== X-Gm-Gg: AY/fxX7COLnfJJeG7I1j3Ve/p6n0ab9sUT7dP25UulRwj8Q3kD9L+jqL5g/VJUwyR/v QargEcl/GlMYW/sW5ZrUe2huNf6OXdggHMNrsCO3wH4HTnSbr5G52qBvkZ6w7l8aDzOvBivUI1l psJE9F0N7XQHUZ7Qy7x03g/o9GTUn+90jQHuwNJkIjJYONMkYM3x9uLrrCks7m4ojIg4t+6glF5 IYIExyPhNwJVUCuAvl4ZF1FSw5pTZuwjYtClAQPvptH/1LSWDSd24ccjcPhy+ZZG52nn9tcwXf4 /UuglWypNMr3bU61R6lFOo2QW8Y+t3v/t0qyI24N5Ju5ZfsybtQr6r7ZzZZhsIyA6+1GqX+UZhP RsT3MwhHzS3ZJXkPWEP5Dl7rT2c3DaSJT8yKAggTLO3dCB+pQqyd9Qxr4IhUCcJuXgP5rojzaX7 S+sm8O5zSki0VtjThYyg== X-Received: by 2002:a17:902:da8d:b0:295:9b3a:16b7 with SMTP id d9443c01a7336-2a7175189aemr98621865ad.4.1768773886173; Sun, 18 Jan 2026 14:04:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , Pierrick Bouvier Subject: [PULL 11/54] meson: Remove cpu == x86 tests Date: Mon, 19 Jan 2026 09:03:31 +1100 Message-ID: <20260118220414.8177-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260118220414.8177-1-richard.henderson@linaro.org> References: <20260118220414.8177-1-richard.henderson@linaro.org> MIME-Version: 1.0 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 (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=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1768773936198158501 Content-Type: text/plain; charset="utf-8" The 32-bit x86 host is no longer supported. Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- configure | 16 +--------------- meson.build | 49 ++++++++++--------------------------------------- 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/configure b/configure index de0f3a8ebe..e9d0b9e2c0 100755 --- a/configure +++ b/configure @@ -447,13 +447,6 @@ case "$cpu" in linux_arch=3Darm64 ;; =20 - i386|i486|i586|i686) - cpu=3D"i386" - host_arch=3Di386 - linux_arch=3Dx86 - CPU_CFLAGS=3D"-m32" - ;; - loongarch*) cpu=3Dloongarch64 host_arch=3Dloongarch64 @@ -1944,14 +1937,7 @@ if test "$skip_meson" =3D no; then if test "$cross_compile" =3D "yes"; then echo "[host_machine]" >> $cross echo "system =3D '$host_os'" >> $cross - case "$cpu" in - i386) - echo "cpu_family =3D 'x86'" >> $cross - ;; - *) - echo "cpu_family =3D '$cpu'" >> $cross - ;; - esac + echo "cpu_family =3D '$cpu'" >> $cross echo "cpu =3D '$cpu'" >> $cross if test "$bigendian" =3D "yes" ; then echo "endian =3D 'big'" >> $cross diff --git a/meson.build b/meson.build index 137b2dcdc7..506904c7d7 100644 --- a/meson.build +++ b/meson.build @@ -50,7 +50,7 @@ qapi_trace_events =3D [] =20 bsd_oses =3D ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly',= 'darwin'] supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux', 'emscripten'] -supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', = 'x86_64', +supported_cpus =3D ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86_64= ', 'aarch64', 'loongarch64', 'mips64', 'sparc64', 'wasm64'] =20 cpu =3D host_machine.cpu_family() @@ -265,8 +265,6 @@ enable_modules =3D get_option('modules') \ =20 if cpu not in supported_cpus host_arch =3D 'unknown' -elif cpu =3D=3D 'x86' - host_arch =3D 'i386' elif cpu =3D=3D 'mips64' host_arch =3D 'mips' elif cpu in ['riscv32', 'riscv64'] @@ -275,9 +273,7 @@ else host_arch =3D cpu endif =20 -if cpu =3D=3D 'x86' - kvm_targets =3D ['i386-softmmu'] -elif cpu =3D=3D 'x86_64' +if cpu =3D=3D 'x86_64' kvm_targets =3D ['i386-softmmu', 'x86_64-softmmu'] elif cpu =3D=3D 'aarch64' kvm_targets =3D ['aarch64-softmmu'] @@ -300,9 +296,7 @@ else endif accelerator_targets =3D { 'CONFIG_KVM': kvm_targets } =20 -if cpu =3D=3D 'x86' - xen_targets =3D ['i386-softmmu'] -elif cpu =3D=3D 'x86_64' +if cpu =3D=3D 'x86_64' xen_targets =3D ['i386-softmmu', 'x86_64-softmmu'] elif cpu =3D=3D 'aarch64' # i386 emulator provides xenpv machine type for multiple architectures @@ -391,40 +385,17 @@ endif =20 qemu_isa_flags =3D [] =20 -# __sync_fetch_and_and requires at least -march=3Di486. Many toolchains -# use i686 as default anyway, but for those that don't, an explicit -# specification is necessary -if host_arch =3D=3D 'i386' and not cc.links(''' - static int sfaa(int *ptr) - { - return __sync_fetch_and_and(ptr, 0); - } - - int main(void) - { - int val =3D 42; - val =3D __sync_val_compare_and_swap(&val, 0, 1); - sfaa(&val); - return val; - }''') - qemu_isa_flags +=3D ['-march=3Di486'] -endif - # Pick x86-64 baseline version -if host_arch in ['i386', 'x86_64'] - if get_option('x86_version') =3D=3D '0' and host_arch =3D=3D 'x86_64' +if host_arch =3D=3D 'x86_64' + if get_option('x86_version') =3D=3D '0' error('x86_64-v1 required for x86-64 hosts') endif =20 # add flags for individual instruction set extensions if get_option('x86_version') >=3D '1' - if host_arch =3D=3D 'i386' - qemu_common_flags =3D ['-mfpmath=3Dsse'] + qemu_common_flags - else - # present on basically all processors but technically not part of - # x86-64-v1, so only include -mneeded for x86-64 version 2 and above - qemu_isa_flags +=3D ['-mcx16'] - endif + # present on basically all processors but technically not part of + # x86-64-v1, so only include -mneeded for x86-64 version 2 and above + qemu_isa_flags +=3D ['-mcx16'] endif if get_option('x86_version') >=3D '2' qemu_isa_flags +=3D ['-mpopcnt'] @@ -1040,7 +1011,7 @@ have_xen_pci_passthrough =3D get_option('xen_pci_pass= through') \ error_message: 'Xen PCI passthrough requested but Xen not enabl= ed') \ .require(host_os =3D=3D 'linux', error_message: 'Xen PCI passthrough not available on this platf= orm') \ - .require(cpu =3D=3D 'x86' or cpu =3D=3D 'x86_64', + .require(cpu =3D=3D 'x86_64', error_message: 'Xen PCI passthrough not available on this platf= orm') \ .allowed() =20 @@ -4564,7 +4535,7 @@ if have_tools libcap_ng, mpathpersist], install: true) =20 - if cpu in ['x86', 'x86_64'] + if cpu =3D=3D 'x86_64' executable('qemu-vmsr-helper', files('tools/i386/qemu-vmsr-helper.c'= ), dependencies: [authz, crypto, io, qom, qemuutil, libcap_ng, mpathpersist], --=20 2.43.0