From patchwork Sat Feb 8 20:57:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863296 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954083wrt; Sat, 8 Feb 2025 12:58:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUn9DuFNfozftFQE13BokdMs5vgX6a/Xh4QnQViDJc1SxfHlE1jZDkI4Vm0AvFd+oRvCJ8tfw==@linaro.org X-Google-Smtp-Source: AGHT+IHMGC3uX4fWOsdyKHa0GwDme4hPDywBgYtX8mv0bMFxm5HaPWqkHv2ngH34tpVP0Ashmuai X-Received: by 2002:a05:622a:11ca:b0:467:4380:76f6 with SMTP id d75a77b69052e-471679b2201mr151114481cf.11.1739048297563; Sat, 08 Feb 2025 12:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048297; cv=none; d=google.com; s=arc-20240605; b=BrLhkAiM3zlp0IoV879+sbwiYXsUNX+PMaVl+N95wV0hMsIjfoY1jeTKMvp8Q1oq8C GvTi6ah273GJHnyuKq1q/KuL6Ls/ISgmtHWIYdFJZ+ILopYs1RotOyNWWSMUwjJmwYN1 7rgdlqx+44cc/9Y7fx2f8zD4qwfIr11acuvr/K8DLdGBOkhQZalRyA8YuLAxyoty1OXA uuQUFsibmcmR2TtbmLaZDbINY5IA+4qx1C2p9PT86/8Y1YNiGO3K9Ume6joFUf3T3RSs 06u4fgETfZZTcjkOArUHC//rZXtGlV2gWxhorFncAtJDqxpX8FGtuamPcyBaU5oVrIOl I1lw== 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=XkDk8OxqW6uxutlAZ9P73/1ySr9ma3Px3naV7Jdqb0w=; fh=PKoaD/5wWQTTiSs2HMGSCSqe0ZXvo1tbbTb7pxvOEgo=; b=U0ReMbaPb2M6QTrDWQnMbu82r+9hkjRfKXAVE6u/t65u3KTJnGeEYcZGB5Dkx6EXYk CU5/MPkjGiz0G0gMJG0J/00uO4zQIM7DCXUcyqHHOtSwm43LeDttahCMj51VFkevW3Yn favXXddRxYWn5Rvq3C0aU8kvnAMUIV7k8TXAiX8j3GklKupgyDvSuGMme8ChsRmBQia6 z84i0EoP9QlOz9PpifivouroB3cTVtUHsyZQ4OvfhVN6QKg475qzBorIZUiUeFUYmeS0 qLbB42EfDCL9TilGJbUo6WkGg6SeAxwEWoXc62RXLmxh0VP4TABA2TF7/aEv68xMLTSq I2RA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jZsdYdxz; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-471820f969bsi12175541cf.661.2025.02.08.12.58.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:58:17 -0800 (PST) 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=@linaro.org header.s=google header.b=jZsdYdxz; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtL-0001s1-Hl; Sat, 08 Feb 2025 15:57:31 -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 1tgrtK-0001ra-6l for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:30 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtI-000579-JS for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:29 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-21ddab8800bso44894185ad.3 for ; Sat, 08 Feb 2025 12:57:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048247; x=1739653047; 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=XkDk8OxqW6uxutlAZ9P73/1ySr9ma3Px3naV7Jdqb0w=; b=jZsdYdxzeUe+iFQVItZVD5YD/ocFTnWTdpMRSRXX6S/ETkzPcQGDRV+QgLytKj8azF om6zF0osN31egX2X+NOk5NhxU+Xjquapk+X3rYWIcRgj4OoCYdrKOqJ383vilBXLOVYO KA3bMhhutjdvF2591D+HFsvwFxGdJe+/PEeHIeTwUWSX54WP+IlugDFW/e4KF7gkg1pu TYatRgg+lF0jJPJZp+RhVuilbeUSFWhaYtKw9Mhz/xFtzO6uirPTrGKWeNIcRPut4I7Z MySpaQHv+6nQ9R6zldsgMGCeBJsB5DE8JM8Efn29U8RLWiMYJHfKSub6zri1m5i8YD+v pnZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048247; x=1739653047; 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=XkDk8OxqW6uxutlAZ9P73/1ySr9ma3Px3naV7Jdqb0w=; b=fmr8qlb+kzpOPyTlmuxf4Pai/kSRlGKojkNpzjILOT/IOYQFz2xlyuRv6xBVu4J2xQ QNAR7EX8BGL65Noe5aalqKY/72XxUivdHOpgE75pg6RVARqlgXUraiubWiwhL18gyioE B68/l7XLM5j3p05Dm+xerX6q3QDl0J17KPCiLDRKNVdHmYWsPit7YPXOkXlQSqCiGlnT V4mILe5Zn5zXSSuXWvNrxkU4lhkdDN3Y8r7NXw7gXnUyJySqcFafNcZB3il5EWQZQ2uO Cq0Daj+QxzlEjS/uYASSUJdRPnSsLD/K+v0ys7ePpi25hlucMcK5hmf8Wsj2C2c63eJU 27RA== X-Gm-Message-State: AOJu0YybE3p6JaDzOhoqI2hUJPSQbniMAFwikIlqXZSq4o68q6V4/yOE ImDIhL94iRwwNbJMkjUUbY83icgmJ/hZyLdvvag0GPcC+CkIgXQpzhfiL+294qIgHN/2JV7TmP3 r X-Gm-Gg: ASbGncuGiU+wNiZFopaAYOysTtGH3fHdJaCEOcl7tdlvBcGhT79dP1WHKa5o+IIQ3FU FkG+FWiinCFuQmdMpXWnysgjQBYn/OELDE5W6ds8HoWSYBPIQiSBdWegNoN1maJlaChrzIvVEZs f7bAdX3ufORNU//14uF40EHgWplMzz95wszIzVU6aHVBTTVFBWQNUvPLwjVLXA+BolZ0zo0ZMGH 1zAzZXqzXCGDoFY6pQ11wrCAYhLtMVKcxnHCRovEDUJ+7Hj54HUEGv6TxF74fpGoaC2qxnLp+iG NVjI7Rvk1ezIdoIOPcLIZIv7SpH5zPsZjX0jNgphMuaernw= X-Received: by 2002:a17:902:e552:b0:216:2259:a4bd with SMTP id d9443c01a7336-21f4e76cfc0mr118520015ad.52.1739048247028; Sat, 08 Feb 2025 12:57:27 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 1/9] meson: Drop tcg as a module Date: Sat, 8 Feb 2025 12:57:16 -0800 Message-ID: <20250208205725.568631-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This reverts commit dae0ec159f9 ("accel: build tcg modular"). The attempt was only enabled for x86, only modularized a small portion of tcg, and in more than 3 years there have been no follow-ups to improve the situation. Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/meson.build | 11 ++++------- meson.build | 18 +----------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index aef80de967..69f4808ac4 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -21,16 +21,13 @@ specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( 'cputlb.c', 'watchpoint.c', + 'tcg-accel-ops.c', + 'tcg-accel-ops-mttcg.c', + 'tcg-accel-ops-icount.c', + 'tcg-accel-ops-rr.c', )) system_ss.add(when: ['CONFIG_TCG'], if_true: files( 'icount-common.c', 'monitor.c', )) - -tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( - 'tcg-accel-ops.c', - 'tcg-accel-ops-mttcg.c', - 'tcg-accel-ops-icount.c', - 'tcg-accel-ops-rr.c', -)) diff --git a/meson.build b/meson.build index 131b2225ab..e50a103f8a 100644 --- a/meson.build +++ b/meson.build @@ -322,12 +322,6 @@ if cpu in ['x86', 'x86_64'] } endif -modular_tcg = [] -# Darwin does not support references to thread-local variables in modules -if host_os != 'darwin' - modular_tcg = ['i386-softmmu', 'x86_64-softmmu'] -endif - ################## # Compiler flags # ################## @@ -3279,11 +3273,6 @@ foreach target : target_dirs if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } config_all_accel += { sym: 'y' } - if target in modular_tcg - config_target += { 'CONFIG_TCG_MODULAR': 'y' } - else - config_target += { 'CONFIG_TCG_BUILTIN': 'y' } - endif target_kconfig += [ sym + '=y' ] endif endforeach @@ -3642,7 +3631,6 @@ util_ss = ss.source_set() # accel modules qtest_module_ss = ss.source_set() -tcg_module_ss = ss.source_set() modules = {} target_modules = {} @@ -3803,11 +3791,7 @@ subdir('tests/qtest/libqos') subdir('tests/qtest/fuzz') # accel modules -tcg_real_module_ss = ss.source_set() -tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss) -specific_ss.add_all(when: 'CONFIG_TCG_BUILTIN', if_true: tcg_module_ss) -target_modules += { 'accel' : { 'qtest': qtest_module_ss, - 'tcg': tcg_real_module_ss }} +target_modules += { 'accel' : { 'qtest': qtest_module_ss }} ############################################## # Internal static_libraries and dependencies # From patchwork Sat Feb 8 20:57:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863302 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954273wrt; Sat, 8 Feb 2025 12:59:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU5yrcU/uh5WMSjTvb5DU2BqmOlWIYMn3hjOekMoTE8wAH4MrgnjMe7awGiPZg4+8BNnEkHTQ==@linaro.org X-Google-Smtp-Source: AGHT+IE8EvlGO6sHJgar++1DT6FvWAqJC/qrRDAsQrMy2U38xKlEw5yzfVRV+1BuQRoYvdzZ4Wpf X-Received: by 2002:a05:620a:1a8c:b0:7b1:4cc0:5e1f with SMTP id af79cd13be357-7c047c0341fmr1560285785a.7.1739048352780; Sat, 08 Feb 2025 12:59:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048352; cv=none; d=google.com; s=arc-20240605; b=WQViGsQVjRlt0semRmxp/Lw/41WlcGeZE05O+G3tOm5rggAJ5sH8ujewdf/2WG5sTB lYkevN59BsiLIrJQ8904URM8fGxDATIHyltdA0m6vMXmhJsEgWj50OANlNdURzV4n1KZ qY0z/I5EZuXzFm1ATniEOPYJjzmCAPBUJlFAPAWRIv8Fm7mqHrlWpLGFAY4Zbx5ZJ9wT cXf0MkuAgHd87lRYFIu5MODSm4hofDK5AN3456sqbxg/Bu8yVYRcmCJ1Ab5QpStUG5iH MYuESLR337D4mZzASyO8vsTGujJGeN08sgmtRgvgsXbsZc0THW8qafmWE2CZNQAnkFsI IbcA== 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=/KwnHCfQIkLSuI5gCbIKhc6TbHv3lQ5OLotA3Bb1FOg=; fh=qi6M7+758Hm8qfC4GxHVnK55oMKkCiFOk69X0Z7vtIs=; b=NDE1acQRtb9M+x/ZIPaiLOLddSF+KNxRFJ1YBbkJ0caOHABdGDsf/A12hdC09WywKl h6BhfiqmsMybFKyhW/sLP8y8AShJXvLoHMJF6x+hsebTmJOqBotsvxWpJsG3qdLlH74F XLm5C/Uz4czxOwIhMgcyr9sSpCaBayNyFJhEMEPYsFxWTK+haMmLgV5oids5hiDdmhnp ooYZhwIpnAGiHSkCsV+lxmqvwZ2Pk87aGJsqD3tp5ZCru7a52WpEEcEkGAwzjp56tnaF qTqDUvMHoJnwAkJlRiKmNrD3F7Ftq8+Vkm6xoBXoG+96aZg0bQSgBkD+Fr3t8FfiUf7L rQEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vvAtBFHc; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c041ee71bdsi636647985a.624.2025.02.08.12.59.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:59:12 -0800 (PST) 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=@linaro.org header.s=google header.b=vvAtBFHc; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtQ-0001tt-8N; Sat, 08 Feb 2025 15:57:36 -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 1tgrtK-0001rp-Of for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:30 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtJ-00057K-79 for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:30 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-21f50895565so26333315ad.2 for ; Sat, 08 Feb 2025 12:57:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048247; x=1739653047; 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=/KwnHCfQIkLSuI5gCbIKhc6TbHv3lQ5OLotA3Bb1FOg=; b=vvAtBFHcqttXCdPb8ajkZKxSIRxuDxw/a0IHdXr1IdQFWQEzp8Fu9JKHAdF+nvT18C v/I8plcy5QvqEIpjhC5TotzmQTDs2Zgn/TwqJZrhFRrCxd+9ApZ6X3m73PEIrXC+wBBG rlDGRrA+wTsQxtm9TSbqAi3AT2BpgUOFQwGt3vHlVIZ4SVM3Q/eTkgsFVHBpFlMxFTnP DdveFNymnFpxD6RjB790EJ+0XuAxCMQ4ymu7R76vVnjG+6wc+ntfDj3nNEu/+zjpqdwf S3moxfE/QxCzVj7/QExqiMOFOiZ5YZoAT0DxYhWM60lOqQNFmK8hzBgN/Znz/q+Yjc4z KUEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048247; x=1739653047; 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=/KwnHCfQIkLSuI5gCbIKhc6TbHv3lQ5OLotA3Bb1FOg=; b=FBx7TZ7uaDoTAxUWLGRHqGVBP0s0ok/3fzvZVmJW0w3eEIQNsNpOIm3LDOH53RZJij 0wOzlcbyiGWsPX+M4EuXgSQFxYFLYi35bW9v0h6OBAn3GYdCgwp+tuW7lmJcXqCeiyhg wICRwhmhP5J2P4sZUdoqhaWiHXAO588aUGomlDhuVTlcXHs+r2Mt7boJlef1C9M3zL6p pSTIIoYtBCZGslHwtJLBrw7FrnkOhRioh7qnyQlNycl1OOoyqX4G9WG4C0SL351iGv17 9/P1ER6bXzJF08rini/8WOBsA7Vj7Ce7MwTK4X3L2m4wJFw+AAa4FOZhi7W1WlwZiMIL 5gXg== X-Gm-Message-State: AOJu0Yyej/OZd+vDZ5vFbXC+OKVNDArYFh25cR55avg4fV4WnL8yojZT 16kORXtXxNoEdQ1SnlOpgCaM9dxpN4ZUJkVkkft7Pzk2KiGdkaaiwGNI0BQrDU9yQPjTzOTPPBX L X-Gm-Gg: ASbGncvXDfSAG2FiN57WEzyajV1bpSQUAKEEzeVTAH7/kqoj3wokU5CcizDupRAEJQl nYF4jVRBLPi5UkJmsn9MDTNNT3YQMfMcXARw2jwCujxynseIUX+18TvuZvwSuoXLo3Ib0dvVqLJ LX2eaycBxDG6cKhYxVxOkv5/J2sSk9a0FlKJAFHoWft8PdIWG1j2qonPmSPz6bhwhcWsH1WhI0+ /fZjPnmzuAJDTTymNLIFk9lv9sC5xCTandnCd5ZiapmW4Eo6JYc3ymhA/7PhEqTvEPWtoCAXosh oZOoNQLcfyHPx/SLJTncFw3+EdiMEW0nUxNum/0TLhuAaT0= X-Received: by 2002:a17:902:f541:b0:21f:5e6f:a432 with SMTP id d9443c01a7336-21f5e6ffccamr93752375ad.24.1739048247667; Sat, 08 Feb 2025 12:57:27 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 2/9] meson: Disallow 64-bit on 32-bit KVM emulation Date: Sat, 8 Feb 2025 12:57:17 -0800 Message-ID: <20250208205725.568631-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Require a 64-bit host binary to spawn a 64-bit guest. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index e50a103f8a..1af8aeb194 100644 --- a/meson.build +++ b/meson.build @@ -277,21 +277,27 @@ else host_arch = cpu endif -if cpu in ['x86', 'x86_64'] +if cpu == 'x86' + kvm_targets = ['i386-softmmu'] +elif cpu == 'x86_64' kvm_targets = ['i386-softmmu', 'x86_64-softmmu'] elif cpu == 'aarch64' kvm_targets = ['aarch64-softmmu'] elif cpu == 's390x' kvm_targets = ['s390x-softmmu'] -elif cpu in ['ppc', 'ppc64'] +elif cpu == 'ppc' + kvm_targets = ['ppc-softmmu'] +elif cpu == 'ppc64' kvm_targets = ['ppc-softmmu', 'ppc64-softmmu'] -elif cpu in ['mips', 'mips64'] +elif cpu == 'mips' + kvm_targets = ['mips-softmmu', 'mipsel-softmmu'] +elif cpu == 'mips64' kvm_targets = ['mips-softmmu', 'mipsel-softmmu', 'mips64-softmmu', 'mips64el-softmmu'] -elif cpu in ['riscv32'] +elif cpu == 'riscv32' kvm_targets = ['riscv32-softmmu'] -elif cpu in ['riscv64'] +elif cpu == 'riscv64' kvm_targets = ['riscv64-softmmu'] -elif cpu in ['loongarch64'] +elif cpu == 'loongarch64' kvm_targets = ['loongarch64-softmmu'] else kvm_targets = [] From patchwork Sat Feb 8 20:57:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863303 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954282wrt; Sat, 8 Feb 2025 12:59:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXGRvd2/ptt8bl4l4s3MsEzo7zRkWQ978JO2f3KzoOQu/YEcC/x/tPJAbtuMj8Lg2ltMlmGWg==@linaro.org X-Google-Smtp-Source: AGHT+IGEdhnAahF4lTv6+3RdIAPE5zY1oySyZGHxXbAK9u2H6h46NxAeWbb6hX4OvcFbWLk0wACH X-Received: by 2002:a05:620a:438e:b0:7be:626a:be45 with SMTP id af79cd13be357-7c047ea3d6amr1140892985a.6.1739048357213; Sat, 08 Feb 2025 12:59:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048357; cv=none; d=google.com; s=arc-20240605; b=Qch/fufrmyu+ynxdB4kBsLLj/d3rw7zlb2VdYdQCrj/UaLJUMl0+hfWK9CMljUprTa ywpQrf4eHANlZOc6ub2MWWuEdlMHLAUFcYCQyVKAhvKEyuADF2sF86RgDtazm/tW1kYK YNNNg8u9IR/TY7olQ1o9fZ8FAtU80iJ9cWTA85u0pc+1XlmUsQJmN1cAUascvovYIs/V rozyLk51sheIX5uj8zo4oE7dso+B+1SnEC+DHegwJlB91IbqJIfZgw/cuHG/UgWF1AIG nsjLKF4VTZWu5coUvAvCQXVrVhBy4wThxu4ELJQEwB0FnrVjHP0UAm+JHdXSrmgcg6KV TMHw== 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=83rDUEYq9wOvP0NwfgWL2G1APFDj5PaKxVull0vQqa0=; fh=qi6M7+758Hm8qfC4GxHVnK55oMKkCiFOk69X0Z7vtIs=; b=abEOI4qEYi8y0QgNxAp4J5tMnvbXOT84MU5+dPp/4fp5DXuivTPl5xB4RqU/wyHajS LuJFDLPbDRzw3OnW7XKLJAPc25Kl5ZoH9TDU32PnOMExRhsJOOWPFMnC5vmPF1o59f/A 3UYSrvFxHQeR5keMtkpT958dKJshuBDvLI0YiN4SCbBXZ5/jk1vgd7Ve9y04XPIooX/0 c+72EEONAP+vPYU86ZtD9Nai4cziHnMz8WzeT0Q0YBcUEXf8GBS9HYCtBHivAu+90K1d glaajO7XnhPMJyoYcOfpVTzkLkTNIcYKD6HYbADYEyuhpBfvLRHbWoeMrSt2UAOucBEK 7Kmg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SBYL+erU; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c041df4630si639552285a.78.2025.02.08.12.59.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:59:17 -0800 (PST) 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=@linaro.org header.s=google header.b=SBYL+erU; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtM-0001sa-Ml; Sat, 08 Feb 2025 15:57:32 -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 1tgrtL-0001s4-D4 for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:31 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtJ-00057S-U0 for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:31 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-21f4a4fbb35so37240915ad.0 for ; Sat, 08 Feb 2025 12:57:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048248; x=1739653048; 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=83rDUEYq9wOvP0NwfgWL2G1APFDj5PaKxVull0vQqa0=; b=SBYL+erU7+6ZGt4cFR+W0yyQp/YC/1+ANcDswvyfPt9qEZTdJ+QHRGuePriHLTNULx 6GnrS9OUD0zDg+T4/C44+cRKy1fzucaK4uG48fsbWTcCMT0qw2DxD4kxB8UR5JL70Q0L 9Ob9BjLXVHRYUw4MutwheQ+nyWMGepFzuMsF662ae4bbRoQ4FmmcSjlpXSSGIYkDIwze 8MpL4Gm3ku/cKv/hcpzxyyu7rtpRYq7awW0i0h0SZWfUF0y7sTYkH+ksWjFfIbj82eDF Mth9hubBslr2jhS7m81pxSV/kMe0qTxQhSIDt1TtFvTi8a6lXcy4IJySCdkgDe7C96jl 8Okw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048248; x=1739653048; 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=83rDUEYq9wOvP0NwfgWL2G1APFDj5PaKxVull0vQqa0=; b=XBdHK+6AS98K3mSyqebLDbf0JRKrSzrXDK5UN+1n9md3pNJUTZokElQGFqEiJjxnAy j7GWOQqFBe16QcS/+Pp9dnEqvm2+fygzj8giw3Y5jLYecOZbSCiZrP/Zzm5gz6H2R+pv a61BjS6zKP1MnQJ9ApaWm9Si1qp5iAW5ZutRNdA4qBIXBH5sB72bzDoXwsZky/l4BJcG LGcM74YYFqZHbMochpfvMwgttf97VW3GYX1FdrJGopM5wkjUqeuDDg3OKYGkWDpq/0kl F5xVWvy2my5f47XEH4e/tCBY8yKrnEyudBvd1Y4eYKWpMnyTsvvAfp+DTqH3cn0gkph7 nOCA== X-Gm-Message-State: AOJu0YzCNmiB+cMEPAFO/Bu0DhRDwNoNuq2cVzPn006/aQ/W2K48uzp6 ENfPiwXhzTQEJG/r4WNg5GZlsiymH2DGXj/xbwIke0YDmlquzNqUchgoCw1sNAtk47AP0v6Ucag r X-Gm-Gg: ASbGncvQPajH1/ileOMdoIyRq5D8J7YMfvRSDopuH4xs02/o7D+hP4OzKRFSdm38L6a xTEhy4cQEvfRe6ccO8EmPjaXg1nUeFvjKG1ztlR9R2an8mgaI2dH8wNAzwyR2RO251EJu4lTVJO 4nXF8j0hN9iZ1DJgWFk3XEyfnMqwYa8WAx9UFs/5aDceCzLK7dhLJKNE94jICxJjkvJiZsVDHq9 aOErj/mkf7/m+O28Qr1cYt5+50Tc1mvmxQrtmmDw3DbWkgYAw96QpHdlb5OUG71aqlvZUWAKzhn nuXsEbVXWYWfAcubJ3iD1Q/2w1tYuQ6OHoEtdhRnEW4diKo= X-Received: by 2002:a17:903:2309:b0:215:58be:3349 with SMTP id d9443c01a7336-21f4f17114bmr149994135ad.14.1739048248429; Sat, 08 Feb 2025 12:57:28 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 3/9] meson: Disallow 64-bit on 32-bit Xen emulation Date: Sat, 8 Feb 2025 12:57:18 -0800 Message-ID: <20250208205725.568631-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Require a 64-bit host binary to spawn a 64-bit guest. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 1af8aeb194..911955cfa8 100644 --- a/meson.build +++ b/meson.build @@ -304,9 +304,14 @@ else endif accelerator_targets = { 'CONFIG_KVM': kvm_targets } -if cpu in ['x86', 'x86_64'] +if cpu == 'x86' + xen_targets = ['i386-softmmu'] +elif cpu == 'x86_64' xen_targets = ['i386-softmmu', 'x86_64-softmmu'] -elif cpu in ['arm', 'aarch64'] +elif cpu == 'arm' + # i386 emulator provides xenpv machine type for multiple architectures + xen_targets = ['i386-softmmu'] +elif cpu == 'aarch64' # i386 emulator provides xenpv machine type for multiple architectures xen_targets = ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'] else From patchwork Sat Feb 8 20:57:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863295 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954082wrt; Sat, 8 Feb 2025 12:58:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVLfUL7uH5uv9yPfBhHSDkkn0pjMiN1sqPSdl+Btq01eIw1NxoMqLb2AcrdJ6W3x8CtuyGAHA==@linaro.org X-Google-Smtp-Source: AGHT+IF8y/Y3tYskMm4XieOGPmZwldRh9nYqQbjqSAz/RaLROQcaoxQPx6JNUrkG61t5xAu1T1Bs X-Received: by 2002:a05:620a:6a17:b0:7c0:53c5:ecf with SMTP id af79cd13be357-7c053c50f84mr299142985a.21.1739048297562; Sat, 08 Feb 2025 12:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048297; cv=none; d=google.com; s=arc-20240605; b=MTOCyCFQZH3PMXd6+aJiFx8TNVX197KAbk83NJpy21ys16l04XugmMT75m7BOT255E Kz7ck2e0DFjwbuvbXx7mhpWcmizJ4AErX5DTICa5BEtWS6mujnVF3sTw1Sq7H/ySnKr3 t8W8BCOmG2XyFPs1Ys2ZHnjQ7sNGRAR7XqhlvZyhxUndndXNTDJJbXvM8uY2NuwcFHqG n+mwvJ/0xbfWG0FgQ0QWgl5hJO15SOYDhjhvERzL7xnpNp/OFuPhy24YKA/Ok0CCdpGL K22WxWKNwRQ/J4ZQAuaqSekzPnNSGJa9CuRUmyuAnqseCCIJrQFQjiCvZd2wt3iSvAzL U3/A== 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=U+e3NmMpDYxhMb26080aeO1z+Gh7xEdjEvCdFDBVM7k=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=k7dyvMtbK03EYDYHv2czYcDayrNEGNdkf22WkEe+uL+KjE2107Wq+02cSN5rJ22vnK R+EqgRYrlFQbRSVeKNGPFN72sp1tNP7VPC1nQWJvVdq7NEHrfyX7gmyH30GDRcll7mE2 UBN8eve/1IKoyFx6HpVBPYIXarvp44+lOT8yPO/pqjso0bff96Bwc8FOJ/pjP1mBslUs 0jXDPZZV+BDxhw0LTTYe/zbK5aLEZRwVyRPFbU9/7yi/SQGEX3XKToPVTT/4NX1K/hRb /eF+8XNfWAP89f9cWJubuKUs4kQQlU0WR9d3hYP9H0ElV8fk0IyliXDOpvDxrGKd7bWA lokw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NbdpL+oM; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c041e94e6esi606616585a.306.2025.02.08.12.58.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:58:17 -0800 (PST) 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=@linaro.org header.s=google header.b=NbdpL+oM; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtR-0001uS-LD; Sat, 08 Feb 2025 15:57:37 -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 1tgrtM-0001sR-3c for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:32 -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 1tgrtK-00057U-FJ for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:31 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-21f78b1fb7dso4824165ad.3 for ; Sat, 08 Feb 2025 12:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048249; x=1739653049; 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=U+e3NmMpDYxhMb26080aeO1z+Gh7xEdjEvCdFDBVM7k=; b=NbdpL+oMJB5T22EhZxUtSiq5QjvyfVV0DtAaHhMIy11/HaNSdAovWjHV8RnTNz3E1P bV6eLAFJdqxC1D1/M//FFvVREkSv5ICTT5geXlX7DWE1Xrq2IZ2adJucYgI266yLxlRm HzXpYcVFtq6+fVTo7nB7GEoGiJp4XcPDnLMo+JwtKDeufQTtTBclGsBvw1SY6Mtm1VpR mVyZW6eCYiKQlYNMay3RLofy+UKRvEkmyNk52ahxL+A7YMUgGIQ/AeS3zbzWP4KjJytk OnCX7dMfMWiZrzDuL23lhcmZY+VSmsh+xcTVsyEgAgeUyXvW6/A8osMk/ib3R1ohvuXl Jhrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048249; x=1739653049; 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=U+e3NmMpDYxhMb26080aeO1z+Gh7xEdjEvCdFDBVM7k=; b=l7pZlVS5EnDdg7aqy1kcAbzRRqsJrxq8KG87zgGi283ncaEYkJj9Q0Sg2WZz21EjGz 3c3pe12pbQMmIaLNGKgHMWLzlXmwwu0gIDqHlFgmEFpmpVdHAJKAMfa3/IPocHg2iY2Y W1LfXGnXWw8cFGGdLpphfL1WrCAzTTDOTsyZr8XugDS5fp2OMlIByGNkzoS3f8uw1stw uwRlK9dlSgROe0IwwQudV938q5wea+ExoLVRqhwF4+a4fQnzbIP/ugfY9akvHWJL8w12 mHvgwAFUOK7C5OBmpszuWxS6l6t9mOqm2glGRwZR/NPuGGEmDeAp+1Q+ejvdXRwSIdkn n36A== X-Gm-Message-State: AOJu0YxL2gk5UEQeNl3CQ5Na1w4t/rHKD5yAxOKpd/H4EtcBoc4xng42 so0EAkyTIzPZjX5APJsT9VvIK9YULuVwz3bMudGuPDzQwPp0P5is5G/ytEtp0vDKLLe/opw2EZe Q X-Gm-Gg: ASbGncvVMN+SSshTHDAWUsPkSCg8kHHUHXC6PGhvyls0/DRB3OpFJB5ClZdN8JSqQ0j 7rn0RMG7LqWi2QuGHG1/MaZj0IfR10P2B7FLzvDB1FvvHiIw59RiRb05gk5/a96jgWksYVlloMk qg9qAcfkG6tTN005ggbXTt0ify0Y3kJorRlE+zXAtbMNFFSvhbortSNK5sYy694nwdeo3AZviZc n8gf6YTl8dtdNVSKpYMMY1/zWlEknNmO/lMpCMLipIJJARpp1ECARu485i2sOwrhNrweuq5TEuB 3/2fbHgUMB2aaFxXnMTnPtjI2zrVm2vjZC32AGzxJD/FmVk= X-Received: by 2002:a17:903:2311:b0:215:b5c6:9ee8 with SMTP id d9443c01a7336-21f4e6a028cmr118157045ad.7.1739048249079; Sat, 08 Feb 2025 12:57:29 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 4/9] meson: Disallow 64-bit on 32-bit HVF/NVMM/WHPX emulation Date: Sat, 8 Feb 2025 12:57:19 -0800 Message-ID: <20250208205725.568631-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Require a 64-bit host binary to spawn a 64-bit guest. For HVF this is trivially true because macOS 11 dropped support for 32-bit applications entirely. For NVMM, NetBSD only enables nvmm on x86_64: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/nvmm/Makefile?rev=1.1.6.2;content-type=text%2Fplain For WHPX, we have already dropped support for 32-bit Windows. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 911955cfa8..85317cd63f 100644 --- a/meson.build +++ b/meson.build @@ -319,13 +319,11 @@ else endif accelerator_targets += { 'CONFIG_XEN': xen_targets } -if cpu in ['aarch64'] +if cpu == 'aarch64' accelerator_targets += { 'CONFIG_HVF': ['aarch64-softmmu'] } -endif - -if cpu in ['x86', 'x86_64'] +elif cpu == 'x86_64' accelerator_targets += { 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_NVMM': ['i386-softmmu', 'x86_64-softmmu'], From patchwork Sat Feb 8 20:57:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863298 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954165wrt; Sat, 8 Feb 2025 12:58:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWNE5LDdIcAwi1bzMY27p8+0b9lS82qByJ7W6lPTio7Vcu/fJGd26Tw4nWjVCF93wBa8IHNOg==@linaro.org X-Google-Smtp-Source: AGHT+IF5MUyUIh6eSAjyluRKZB3bq9liJf84Shk+XUpd4pyM+vPomhpVX1OnWBBKQZ68t2SzNfHK X-Received: by 2002:a05:620a:2994:b0:7b6:e933:b2 with SMTP id af79cd13be357-7c047c78813mr1291464085a.41.1739048321290; Sat, 08 Feb 2025 12:58:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048321; cv=none; d=google.com; s=arc-20240605; b=RzW83K0QYyLSVdpvY+MI6o/r9/IB7TMdoDOYHuPAWl6UqleIrRcdHy1SEeIGr/kCVT ZlNmisTsMczTOxAExMExiHmD1HqrgSxPRBAJJwK1S4AhseJnnRIFj11QqsNNOjAuPbO4 NkzgRk7Cq2zvW0PRUOiiTPFjmIyBUbC1n8DAv097mHXvLN3xDzlmb7nuoTl/OdOjJteW TIuww8tISTMXxtnXPBFXp5uQFwTe3HMqC3gavH37x6Fw73AEWVhbjoWGzk32vAnkxw4e SjM0s4YgD81lEd6biWSifDL2ZiEttYDOD5TelFTSTUdH1nX7FGCjiS7WXCv9B83vKaZL auIQ== 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=j2FzoHSuAoX+1zQ7RA2/urh/hio8OfZSmlzrSvDG4W4=; fh=lZlgRtK1whkgth0kzr/EqIRvKsOt/fBiii5kiP4ev2A=; b=HH7GDDiSer/CL7+j0ZsWtYDOBjEI86Es80dWKgH9UXUZMw7iStH2OcWqReXaTn+Fos qb62ndq5IjpQNZAMiE1bSxxslEEb4VKd7rH/qu7M6ilBl0MlXxyUh+Y4s6OTBrr+sQQ7 kdhjLIglX1ABEV207YEtbLJRpnjaS8C8CjvGUB3k2mdOK8qGD42nOIyZdY10WF+eEiqO gMpC2WkHoicC69crMkdAsYvjypyDYJihUZUbfzpHBoVBS559zw1E1fS4x4QHLDsJT5tH WgMeOaWmKHLNX4k42wN2/rmaehywp/8LjXdAbsJjsBy2DIfrQmDjJYEli6+5FuFMwPwW Yy1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EM9g0quJ; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-471843ee9ddsi9255181cf.573.2025.02.08.12.58.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:58:41 -0800 (PST) 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=@linaro.org header.s=google header.b=EM9g0quJ; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtS-0001uU-2s; Sat, 08 Feb 2025 15:57:38 -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 1tgrtM-0001sb-MU for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:32 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtL-00057k-4L for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:32 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-21f53ad05a0so28320885ad.3 for ; Sat, 08 Feb 2025 12:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048250; x=1739653050; 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=j2FzoHSuAoX+1zQ7RA2/urh/hio8OfZSmlzrSvDG4W4=; b=EM9g0quJb+N3RL+8CFgcIMquKAfT365FU2Z6hfcklfUS1t/sT7No6cM0xtq00NbmI2 wUKxJMEuULZfGWiG4nMjFEB6x0hhZrXQ96tyV2JQGcKO0lQ0W9sEW2SSTnivUf1MIa7o CCF/GMcLpWkClRkvNe7XTKNJFiu+H+LW2c3blDS5DpZLM44T1dwYCRHK9+2jXrUbYnee jW9olGWkHkoWHNq0FImWlQfMGQJkYu6J73MwGkO4sbxfZ8S/WPAbH5mCyfnrR/t4ffY5 pluGP9rCJLaXCpdOQnTyrI78rKDJZf/Ku5Q83XAdM0dGtg7RLMZtYEfaapNR9p4wgiEw 0/sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048250; x=1739653050; 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=j2FzoHSuAoX+1zQ7RA2/urh/hio8OfZSmlzrSvDG4W4=; b=XFZp3ZlOuFXF2Q85qZS6zlg6KBkzYD03oZ95ryskA0PMK7VNx2vP/gfv5eI9pGZaiF pWPBf21REabPVtUY911ETPSNB9xp2DPYMGBOHqUrMEz928Jq7N7qGZ9OhryiNiy110GN sJ21Ec9ZhF1Z+xOrl1u4IoSND8EOsD73iqHm5KIBijSxO0JHXT78a2MXlQRJL2lo9yhX I3DVrZgunRKa7iItZCm0ipaMtC6ntFfISTQiF4MZpd2Vef3gUpiI7j8CJ+kZSl+6avOC WQYu1SEsqjnHupBYM03WOQt8Q+n/MW2PUEPyvtgg3IGkxovyJ1I6zYuEzP2uTX/aGhte y8xA== X-Gm-Message-State: AOJu0YxcKEsbzZlIPAAnmFd8P2Zn2OHadoe0qe57Bze4vT6BjxFQuUtq wp6GhVc9fliHgL3NHtBqhW+GT1PvtqzhLh3vhNxRXlc91TdtOdkdX7Hk/rxETcufkMM94/U4/SB 6 X-Gm-Gg: ASbGnctX6moPK0i/sqQbY9SQgrfxBLH5C02lIGQ354KczxL3BwTPoOE2xXy+VzCUWuS e+eUQFeEDbWES/ucumy0uc/h9UfxJCbiKwoNS8vSeMhtGpowTFP1MQeXjqHdu9W+Au87SJ4ChRF a5e9PPYr8X/1oTPO5fD6C0T4wz8cOB1vXcedwsEciGbzShBlKBUhDsrC1H5gpye9c6bNQvn7WTb Pz9pY+0rBTMoC3hF4ZyOn9K0HRDrrxkUCpqffy1OKCEWSwy3xhQ9jYlF1E09vQRxiksuS+1KxeD 6RiBcEBDP9srY9V2dZhwOrDu22s8veGyTO3/sELcn0+4RI4= X-Received: by 2002:a17:902:d592:b0:217:9172:2ce1 with SMTP id d9443c01a7336-21f4e6d7d8bmr158877355ad.22.1739048249867; Sat, 08 Feb 2025 12:57:29 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 5/9] gitlab-ci: Replace aarch64 with arm in cross-i686-tci build Date: Sat, 8 Feb 2025 12:57:20 -0800 Message-ID: <20250208205725.568631-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Configuration of 64-bit host on 32-bit guest will shortly be denied. Use a 32-bit guest instead. Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- .gitlab-ci.d/crossbuilds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 95dfc39224..7ae0f966f1 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -61,7 +61,7 @@ cross-i686-tci: variables: IMAGE: debian-i686-cross ACCEL: tcg-interpreter - EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins --disable-kvm + EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,arm-softmmu,arm-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins --disable-kvm # Force tests to run with reduced parallelism, to see whether this # reduces the flakiness of this CI job. The CI # environment by default shows us 8 CPUs and so we From patchwork Sat Feb 8 20:57:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863299 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954248wrt; Sat, 8 Feb 2025 12:59:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWiMRNxpmlHeM+psb1/82Sw66dWRdVRDE/UuygMUMOJ5PnOk0fuJS/ZzmPXlp/9hZF0UMWI5g==@linaro.org X-Google-Smtp-Source: AGHT+IEmxHhqP0AgJTNNwtRfDzDfHH3CLzB/vaHo4jJppHU8cfA8d+Ha0uhXryhkHmURT0BW46A7 X-Received: by 2002:a05:620a:290c:b0:7a3:5f3f:c084 with SMTP id af79cd13be357-7c047c45d4bmr1291497585a.30.1739048345787; Sat, 08 Feb 2025 12:59:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048345; cv=none; d=google.com; s=arc-20240605; b=Y/ne2pMVmYsnagGnLvC14gdKzHAvXv5AdQC7pMxzspXZi1tokdo3my0QXm1lV9iWSa QpfYicyo9TEcll92oPZlBq/kc0Y0Cl2net27vM4KGgjMcsB3Xkhp5/xeLi+imbd0vBSK iR5VNUwz8ZXE7XE9KtQlalnjiFA93Kx6fnyR96n2ioMbEbai8YAMeZFR5mV/gYSJp70m 0p4E3CEmtANlxMzGYnZJIsqy3G1co51hTay9JsybcaIok4H48JGOtCN7/DYD6NGAXEmp xAd2BznCFBrvzIQhs6j6tIQYWa/97TVcxHfRz5p9uKC+mYej/qYKdZ8MZgXCISA2R6NM 6eKQ== 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=3ig5mIixAd1D8GX2WLlPtXqEvEbM1IN99JeDTCSsEl4=; fh=qi6M7+758Hm8qfC4GxHVnK55oMKkCiFOk69X0Z7vtIs=; b=indC+CWooaGH+Evh6ORJ5ORXL4qH3MC0kinmF+tiqZ46XhZ02UkVcGkSwKugqX/izC BiNTCsoeXZt9vDkkdluaVGZpUVRK/5t7mdDtHbL5KS+gPRCXlLSFjhXF96oYWTYbLk1N z6QGVpOTlKB5PDiKM7ZgO6SH6R7+EVNVerOW5pKlzMzX59UQlp0mZCYi1IjPHGBkTUux Rd+8C5wGeD9jH85x4oqDYqcyL9J0fk9/ZQ7IgeGq4A2GavgUgfwqPXqFxahQrZ+p0cfm N7h5oqBCG9arFdYL5qnkxsU9LBjJUPVEZ5Y7JsSmt4hWkNfqrkqO7ddGRWfOM3Ufco6m OnEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gknjQScR; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c041eb5120si607064785a.371.2025.02.08.12.59.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:59:05 -0800 (PST) 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=@linaro.org header.s=google header.b=gknjQScR; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtT-0001uk-Fk; Sat, 08 Feb 2025 15:57:39 -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 1tgrtP-0001tT-F1 for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtM-000581-2j for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-21f5268cf50so25085375ad.1 for ; Sat, 08 Feb 2025 12:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048251; x=1739653051; 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=3ig5mIixAd1D8GX2WLlPtXqEvEbM1IN99JeDTCSsEl4=; b=gknjQScR0MungYUHVZWOK3mgAO/5YylL0/bxnTOm8dbyXf9nCHHoyDmeSIRyV4ay5T BEz9hNTUIMkMBw9jY+XgOgQPlU0P4Jnn7FGCI7f+VfvXDCUzYhMMKTOPVAXTVrjklSgV CT06mloj1x10Y4UQywmQ1Sz6yllluYxkKOcW/2vwI/MEyNVkkTN/JPYh6Ps2fnawQE5R c9c6KTYjXfbuN/WjMPZ3KtFjtClAuObF1MzI6BQTNz5XryWiZoz8JpxLhfSwczPfwGl9 DhHjgt9l1E4CF/OCqdIgky5IZh7USuwwCtsVqfu+Klo0LKJ/UN6NSlS9ftAFl2jrwaeG AzaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048251; x=1739653051; 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=3ig5mIixAd1D8GX2WLlPtXqEvEbM1IN99JeDTCSsEl4=; b=p9G6FJMG2HDtkd897r5toIVGRanln+ZRKvd6bA6nIq7UTKokC751HKERdIOmiDD/+D r1LvpWbhnCGNmQP3S/Lf6aqkxMPGnTA1ycDpCqgX7cdPYqbfXUEz/o4JaTBjk/BqvERN 40XfIQTQJ6iYb/cW2zss++HxjU3hxsSAtFqItbFHbBtHti46OZUnibgV8bKmwy5qYP5n JXm9Tj8zmZryIvbkYrsq7rgAE34wGOLiN3o49gjpAIIWlD3azQTnApFU5hcZj+vyKrWE eG8DX/6ryJGbysj5+zjqTWyJhnchUlpbXq0pH6zzalUuvbaiftqBiUuqmq9/jIr92/Y8 NmPw== X-Gm-Message-State: AOJu0Yytz+sAqPN0tRn4JrPeOJ3t52r9roJlLeFDYXq3L9gPHeB1A1Rr 7VYLEaFNkZCLh6jqoQGURCMj76Kbtlga+hRia+EkD99Y87bLezG4ddOYJ21RKSBfDy+iBnNFXww E X-Gm-Gg: ASbGncvZwuL4uMfNF64iGjHc4zFRaxhQ2vDq7ACrGMEE6j2y/G6X9Mgb0lsvp0jeNCe aMJxybfSExJ3zaokeGqoLknIO2KVwfwdb7k4f+tSxYp2WVRkDjLMnGlur0ER/I24vnw7Tvn3mZR yPGPbVf9UtheS1gqv0I0pz+wjF6JT46aNETq9Kfs4mApBE6cS5nFH5OfVROc9TpMEdZd0G9V+gF fl0DDMAYEGMO/8jy44mV9HOOcr9CA6dJnU+tpl8m87+0uEFwSuqRlhpnDfx+d3dzRhKlEelDA+1 C7pezyLnBcNH7gwevjGGe6vyQmBoQ6DCqpj4POCgXYZTDYo= X-Received: by 2002:a17:902:d4c6:b0:21f:53a5:19de with SMTP id d9443c01a7336-21f53a52947mr110718435ad.25.1739048250647; Sat, 08 Feb 2025 12:57:30 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 6/9] configure: Define TARGET_LONG_BITS in configs/targets/*.mak Date: Sat, 8 Feb 2025 12:57:21 -0800 Message-ID: <20250208205725.568631-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Define TARGET_LONG_BITS in each target's configure fragment. Do this without removing the define in target/*/cpu-param.h so that errors are caught like so: In file included from .../src/include/exec/cpu-defs.h:26, from ../src/target/hppa/cpu.h:24, from ../src/linux-user/qemu.h:4, from ../src/linux-user/hppa/cpu_loop.c:21: ../src/target/hppa/cpu-param.h:11: error: "TARGET_LONG_BITS" redefined [-Werror] 11 | #define TARGET_LONG_BITS 64 | In file included from .../src/include/qemu/osdep.h:36, from ../src/linux-user/hppa/cpu_loop.c:20: ./hppa-linux-user-config-target.h:32: note: this is the location of the previous definition 32 | #define TARGET_LONG_BITS 32 | cc1: all warnings being treated as errors Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- configs/targets/aarch64-bsd-user.mak | 1 + configs/targets/aarch64-linux-user.mak | 1 + configs/targets/aarch64-softmmu.mak | 1 + configs/targets/aarch64_be-linux-user.mak | 1 + configs/targets/alpha-linux-user.mak | 1 + configs/targets/alpha-softmmu.mak | 1 + configs/targets/arm-bsd-user.mak | 1 + configs/targets/arm-linux-user.mak | 1 + configs/targets/arm-softmmu.mak | 1 + configs/targets/armeb-linux-user.mak | 1 + configs/targets/avr-softmmu.mak | 1 + configs/targets/hexagon-linux-user.mak | 1 + configs/targets/hppa-linux-user.mak | 2 ++ configs/targets/hppa-softmmu.mak | 1 + configs/targets/i386-bsd-user.mak | 1 + configs/targets/i386-linux-user.mak | 1 + configs/targets/i386-softmmu.mak | 1 + configs/targets/loongarch64-linux-user.mak | 1 + configs/targets/loongarch64-softmmu.mak | 1 + configs/targets/m68k-linux-user.mak | 1 + configs/targets/m68k-softmmu.mak | 1 + configs/targets/microblaze-linux-user.mak | 1 + configs/targets/microblaze-softmmu.mak | 3 +++ configs/targets/microblazeel-linux-user.mak | 1 + configs/targets/microblazeel-softmmu.mak | 3 +++ configs/targets/mips-linux-user.mak | 1 + configs/targets/mips-softmmu.mak | 1 + configs/targets/mips64-linux-user.mak | 1 + configs/targets/mips64-softmmu.mak | 1 + configs/targets/mips64el-linux-user.mak | 1 + configs/targets/mips64el-softmmu.mak | 1 + configs/targets/mipsel-linux-user.mak | 1 + configs/targets/mipsel-softmmu.mak | 1 + configs/targets/mipsn32-linux-user.mak | 1 + configs/targets/mipsn32el-linux-user.mak | 1 + configs/targets/or1k-linux-user.mak | 1 + configs/targets/or1k-softmmu.mak | 1 + configs/targets/ppc-linux-user.mak | 1 + configs/targets/ppc-softmmu.mak | 1 + configs/targets/ppc64-linux-user.mak | 1 + configs/targets/ppc64-softmmu.mak | 1 + configs/targets/ppc64le-linux-user.mak | 1 + configs/targets/riscv32-linux-user.mak | 1 + configs/targets/riscv32-softmmu.mak | 1 + configs/targets/riscv64-bsd-user.mak | 1 + configs/targets/riscv64-linux-user.mak | 1 + configs/targets/riscv64-softmmu.mak | 1 + configs/targets/rx-softmmu.mak | 1 + configs/targets/s390x-linux-user.mak | 1 + configs/targets/s390x-softmmu.mak | 1 + configs/targets/sh4-linux-user.mak | 1 + configs/targets/sh4-softmmu.mak | 1 + configs/targets/sh4eb-linux-user.mak | 1 + configs/targets/sh4eb-softmmu.mak | 1 + configs/targets/sparc-linux-user.mak | 1 + configs/targets/sparc-softmmu.mak | 1 + configs/targets/sparc32plus-linux-user.mak | 1 + configs/targets/sparc64-linux-user.mak | 1 + configs/targets/sparc64-softmmu.mak | 1 + configs/targets/tricore-softmmu.mak | 1 + configs/targets/x86_64-bsd-user.mak | 1 + configs/targets/x86_64-linux-user.mak | 1 + configs/targets/x86_64-softmmu.mak | 1 + configs/targets/xtensa-linux-user.mak | 1 + configs/targets/xtensa-softmmu.mak | 1 + configs/targets/xtensaeb-linux-user.mak | 1 + configs/targets/xtensaeb-softmmu.mak | 1 + 67 files changed, 72 insertions(+) diff --git a/configs/targets/aarch64-bsd-user.mak b/configs/targets/aarch64-bsd-user.mak index 8aaa5d8c80..f99c73377a 100644 --- a/configs/targets/aarch64-bsd-user.mak +++ b/configs/targets/aarch64-bsd-user.mak @@ -1,3 +1,4 @@ TARGET_ARCH=aarch64 TARGET_BASE_ARCH=arm TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/aarch64-pauth.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/aarch64-linux-user.mak b/configs/targets/aarch64-linux-user.mak index 4c6570f56a..b779ac3b4a 100644 --- a/configs/targets/aarch64-linux-user.mak +++ b/configs/targets/aarch64-linux-user.mak @@ -6,3 +6,4 @@ CONFIG_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret TARGET_SYSTBL=syscall_64.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-softmmu.mak index 84cb32dc2f..82cb72cb83 100644 --- a/configs/targets/aarch64-softmmu.mak +++ b/configs/targets/aarch64-softmmu.mak @@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml gdb-xml/aarch64-pauth.xml # needed by boot.c TARGET_NEED_FDT=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak index dcef597a80..ef9be02290 100644 --- a/configs/targets/aarch64_be-linux-user.mak +++ b/configs/targets/aarch64_be-linux-user.mak @@ -7,3 +7,4 @@ CONFIG_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y TARGET_SYSTBL_ABI=common,64,renameat,rlimit,memfd_secret TARGET_SYSTBL=syscall_64.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/alpha-linux-user.mak b/configs/targets/alpha-linux-user.mak index f7d3fb4afa..ef8e365b09 100644 --- a/configs/targets/alpha-linux-user.mak +++ b/configs/targets/alpha-linux-user.mak @@ -1,3 +1,4 @@ TARGET_ARCH=alpha TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/alpha-softmmu.mak b/configs/targets/alpha-softmmu.mak index 9dbe160740..89f3517aca 100644 --- a/configs/targets/alpha-softmmu.mak +++ b/configs/targets/alpha-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=alpha TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/arm-bsd-user.mak b/configs/targets/arm-bsd-user.mak index cb143e6426..472a4f9fb1 100644 --- a/configs/targets/arm-bsd-user.mak +++ b/configs/targets/arm-bsd-user.mak @@ -1,2 +1,3 @@ TARGET_ARCH=arm TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/arm-linux-user.mak b/configs/targets/arm-linux-user.mak index 7f5d65794c..bf35ded7fe 100644 --- a/configs/targets/arm-linux-user.mak +++ b/configs/targets/arm-linux-user.mak @@ -5,3 +5,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml TARGET_HAS_BFLT=y CONFIG_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/arm-softmmu.mak b/configs/targets/arm-softmmu.mak index bf390b7a8d..afc64f5927 100644 --- a/configs/targets/arm-softmmu.mak +++ b/configs/targets/arm-softmmu.mak @@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml # needed by boot.c TARGET_NEED_FDT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-linux-user.mak index 943d0d87bf..35fa4d91b3 100644 --- a/configs/targets/armeb-linux-user.mak +++ b/configs/targets/armeb-linux-user.mak @@ -6,3 +6,4 @@ TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml TARGET_HAS_BFLT=y CONFIG_SEMIHOSTING=y CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/avr-softmmu.mak b/configs/targets/avr-softmmu.mak index e3f921c019..b6157fc465 100644 --- a/configs/targets/avr-softmmu.mak +++ b/configs/targets/avr-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=avr TARGET_XML_FILES= gdb-xml/avr-cpu.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/hexagon-linux-user.mak b/configs/targets/hexagon-linux-user.mak index b912045bd3..aec1a04d1b 100644 --- a/configs/targets/hexagon-linux-user.mak +++ b/configs/targets/hexagon-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=hexagon TARGET_XML_FILES=gdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL_ABI=common,32,hexagon,time32,stat64,rlimit,renameat +TARGET_LONG_BITS=32 diff --git a/configs/targets/hppa-linux-user.mak b/configs/targets/hppa-linux-user.mak index 8e0a80492f..59190f6335 100644 --- a/configs/targets/hppa-linux-user.mak +++ b/configs/targets/hppa-linux-user.mak @@ -3,3 +3,5 @@ TARGET_ABI32=y TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y +# Compromise to ease maintenance vs system mode +TARGET_LONG_BITS=64 diff --git a/configs/targets/hppa-softmmu.mak b/configs/targets/hppa-softmmu.mak index a41662aa99..63ca74ed5e 100644 --- a/configs/targets/hppa-softmmu.mak +++ b/configs/targets/hppa-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=hppa TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/i386-bsd-user.mak b/configs/targets/i386-bsd-user.mak index 0283bb62a0..70e098da49 100644 --- a/configs/targets/i386-bsd-user.mak +++ b/configs/targets/i386-bsd-user.mak @@ -1,2 +1,3 @@ TARGET_ARCH=i386 TARGET_XML_FILES= gdb-xml/i386-32bit.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/i386-linux-user.mak b/configs/targets/i386-linux-user.mak index b72a156473..ea68a266fc 100644 --- a/configs/targets/i386-linux-user.mak +++ b/configs/targets/i386-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=i386 TARGET_SYSTBL_ABI=i386 TARGET_SYSTBL=syscall_32.tbl TARGET_XML_FILES= gdb-xml/i386-32bit.xml gdb-xml/i386-32bit-linux.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmmu.mak index 2eb0e86250..5dd8921756 100644 --- a/configs/targets/i386-softmmu.mak +++ b/configs/targets/i386-softmmu.mak @@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= gdb-xml/i386-32bit.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/loongarch64-linux-user.mak b/configs/targets/loongarch64-linux-user.mak index dfded79dfa..249a26a798 100644 --- a/configs/targets/loongarch64-linux-user.mak +++ b/configs/targets/loongarch64-linux-user.mak @@ -4,3 +4,4 @@ TARGET_BASE_ARCH=loongarch TARGET_XML_FILES=gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml TARGET_SYSTBL=syscall.tbl TARGET_SYSTBL_ABI=common,64 +TARGET_LONG_BITS=64 diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loongarch64-softmmu.mak index ce19ab6a16..351341132f 100644 --- a/configs/targets/loongarch64-softmmu.mak +++ b/configs/targets/loongarch64-softmmu.mak @@ -5,3 +5,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml # all boards require libfdt TARGET_NEED_FDT=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-linux-user.mak index 579b5d299c..2d9bae2270 100644 --- a/configs/targets/m68k-linux-user.mak +++ b/configs/targets/m68k-linux-user.mak @@ -4,3 +4,4 @@ TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml TARGET_HAS_BFLT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmmu.mak index bbcd0bada6..bacc52e96a 100644 --- a/configs/targets/m68k-softmmu.mak +++ b/configs/targets/m68k-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=m68k TARGET_BIG_ENDIAN=y TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/microblaze-linux-user.mak index 0a2322c249..3772779769 100644 --- a/configs/targets/microblaze-linux-user.mak +++ b/configs/targets/microblaze-linux-user.mak @@ -4,3 +4,4 @@ TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_HAS_BFLT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/microblaze-softmmu.mak index eea266d4f3..99a33ed44a 100644 --- a/configs/targets/microblaze-softmmu.mak +++ b/configs/targets/microblaze-softmmu.mak @@ -4,3 +4,6 @@ TARGET_SUPPORTS_MTTCG=y # needed by boot.c TARGET_NEED_FDT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml +# System mode can address up to 64 bits via lea/sea instructions. +# TODO: These bypass the mmu, so we could emulate these differently. +TARGET_LONG_BITS=64 diff --git a/configs/targets/microblazeel-linux-user.mak b/configs/targets/microblazeel-linux-user.mak index 270743156a..a51a05488d 100644 --- a/configs/targets/microblazeel-linux-user.mak +++ b/configs/targets/microblazeel-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl TARGET_HAS_BFLT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/microblazeel-softmmu.mak index 77b968acad..52cdeae1a2 100644 --- a/configs/targets/microblazeel-softmmu.mak +++ b/configs/targets/microblazeel-softmmu.mak @@ -3,3 +3,6 @@ TARGET_SUPPORTS_MTTCG=y # needed by boot.c TARGET_NEED_FDT=y TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml +# System mode can address up to 64 bits via lea/sea instructions. +# TODO: These bypass the mmu, so we could emulate these differently. +TARGET_LONG_BITS=64 diff --git a/configs/targets/mips-linux-user.mak b/configs/targets/mips-linux-user.mak index b4569a9893..69bdc459b6 100644 --- a/configs/targets/mips-linux-user.mak +++ b/configs/targets/mips-linux-user.mak @@ -3,3 +3,4 @@ TARGET_ABI_MIPSO32=y TARGET_SYSTBL_ABI=o32 TARGET_SYSTBL=syscall_o32.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmmu.mak index d34b4083fc..b62a088249 100644 --- a/configs/targets/mips-softmmu.mak +++ b/configs/targets/mips-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=mips TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/mips64-linux-user.mak b/configs/targets/mips64-linux-user.mak index d2ff509a11..04e82b3ab1 100644 --- a/configs/targets/mips64-linux-user.mak +++ b/configs/targets/mips64-linux-user.mak @@ -4,3 +4,4 @@ TARGET_BASE_ARCH=mips TARGET_SYSTBL_ABI=n64 TARGET_SYSTBL=syscall_n64.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-softmmu.mak index 12d9483bf0..7202655fca 100644 --- a/configs/targets/mips64-softmmu.mak +++ b/configs/targets/mips64-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=mips64 TARGET_BASE_ARCH=mips TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/mips64el-linux-user.mak b/configs/targets/mips64el-linux-user.mak index f9efeec8ea..27f4169426 100644 --- a/configs/targets/mips64el-linux-user.mak +++ b/configs/targets/mips64el-linux-user.mak @@ -3,3 +3,4 @@ TARGET_ABI_MIPSN64=y TARGET_BASE_ARCH=mips TARGET_SYSTBL_ABI=n64 TARGET_SYSTBL=syscall_n64.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/mips64el-softmmu.mak b/configs/targets/mips64el-softmmu.mak index 3864daa736..3ebeadb29e 100644 --- a/configs/targets/mips64el-softmmu.mak +++ b/configs/targets/mips64el-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=mips64 TARGET_BASE_ARCH=mips +TARGET_LONG_BITS=64 diff --git a/configs/targets/mipsel-linux-user.mak b/configs/targets/mipsel-linux-user.mak index e8d7241d31..8b7e86ab28 100644 --- a/configs/targets/mipsel-linux-user.mak +++ b/configs/targets/mipsel-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=mips TARGET_ABI_MIPSO32=y TARGET_SYSTBL_ABI=o32 TARGET_SYSTBL=syscall_o32.tbl +TARGET_LONG_BITS=32 diff --git a/configs/targets/mipsel-softmmu.mak b/configs/targets/mipsel-softmmu.mak index 0829659fc2..620ec68178 100644 --- a/configs/targets/mipsel-softmmu.mak +++ b/configs/targets/mipsel-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=mips TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/mipsn32-linux-user.mak b/configs/targets/mipsn32-linux-user.mak index 206095da64..39ae214633 100644 --- a/configs/targets/mipsn32-linux-user.mak +++ b/configs/targets/mipsn32-linux-user.mak @@ -5,3 +5,4 @@ TARGET_BASE_ARCH=mips TARGET_SYSTBL_ABI=n32 TARGET_SYSTBL=syscall_n32.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/mipsn32el-linux-user.mak b/configs/targets/mipsn32el-linux-user.mak index ca2a3ed753..d9b61d6990 100644 --- a/configs/targets/mipsn32el-linux-user.mak +++ b/configs/targets/mipsn32el-linux-user.mak @@ -4,3 +4,4 @@ TARGET_ABI32=y TARGET_BASE_ARCH=mips TARGET_SYSTBL_ABI=n32 TARGET_SYSTBL=syscall_n32.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-linux-user.mak index eecb1e2241..810567a98f 100644 --- a/configs/targets/or1k-linux-user.mak +++ b/configs/targets/or1k-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=openrisc TARGET_BIG_ENDIAN=y TARGET_SYSTBL_ABI=common,32,or1k,time32,stat64,rlimit,renameat TARGET_SYSTBL=syscall.tbl +TARGET_LONG_BITS=32 diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmmu.mak index 0341cb2a6b..adfddb1a8a 100644 --- a/configs/targets/or1k-softmmu.mak +++ b/configs/targets/or1k-softmmu.mak @@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_BIG_ENDIAN=y # needed by boot.c and all boards TARGET_NEED_FDT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/ppc-linux-user.mak b/configs/targets/ppc-linux-user.mak index cc0439a528..970d04a5ba 100644 --- a/configs/targets/ppc-linux-user.mak +++ b/configs/targets/ppc-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common,nospu,32 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak index 53120dab41..9bfa7df6c3 100644 --- a/configs/targets/ppc-softmmu.mak +++ b/configs/targets/ppc-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=ppc TARGET_BIG_ENDIAN=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml +TARGET_LONG_BITS=32 diff --git a/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-linux-user.mak index 4d81969f4a..461f1c67d1 100644 --- a/configs/targets/ppc64-linux-user.mak +++ b/configs/targets/ppc64-linux-user.mak @@ -5,3 +5,4 @@ TARGET_SYSTBL_ABI=common,nospu,64 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak index 40881d9396..7cee0e97f4 100644 --- a/configs/targets/ppc64-softmmu.mak +++ b/configs/targets/ppc64-softmmu.mak @@ -6,3 +6,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml # all boards require libfdt TARGET_NEED_FDT=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/ppc64le-linux-user.mak b/configs/targets/ppc64le-linux-user.mak index 426d5a28d6..cf9d8a400d 100644 --- a/configs/targets/ppc64le-linux-user.mak +++ b/configs/targets/ppc64le-linux-user.mak @@ -4,3 +4,4 @@ TARGET_ABI_DIR=ppc TARGET_SYSTBL_ABI=common,nospu,64 TARGET_SYSTBL=syscall.tbl TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/riscv32-linux-user.mak b/configs/targets/riscv32-linux-user.mak index 0dbaf5210a..a0ef03c0c3 100644 --- a/configs/targets/riscv32-linux-user.mak +++ b/configs/targets/riscv32-linux-user.mak @@ -7,3 +7,4 @@ CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y TARGET_SYSTBL_ABI=32 TARGET_SYSTBL_ABI=common,32,riscv,memfd_secret TARGET_SYSTBL=syscall.tbl +TARGET_LONG_BITS=32 diff --git a/configs/targets/riscv32-softmmu.mak b/configs/targets/riscv32-softmmu.mak index 338182d5b8..c828066ce6 100644 --- a/configs/targets/riscv32-softmmu.mak +++ b/configs/targets/riscv32-softmmu.mak @@ -4,3 +4,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/riscv64-bsd-user.mak b/configs/targets/riscv64-bsd-user.mak index 191c2c483f..c6348a7962 100644 --- a/configs/targets/riscv64-bsd-user.mak +++ b/configs/targets/riscv64-bsd-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=riscv64 TARGET_BASE_ARCH=riscv TARGET_ABI_DIR=riscv TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/riscv64-linux-user.mak b/configs/targets/riscv64-linux-user.mak index 477cd4523e..aac7568305 100644 --- a/configs/targets/riscv64-linux-user.mak +++ b/configs/targets/riscv64-linux-user.mak @@ -7,3 +7,4 @@ CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y TARGET_SYSTBL_ABI=64 TARGET_SYSTBL_ABI=common,64,riscv,rlimit,memfd_secret TARGET_SYSTBL=syscall.tbl +TARGET_LONG_BITS=64 diff --git a/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-softmmu.mak index 6c5de72e03..09f613d24a 100644 --- a/configs/targets/riscv64-softmmu.mak +++ b/configs/targets/riscv64-softmmu.mak @@ -5,3 +5,4 @@ TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-virtual.xml # needed by boot.c TARGET_NEED_FDT=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/rx-softmmu.mak b/configs/targets/rx-softmmu.mak index 706bbe6062..1c250a6450 100644 --- a/configs/targets/rx-softmmu.mak +++ b/configs/targets/rx-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=rx TARGET_XML_FILES= gdb-xml/rx-core.xml # all boards require libfdt TARGET_NEED_FDT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-linux-user.mak index 24c04c8589..68c2f28872 100644 --- a/configs/targets/s390x-linux-user.mak +++ b/configs/targets/s390x-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common,64 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak index b22218aacc..5242ebe7c2 100644 --- a/configs/targets/s390x-softmmu.mak +++ b/configs/targets/s390x-softmmu.mak @@ -3,3 +3,4 @@ TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-virt-kvm.xml gdb-xml/s390-gs.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/sh4-linux-user.mak b/configs/targets/sh4-linux-user.mak index 9908887566..d58c5471b7 100644 --- a/configs/targets/sh4-linux-user.mak +++ b/configs/targets/sh4-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=sh4 TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl TARGET_HAS_BFLT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/sh4-softmmu.mak b/configs/targets/sh4-softmmu.mak index f9d62d91e4..787d349b50 100644 --- a/configs/targets/sh4-softmmu.mak +++ b/configs/targets/sh4-softmmu.mak @@ -1 +1,2 @@ TARGET_ARCH=sh4 +TARGET_LONG_BITS=32 diff --git a/configs/targets/sh4eb-linux-user.mak b/configs/targets/sh4eb-linux-user.mak index 9db6b3609c..99007f0f2d 100644 --- a/configs/targets/sh4eb-linux-user.mak +++ b/configs/targets/sh4eb-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_HAS_BFLT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-softmmu.mak index 226b1fc698..cdea2c61c5 100644 --- a/configs/targets/sh4eb-softmmu.mak +++ b/configs/targets/sh4eb-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=sh4 TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-linux-user.mak index abcfb8fc62..4ff4b7287d 100644 --- a/configs/targets/sparc-linux-user.mak +++ b/configs/targets/sparc-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=sparc TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-softmmu.mak index a5d9200382..78c2e25bd1 100644 --- a/configs/targets/sparc-softmmu.mak +++ b/configs/targets/sparc-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=sparc TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/sparc32plus-linux-user.mak index 6cc8fa516b..7a16934fd1 100644 --- a/configs/targets/sparc32plus-linux-user.mak +++ b/configs/targets/sparc32plus-linux-user.mak @@ -5,3 +5,4 @@ TARGET_ABI_DIR=sparc TARGET_SYSTBL_ABI=common,32 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc64-linux-user.mak index 52f05ec000..64ea04e3e2 100644 --- a/configs/targets/sparc64-linux-user.mak +++ b/configs/targets/sparc64-linux-user.mak @@ -4,3 +4,4 @@ TARGET_ABI_DIR=sparc TARGET_SYSTBL_ABI=common,64 TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-softmmu.mak index 36ca64ec41..f7bab97a00 100644 --- a/configs/targets/sparc64-softmmu.mak +++ b/configs/targets/sparc64-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=sparc64 TARGET_BASE_ARCH=sparc TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=64 diff --git a/configs/targets/tricore-softmmu.mak b/configs/targets/tricore-softmmu.mak index 96b10af853..781ce49a62 100644 --- a/configs/targets/tricore-softmmu.mak +++ b/configs/targets/tricore-softmmu.mak @@ -1 +1,2 @@ TARGET_ARCH=tricore +TARGET_LONG_BITS=32 diff --git a/configs/targets/x86_64-bsd-user.mak b/configs/targets/x86_64-bsd-user.mak index 799cd4acd4..d62d656f2c 100644 --- a/configs/targets/x86_64-bsd-user.mak +++ b/configs/targets/x86_64-bsd-user.mak @@ -1,3 +1,4 @@ TARGET_ARCH=x86_64 TARGET_BASE_ARCH=i386 TARGET_XML_FILES= gdb-xml/i386-64bit.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/x86_64-linux-user.mak b/configs/targets/x86_64-linux-user.mak index 86042814d3..b093ab5a16 100644 --- a/configs/targets/x86_64-linux-user.mak +++ b/configs/targets/x86_64-linux-user.mak @@ -3,3 +3,4 @@ TARGET_BASE_ARCH=i386 TARGET_SYSTBL_ABI=common,64 TARGET_SYSTBL=syscall_64.tbl TARGET_XML_FILES= gdb-xml/i386-64bit.xml gdb-xml/i386-64bit-linux.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-softmmu.mak index 920e9a4200..1ceefde131 100644 --- a/configs/targets/x86_64-softmmu.mak +++ b/configs/targets/x86_64-softmmu.mak @@ -4,3 +4,4 @@ TARGET_SUPPORTS_MTTCG=y TARGET_KVM_HAVE_GUEST_DEBUG=y TARGET_KVM_HAVE_RESET_PARKED_VCPU=y TARGET_XML_FILES= gdb-xml/i386-64bit.xml +TARGET_LONG_BITS=64 diff --git a/configs/targets/xtensa-linux-user.mak b/configs/targets/xtensa-linux-user.mak index 420b30a68d..cbec6e368a 100644 --- a/configs/targets/xtensa-linux-user.mak +++ b/configs/targets/xtensa-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=xtensa TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl TARGET_HAS_BFLT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/xtensa-softmmu.mak b/configs/targets/xtensa-softmmu.mak index f075557bfa..65845df4ff 100644 --- a/configs/targets/xtensa-softmmu.mak +++ b/configs/targets/xtensa-softmmu.mak @@ -1,2 +1,3 @@ TARGET_ARCH=xtensa TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/xtensaeb-linux-user.mak b/configs/targets/xtensaeb-linux-user.mak index bce2d1d65d..f455b1c780 100644 --- a/configs/targets/xtensaeb-linux-user.mak +++ b/configs/targets/xtensaeb-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=common TARGET_SYSTBL=syscall.tbl TARGET_BIG_ENDIAN=y TARGET_HAS_BFLT=y +TARGET_LONG_BITS=32 diff --git a/configs/targets/xtensaeb-softmmu.mak b/configs/targets/xtensaeb-softmmu.mak index b02e11b820..f1f789d697 100644 --- a/configs/targets/xtensaeb-softmmu.mak +++ b/configs/targets/xtensaeb-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=xtensa TARGET_BIG_ENDIAN=y TARGET_SUPPORTS_MTTCG=y +TARGET_LONG_BITS=32 From patchwork Sat Feb 8 20:57:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863304 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954288wrt; Sat, 8 Feb 2025 12:59:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVzWYmHVteIv1ZWIYDQWkLo20khiajLyOkYS1ZVyaD/BB0b99OLdXEBGf0wdEyzRtH2u7F+Sg==@linaro.org X-Google-Smtp-Source: AGHT+IGmK/vSshw8xWhjswu/32O5Gu5zQbfMQ0Y+d8dGGxd03ZTugKBFPTvtwDOuNGe2IHIiKTtT X-Received: by 2002:a05:6214:240c:b0:6d4:1bad:740c with SMTP id 6a1803df08f44-6e4455d6e11mr109193166d6.4.1739048358533; Sat, 08 Feb 2025 12:59:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048358; cv=none; d=google.com; s=arc-20240605; b=e2iS0NDqMMbBl3J0p+g7hWErUkgX3qPHmS7EawlUdBP8gtTZ9BPwvxQOjOq179zP0U YVbEgJLY13k1/QQ0ytm60MIscaL0mCEhunkFdsUpJ9vF3USidPu3gb9NqY3Wnshqvj1a cGqRvBa4peQmAjTJ+iPo3fJDpAwEqwQ9+wEG4o7FacaqS7OYVFjuwlZeCPSs7GqZx4EJ aYJuzcSkSONZFoTeMnX+n9NSjikd+mfqfw30OivAMdNlB3CrXesArIgHbrBSmhLCZXGg QfAkCzy3+Bp++R9rs18IN7pwZtfMlZ/U5XyI0FNucRsd2ohETDVPLyUcQQCUjhYVkija GTXA== 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=CzZogz5f66qmacMYOhcZXgO+/2EwLVWTtxU+MCKdark=; fh=PKoaD/5wWQTTiSs2HMGSCSqe0ZXvo1tbbTb7pxvOEgo=; b=IrHy51YRQXSwZTrovcv2gDeIQ7O4i4qznj1CZOsm3MXhRVPcirSJl6Q/qe/cpihn9T C3+8R/NJjCqAwfTA4Ile4H+66KIxJLGfgwCIqrcjgRSLPhgIHHCs6C6MQpGnxTwKFrfk zD3oRerIsfd2R4S/E4SH1mNvt7Nb8PgEhK8xVKla2g2Ibs8/ZPfxhkdGf7FiiivO9Eb/ 9oKMoGqUp6hepod/qrTXhMx+GjuQU2GaF2FyNWuTo2qAxfOZF5n3KSdghVvT25pZYx1j cpo9coDOAyW2HCaleV6h6oMyACZT86drqLgMj42FDv9RlaZ+eu/r3CHedFpZdVTBHSDs S7Hw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CPX6Q5vK; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e44f460415si29270236d6.119.2025.02.08.12.59.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:59:18 -0800 (PST) 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=@linaro.org header.s=google header.b=CPX6Q5vK; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtQ-0001tl-1s; Sat, 08 Feb 2025 15:57:36 -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 1tgrtO-0001tF-L0 for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:34 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtM-000587-Jl for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:34 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-21f78b1fb7dso4824385ad.3 for ; Sat, 08 Feb 2025 12:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048251; x=1739653051; 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=CzZogz5f66qmacMYOhcZXgO+/2EwLVWTtxU+MCKdark=; b=CPX6Q5vK79zQ7x2geEEN628ydr7hjtliWhyIEhEx2w1mxwNVCxj+UbimRdhHzDHpeq kdiDefROZQX45Vlb8+POVh9KhO2DiWb7hdmY5J6YPs3qz9tUtSxRdGgoyfxTlsxoOOIm 3KCbQBTKJhfrDY+X/3aX7PMnKeJsVycmlVIQRLk/AO1aps386qL0oRDN95r0ucI7ILG9 pikJP5oOO+uqr35h7IhOkpkPAQAPKVncIDxujz97VfusCON59VsxBXSscu6SaS1jvo54 0jkkUecMXsZUUiMwo0fDZ26hlDwN4o+hcfZC7rQ8yBQnIEDcOQDuJZxZJgSnIctFRFNd FIXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048251; x=1739653051; 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=CzZogz5f66qmacMYOhcZXgO+/2EwLVWTtxU+MCKdark=; b=N2QZrXqdI0Hc/C3ccdbC8Gq92wvWSFfLu4T2hsIdSOkjLKs8knYfuJ5ygktvBmifQM jsiLEqz2N5vwgK5rTM1i2RD4t7QTSydSeOxGDnAnLJzWRjpQaQYwTnn6VVZhCICASiVr Ml/p3ZIPjFSPF/vYq5EANFgwmSikGePYA81/gd3QIT7ADH3CduTPNtnk4vv6c10+1XMl YcsghtFu8xKXqv1EgbHtfV+xoMpqPDDCgSuqCv/EeB8H33MZBi5Q0BGqon2iGBNd2OIi q7KBXRvGYiT7oTECvIOeGsISltxpT1zZIkkVX9bbaSmOMgJ4HjCFUNEb9+64AP2b4OWd O9Dg== X-Gm-Message-State: AOJu0YxMwUywrGOFol3l6keg2YxZmvQ3l9AQapT8fzF3pLW2krvveWyX gGjbJ6cP5pPjsHbiYFQp3eW9BcLUhaaP6+Cq7duW/alPS2QfIejNSryXoJOwIBk72LzdUI2MH8L J X-Gm-Gg: ASbGncv0FeTZwijIgQt30/HVbc1stc9nl6ryhIFcUrCz0nxf0Jo0sdFvhS/dp6xpx9p aceTZiyzAbfJeWXdbbY/4Y0kIiIU4O7+Y0L86mQ2d2QUV4dbGMMplb2q9aNAaLhKBT7AAatvACZ fS0GT+l57a0zcsAXso/PsoaWByeJSxtQYHWoICIrVpLpKQGXN8+9Bx/UY0l4/HaU8mM9w6c+rMO 2nZ5u7zeMNdEwu+Vticq1ZRt08YN0aa3qoLpAiAwgqV9jJBXc31cFIYfHDIzENV7hqt8u5gcbtS fGB3cCjfIUpuaLliGSBEKGQ4I+/OmnogL0R8Bzbz1Ac+8W8= X-Received: by 2002:a17:902:ecc9:b0:215:9379:4650 with SMTP id d9443c01a7336-21f4e7596d3mr123757235ad.42.1739048251362; Sat, 08 Feb 2025 12:57:31 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 7/9] target/*: Remove TARGET_LONG_BITS from cpu-param.h Date: Sat, 8 Feb 2025 12:57:22 -0800 Message-ID: <20250208205725.568631-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is now handled by the configs/targets/*.mak fragment. Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/alpha/cpu-param.h | 2 -- target/arm/cpu-param.h | 2 -- target/avr/cpu-param.h | 1 - target/hexagon/cpu-param.h | 1 - target/hppa/cpu-param.h | 2 -- target/i386/cpu-param.h | 2 -- target/loongarch/cpu-param.h | 1 - target/m68k/cpu-param.h | 1 - target/microblaze/cpu-param.h | 2 -- target/mips/cpu-param.h | 5 ----- target/openrisc/cpu-param.h | 1 - target/ppc/cpu-param.h | 2 -- target/riscv/cpu-param.h | 2 -- target/rx/cpu-param.h | 1 - target/s390x/cpu-param.h | 1 - target/sh4/cpu-param.h | 1 - target/sparc/cpu-param.h | 2 -- target/tricore/cpu-param.h | 1 - target/xtensa/cpu-param.h | 1 - 19 files changed, 31 deletions(-) diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h index c21ddf1afd..ff06e41497 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -8,8 +8,6 @@ #ifndef ALPHA_CPU_PARAM_H #define ALPHA_CPU_PARAM_H -#define TARGET_LONG_BITS 64 - /* ??? EV4 has 34 phys addr bits, EV5 has 40, EV6 has 44. */ #define TARGET_PHYS_ADDR_SPACE_BITS 44 diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h index bed29613c8..896b35bd6d 100644 --- a/target/arm/cpu-param.h +++ b/target/arm/cpu-param.h @@ -9,11 +9,9 @@ #define ARM_CPU_PARAM_H #ifdef TARGET_AARCH64 -# define TARGET_LONG_BITS 64 # define TARGET_PHYS_ADDR_SPACE_BITS 52 # define TARGET_VIRT_ADDR_SPACE_BITS 52 #else -# define TARGET_LONG_BITS 32 # define TARGET_PHYS_ADDR_SPACE_BITS 40 # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h index 93c2f470d0..81f3f49ee1 100644 --- a/target/avr/cpu-param.h +++ b/target/avr/cpu-param.h @@ -21,7 +21,6 @@ #ifndef AVR_CPU_PARAM_H #define AVR_CPU_PARAM_H -#define TARGET_LONG_BITS 32 /* * TARGET_PAGE_BITS cannot be more than 8 bits because * 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they diff --git a/target/hexagon/cpu-param.h b/target/hexagon/cpu-param.h index 71b4a9b83e..45ee7b4640 100644 --- a/target/hexagon/cpu-param.h +++ b/target/hexagon/cpu-param.h @@ -19,7 +19,6 @@ #define HEXAGON_CPU_PARAM_H #define TARGET_PAGE_BITS 16 /* 64K pages */ -#define TARGET_LONG_BITS 32 #define TARGET_PHYS_ADDR_SPACE_BITS 36 #define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h index ef3200f0f3..7ed6b5741e 100644 --- a/target/hppa/cpu-param.h +++ b/target/hppa/cpu-param.h @@ -8,8 +8,6 @@ #ifndef HPPA_CPU_PARAM_H #define HPPA_CPU_PARAM_H -#define TARGET_LONG_BITS 64 - #if defined(CONFIG_USER_ONLY) && defined(TARGET_ABI32) # define TARGET_PHYS_ADDR_SPACE_BITS 32 # define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h index 8c75abe141..b0e884c5d7 100644 --- a/target/i386/cpu-param.h +++ b/target/i386/cpu-param.h @@ -9,7 +9,6 @@ #define I386_CPU_PARAM_H #ifdef TARGET_X86_64 -# define TARGET_LONG_BITS 64 # define TARGET_PHYS_ADDR_SPACE_BITS 52 /* * ??? This is really 48 bits, sign-extended, but the only thing @@ -18,7 +17,6 @@ */ # define TARGET_VIRT_ADDR_SPACE_BITS 47 #else -# define TARGET_LONG_BITS 32 # define TARGET_PHYS_ADDR_SPACE_BITS 36 # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif diff --git a/target/loongarch/cpu-param.h b/target/loongarch/cpu-param.h index db5ad1c69f..52437946e5 100644 --- a/target/loongarch/cpu-param.h +++ b/target/loongarch/cpu-param.h @@ -8,7 +8,6 @@ #ifndef LOONGARCH_CPU_PARAM_H #define LOONGARCH_CPU_PARAM_H -#define TARGET_LONG_BITS 64 #define TARGET_PHYS_ADDR_SPACE_BITS 48 #define TARGET_VIRT_ADDR_SPACE_BITS 48 diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h index 5bbe623ba7..7afbf6d302 100644 --- a/target/m68k/cpu-param.h +++ b/target/m68k/cpu-param.h @@ -8,7 +8,6 @@ #ifndef M68K_CPU_PARAM_H #define M68K_CPU_PARAM_H -#define TARGET_LONG_BITS 32 /* * Coldfire Linux uses 8k pages * and m68k linux uses 4k pages diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h index 00efb509e3..c866ec6c14 100644 --- a/target/microblaze/cpu-param.h +++ b/target/microblaze/cpu-param.h @@ -17,11 +17,9 @@ * of address space. */ #ifdef CONFIG_USER_ONLY -#define TARGET_LONG_BITS 32 #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 #else -#define TARGET_LONG_BITS 64 #define TARGET_PHYS_ADDR_SPACE_BITS 64 #define TARGET_VIRT_ADDR_SPACE_BITS 64 #endif diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index f3a37e2dbe..11b3ac0ac6 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -7,11 +7,6 @@ #ifndef MIPS_CPU_PARAM_H #define MIPS_CPU_PARAM_H -#ifdef TARGET_MIPS64 -# define TARGET_LONG_BITS 64 -#else -# define TARGET_LONG_BITS 32 -#endif #ifdef TARGET_ABI_MIPSN64 #define TARGET_PHYS_ADDR_SPACE_BITS 48 #define TARGET_VIRT_ADDR_SPACE_BITS 48 diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h index 6169ed9f55..37627f2c39 100644 --- a/target/openrisc/cpu-param.h +++ b/target/openrisc/cpu-param.h @@ -8,7 +8,6 @@ #ifndef OPENRISC_CPU_PARAM_H #define OPENRISC_CPU_PARAM_H -#define TARGET_LONG_BITS 32 #define TARGET_PAGE_BITS 13 #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h index 9c481b9f6c..6c4525fdf3 100644 --- a/target/ppc/cpu-param.h +++ b/target/ppc/cpu-param.h @@ -9,7 +9,6 @@ #define PPC_CPU_PARAM_H #ifdef TARGET_PPC64 -# define TARGET_LONG_BITS 64 /* * Note that the official physical address space bits is 62-M where M * is implementation dependent. I've not looked up M for the set of @@ -27,7 +26,6 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 64 # endif #else -# define TARGET_LONG_BITS 32 # define TARGET_PHYS_ADDR_SPACE_BITS 36 # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h index 25686192c0..fba30e966a 100644 --- a/target/riscv/cpu-param.h +++ b/target/riscv/cpu-param.h @@ -9,11 +9,9 @@ #define RISCV_CPU_PARAM_H #if defined(TARGET_RISCV64) -# define TARGET_LONG_BITS 64 # define TARGET_PHYS_ADDR_SPACE_BITS 56 /* 44-bit PPN */ # define TARGET_VIRT_ADDR_SPACE_BITS 48 /* sv48 */ #elif defined(TARGET_RISCV32) -# define TARGET_LONG_BITS 32 # define TARGET_PHYS_ADDR_SPACE_BITS 34 /* 22-bit PPN */ # define TARGET_VIRT_ADDR_SPACE_BITS 32 /* sv32 */ #endif diff --git a/target/rx/cpu-param.h b/target/rx/cpu-param.h index 521d669bdf..ef1970a09e 100644 --- a/target/rx/cpu-param.h +++ b/target/rx/cpu-param.h @@ -19,7 +19,6 @@ #ifndef RX_CPU_PARAM_H #define RX_CPU_PARAM_H -#define TARGET_LONG_BITS 32 #define TARGET_PAGE_BITS 12 #define TARGET_PHYS_ADDR_SPACE_BITS 32 diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h index a05ffcf78d..5c331ec424 100644 --- a/target/s390x/cpu-param.h +++ b/target/s390x/cpu-param.h @@ -8,7 +8,6 @@ #ifndef S390_CPU_PARAM_H #define S390_CPU_PARAM_H -#define TARGET_LONG_BITS 64 #define TARGET_PAGE_BITS 12 #define TARGET_PHYS_ADDR_SPACE_BITS 64 #define TARGET_VIRT_ADDR_SPACE_BITS 64 diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h index a30ba992b3..2b6e11dd0a 100644 --- a/target/sh4/cpu-param.h +++ b/target/sh4/cpu-param.h @@ -8,7 +8,6 @@ #ifndef SH4_CPU_PARAM_H #define SH4_CPU_PARAM_H -#define TARGET_LONG_BITS 32 #define TARGET_PAGE_BITS 12 /* 4k */ #define TARGET_PHYS_ADDR_SPACE_BITS 32 #ifdef CONFIG_USER_ONLY diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h index 14105dc18b..6952ee2b82 100644 --- a/target/sparc/cpu-param.h +++ b/target/sparc/cpu-param.h @@ -8,7 +8,6 @@ #define SPARC_CPU_PARAM_H #ifdef TARGET_SPARC64 -# define TARGET_LONG_BITS 64 # define TARGET_PAGE_BITS 13 /* 8k */ # define TARGET_PHYS_ADDR_SPACE_BITS 41 # ifdef TARGET_ABI32 @@ -17,7 +16,6 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 44 # endif #else -# define TARGET_LONG_BITS 32 # define TARGET_PAGE_BITS 12 /* 4k */ # define TARGET_PHYS_ADDR_SPACE_BITS 36 # define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/tricore/cpu-param.h b/target/tricore/cpu-param.h index e29d551dd6..790242ef3d 100644 --- a/target/tricore/cpu-param.h +++ b/target/tricore/cpu-param.h @@ -8,7 +8,6 @@ #ifndef TRICORE_CPU_PARAM_H #define TRICORE_CPU_PARAM_H -#define TARGET_LONG_BITS 32 #define TARGET_PAGE_BITS 14 #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 diff --git a/target/xtensa/cpu-param.h b/target/xtensa/cpu-param.h index 0000725f2f..5e4848ad05 100644 --- a/target/xtensa/cpu-param.h +++ b/target/xtensa/cpu-param.h @@ -8,7 +8,6 @@ #ifndef XTENSA_CPU_PARAM_H #define XTENSA_CPU_PARAM_H -#define TARGET_LONG_BITS 32 #define TARGET_PAGE_BITS 12 #define TARGET_PHYS_ADDR_SPACE_BITS 32 #ifdef CONFIG_USER_ONLY From patchwork Sat Feb 8 20:57:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863297 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954120wrt; Sat, 8 Feb 2025 12:58:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXbG5eqWPeZK6MddUn50SC15KIm2tZzmBLOj5AzyIEGGlwJgqUWJziPcRIWTqq46RmolEdH1A==@linaro.org X-Google-Smtp-Source: AGHT+IGDC4l3uImqyoIyTsGCc3Rk3gO7TBZHo1AolLD1iHYa392YKBrCobBd5AQIdFtNlISCLC4n X-Received: by 2002:ac8:5ac4:0:b0:467:4b8d:2eea with SMTP id d75a77b69052e-47167ad8f17mr130049341cf.34.1739048307182; Sat, 08 Feb 2025 12:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048307; cv=none; d=google.com; s=arc-20240605; b=BldDzKjco4zw/JBJTmu/+AK8tVCOQn7Nov3UtvCs+ncynMGAXYJDEbuCaOhN7bPav6 xJQMlL44gFAOBQQRh8uZXkzIv9XnFN+ObdfwhUEY3k33bnq7BdwKgE7g1PQwVPnK12l7 W9Bb9ARgMUwvy5fbx7uD/FO/4sscPfAXra68fwzxnlIJOCFUGoNAuVCtK85LVQBxm6fV 73KL80K5AQ3OzDJbZelJIYVIkTrDXQqrb++C1q9eZFTZyJBh+Vg751uql65rw8JJMYs2 f9gKUKerof0+SMonRxFwdXtx2IY19ktbXfxW/gk/2wCkK82wp0eZuaiDq7RjcW6HjeNu PMeg== 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=eG/d8IONo4okZHoOBktlmuHynzB6DQe11EAuukemM7Q=; fh=qi6M7+758Hm8qfC4GxHVnK55oMKkCiFOk69X0Z7vtIs=; b=FSiHTVdDRi1M+lf5eYlyEb4zPffP/bgxJBCP/Eojc8a8zzLnmLwcO+L4ty4HIkoXqX 6YQ+fn++7LZAbmVOGN4eOcHZqo4zSz3lpBnXn021PLLX9MeUQPBGNRNoajq3qCupqD6f bbPqnL+GKDcJFPLLehS9+iDchMuJyypk821kDJ+VdvK4wqr/D4hp/rYKXBj15SylNADl xEeyqtm931IOaR0IL6Uiu5U3QnLcwldHZRr2GRKrH7CiWEEXcM9wahnsKc/XyT6I4Wnf xmc734Sz3mUyL94KyvxTiSj14b7lvhjF0OFKNjp5SHgVANIn0RR1Bu08KrKmsZTbTRFW IvAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OxAsnNWj; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47153ba5916si64739961cf.448.2025.02.08.12.58.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:58:27 -0800 (PST) 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=@linaro.org header.s=google header.b=OxAsnNWj; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtS-0001ui-Eh; Sat, 08 Feb 2025 15:57:38 -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 1tgrtP-0001tR-AI for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtN-00058I-AL for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-21f4500a5c3so57841115ad.3 for ; Sat, 08 Feb 2025 12:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048252; x=1739653052; 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=eG/d8IONo4okZHoOBktlmuHynzB6DQe11EAuukemM7Q=; b=OxAsnNWj8OyD7uEI7W5eqUZ8yfjydvr+VkNo/Jkb6EOgPPOfDHMUxvUSn9kcNnhist 2BV/iVb+E+vig8AZjhYBB/1lkHyZVaV3RDFOVPZaWxvBVQ+TvrJ/evKp655to+e0Uc6A bYoLnDr1vYQxdBpdc7kY/ojBertxGWb230vKrhoOUViiryRU0ld7ldrasWqDX/Ns3JLj vZYnWIOB3D8hmcqYaypXlKOXna+W4QilVeKwKCjijz5OI5E1sj3RK4I2HHX411VRm+zZ T155veSuLFdXQ05Tf1pJiUECGGMpsu8C1ZBW2WcWy4X3K3d7x+ICm/ZAl+ti2hptZxuO vZJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048252; x=1739653052; 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=eG/d8IONo4okZHoOBktlmuHynzB6DQe11EAuukemM7Q=; b=UII48c0BUOGx0HobYfsfA6INomZW2QUNccxisJlixhkvWvpotPKu6oR1KpC5EmFWIn CpcFGzvqZgxSg1FxAltyZmqdoQD7zJV0hd5vTa7OXIVqHB7kKlFfWsWnp6KVV2w7JkG5 WVzyihjakRQtsj+Hkjl4gTs2qJGD5xJSSKmi+vewb98uQduK1rCrGHpxypbx2exjTenQ Zc2aq9OiAGv4IJgY70ecZVOf5D6dxNUIZ1XbE2SdXx/VcBQNZvmflSDt/mwUnRZf8KNJ 5HrcoaHa8EcaP6K0xFJDfLbYVH1U3eDlb/MEsqabJgU0cvSHYUrMpnAXENjz+VXuhYLb ciig== X-Gm-Message-State: AOJu0YwFuGI/JSiPrrIsinMTHiwTWfb6Ee84/KGC6uJog5TZQPDG8V03 7ZvP7z8DsFty164VZqBd18wW1c3uPdUF06WYIpsiVZIjwdgEt5ajoIo/7iByfvVGYra9QdvnQQG Q X-Gm-Gg: ASbGncv2JnJPGf2Dllug8D/cHEdeLhpmHA8Z07P4Qlt3P405WHp7t3o/thgKCQJDwpU ZOvY/R6+o+uMnuecl7ZTKBVuabDsJrhWsVBxkh9hDwpN2I819BjUbCyR1HBZz6O1QjWYrvAkYQo lEomtHjVcv93pXqAHq405MFdarD/FXg8fdWT4H2VyNqE5NXgnfwqgPkLxdyDdnlnQh4RVClTJ2b Vn4yI62zH5RKIq0oQqT2HWTQe7aGH9U4RtBN/pIaqZRNLbHsDETZ/+Z1f6V/D59zj+Cr/3LB1cl kPpSvvQHH6dvW4H0c/BocqkTsaFkyl3njHvLsPsGJ+jgGdI= X-Received: by 2002:a17:903:104b:b0:215:bf1b:a894 with SMTP id d9443c01a7336-21f4e7249bdmr114952075ad.24.1739048252018; Sat, 08 Feb 2025 12:57:32 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 8/9] meson: Disallow 64-bit on 32-bit emulation Date: Sat, 8 Feb 2025 12:57:23 -0800 Message-ID: <20250208205725.568631-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For system mode, we can rarely support the amount of RAM that the guest requires. TCG emulation is restricted to round-robin mode, which solves many of the atomicity issues, but not those associated with virtio. In any case, round-robin does nothing to help the speed of emulation. For user mode, most emulation does not succeed at all. Most of the time we cannot even load 64-bit non-PIE binaries due to lack of a 64-bit address space. Threads are run in parallel, not round-robin, which means that atomicity is not handled. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 85317cd63f..ec51827f40 100644 --- a/meson.build +++ b/meson.build @@ -3185,6 +3185,9 @@ if host_os == 'windows' endif endif +# Detect host pointer size for the target configuration loop. +host_long_bits = cc.sizeof('void *') * 8 + ######################## # Target configuration # ######################## @@ -3277,8 +3280,14 @@ foreach target : target_dirs } endif + config_target += keyval.load('configs/targets' / target + '.mak') + target_kconfig = [] foreach sym: accelerators + # Disallow 64-bit on 32-bit emulation and virtualization + if host_long_bits < config_target['TARGET_LONG_BITS'].to_int() + continue + endif if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } config_all_accel += { sym: 'y' } @@ -3292,9 +3301,6 @@ foreach target : target_dirs error('No accelerator available for target @0@'.format(target)) endif - config_target += keyval.load('configs/targets' / target + '.mak') - config_target += { 'TARGET_' + config_target['TARGET_ARCH'].to_upper(): 'y' } - if 'TARGET_NEED_FDT' in config_target and not fdt.found() if default_targets warning('Disabling ' + target + ' due to missing libfdt') @@ -3307,6 +3313,7 @@ foreach target : target_dirs actual_target_dirs += target # Add default keys + config_target += { 'TARGET_' + config_target['TARGET_ARCH'].to_upper(): 'y' } if 'TARGET_BASE_ARCH' not in config_target config_target += {'TARGET_BASE_ARCH': config_target['TARGET_ARCH']} endif From patchwork Sat Feb 8 20:57:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 863301 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp954266wrt; Sat, 8 Feb 2025 12:59:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUdzoNnyy5TtVOsrS+RoiYS4bcNbxgdNJKMOSleX/HPZFObsSKhebPuC+5UC4e8jNwe6ngWag==@linaro.org X-Google-Smtp-Source: AGHT+IGyqMEIMkbMyeXaq8X5aSy4HUstWRRVUh5IBer+EMZ1LZI0js8gGzRxVxGR01FGqudAL5Tx X-Received: by 2002:a05:622a:1802:b0:468:fb3c:5e75 with SMTP id d75a77b69052e-47167b31c04mr139324471cf.38.1739048349599; Sat, 08 Feb 2025 12:59:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739048349; cv=none; d=google.com; s=arc-20240605; b=DqyGjqfVOHd1uefzS+JHFwYgoL3lULcIaBgyA0n3IfDkMAaOI7LW3RjMjWs4GLBuE+ IujOjSjYFHcRW6QrgLvPcMPXsZZq5O1cH6anP2lhU+35J4fEPEpoWT063S0NmXUyAI8X AqjTwYu4nuu8Gx93VOV/y5OmbXCMOFpCxomT6KHmnWXrgtrhi61Zusz5uXnD+Fyi12tt cGE/pJhMeXmYDyuABrtSq8/kivAxpZ7Z8x9lZFtYcf81qJe3zReP9kNUZx0JuD/tql3C YXVFl6zqToensQsDJPykRCim91xNptmsaRsqtiIKnpR3hTUkW2YmQSOwnydL5G7hySEC AHyg== 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=VLitLdlmGvTcmycuDS6Q71bKYSkfaIiONi8PyJuH2g8=; fh=PKoaD/5wWQTTiSs2HMGSCSqe0ZXvo1tbbTb7pxvOEgo=; b=YfRDqA/XGzXj9vAMes6vWWZaj23og12Yw+SfLZZUTovfLnLf4OzJnJB8uwCbbHIhyS siZ0KhQzz4+4aNECXasWp4CnnaGr8/HH+0m9J3zSvDmArxhfAczB9zv2u2BDlANVQSiy gKp/IEzZnn5hHUPJy1RcKcb1GsJEe0gVcUCCZIpHGOLXnWcuCyl6T8k5MXdkYiDdZz6T SBTj1rKi1g3Qr9IjWUmG0CPM+Cp8QxqWvIptkxG2OtX0FPIrCM9GSG9IdrKj26H44Zq8 rPFrK7dKVW1EKwxyy2gUHQ1lMidRRANHPBBjqBBKVyb/bYXrf+2QdRiMOwTNxjG/jAIq +PpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y7sE+bEM; 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=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47181011a44si12498371cf.558.2025.02.08.12.59.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Feb 2025 12:59:09 -0800 (PST) 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=@linaro.org header.s=google header.b=y7sE+bEM; 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=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgrtV-0001vQ-84; Sat, 08 Feb 2025 15:57:41 -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 1tgrtP-0001th-Ss for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tgrtO-00058S-3K for qemu-devel@nongnu.org; Sat, 08 Feb 2025 15:57:35 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-21f6d2642faso16292215ad.1 for ; Sat, 08 Feb 2025 12:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739048253; x=1739653053; 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=VLitLdlmGvTcmycuDS6Q71bKYSkfaIiONi8PyJuH2g8=; b=y7sE+bEMnGa45uncQBP0jC1O2YfFj7joR73i7gSWmYNo/NgP73SIO6Kmmznf4ysiyE sAkrTzYWsfgcnMSLAnxBx95l0Pig5oP+xg3rv+EwaEm7J49myanCkNsdGFw6NIVVQJkn tr/w833SB9zkiKIvxgkZ1wNZW2vwbL+4D7yRFOxq082aQckDNnb0QtWcrnKYU8njW1z7 6vEYrcoL/+xyNBgulhu4yYXD12vKITm0rhATXid03Z9VhkdXomBDA2F+yVhk6r0Bb4Ks DQ76cB9EQFW9W092a3zBUT3D2ywcPDdD8mRHDMJTNaoYI/15nRCn6v7nqqFAW/Z7+qcC 502g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739048253; x=1739653053; 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=VLitLdlmGvTcmycuDS6Q71bKYSkfaIiONi8PyJuH2g8=; b=UqCCx93G30iHFUtdrq8qNdauZmuWbBZEyQ7cUZ/P/JBFH2Zkj0tn0ZWIGMRciPdE/6 bkUT/AfO9MZ5C7FXZAkZV8S9jnZMNVI069bJyviLGxD5y+ETWcc2Ip6/54aYctzINQ/A yGerXlmJSJlDU7BmdjgGtULP18a7XzAJ/qDz6vpE+ihLPFlJ0nj+X/T1yFdbwkCrWZ5H L1/f/IkTo8w4GYPd+Mj0rDftVE62F99Szxd1rGqs/kwkYkbE4G+E3BK4cySayipRRTeJ NJRqH+KmR/UH3Q7iJhQ3FNiJT80TwzKn85D13y7L3gs3nr6NzWhc95VlsJ5BXIN6PYhW vGfg== X-Gm-Message-State: AOJu0Yy/3fo/NSgx+J/ocHlU2uWokNbHAR/8mA6k6T7pr4mexVxYLNcw RfP+dDo6zeUjlT3lXDsUrau1aZifGU44JBFSFTEGccrlFxL2lszUbCnuGmtl+mFufmrelvxcwOr i X-Gm-Gg: ASbGncsldHX9E+Q/U1SBOCnmXR4SiDQFW9b6Plmr5F04VDSLcgiMpcHjBR39JEJv0jy Fb34wRZRWKlQH5YvOhS9NrVzkS6R9XMCudru/BLIUXLBRulZmDGcHDn13L2DqvA1B2wPZv0FZoc Z9dOBxT6vM7xpsajg5xVExeh0oiStwCGW3U8YWfjw7sR1N0EkOIJHfqk9aRalrWLQrKFAS2uvGu crP+YX5uBvmB1RSJHZl3TbwKfJM0KjHJwmhKeROUYvm7z04tB9lQrh4pn10bPQOPHMERyZ5pIil 4RPc+AQD1xdAxIyo+EWdYX7x3Jxbn5kzTbFMjimFaFx5QhA= X-Received: by 2002:a17:903:1250:b0:216:4016:5aea with SMTP id d9443c01a7336-21f4e7059damr128566395ad.29.1739048252771; Sat, 08 Feb 2025 12:57:32 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683d58fsm50852685ad.122.2025.02.08.12.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 12:57:32 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 9/9] meson: Deprecate 32-bit host support Date: Sat, 8 Feb 2025 12:57:24 -0800 Message-ID: <20250208205725.568631-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250208205725.568631-1-richard.henderson@linaro.org> References: <20250208205725.568631-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We deprecated i686 system mode support for qemu 8.0. However, to make real cleanups to TCG we need to deprecate all 32-bit hosts. Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- docs/about/deprecated.rst | 7 +++++++ meson.build | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a3c302962..7c61d0ba16 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -204,6 +204,13 @@ is going to be so much slower it wouldn't make sense for any serious instrumentation. Due to implementation differences there will also be anomalies in things like memory instrumentation. +32-bit host operating systems (since 10.0) +'''''''''''''''''''''''''''''''''''''''''' + +Keeping 32-bit host support alive is a substantial burden for the +QEMU project. Thus QEMU will in future drop the support for all +32-bit host systems. + System emulator CPUs -------------------- diff --git a/meson.build b/meson.build index ec51827f40..387490d922 100644 --- a/meson.build +++ b/meson.build @@ -4841,14 +4841,12 @@ if host_arch == 'unknown' message('configure has succeeded and you can continue to build, but') message('QEMU will use a slow interpreter to emulate the target CPU.') endif -elif host_arch == 'mips' +elif host_long_bits < 64 message() warning('DEPRECATED HOST CPU') message() - message('Support for CPU host architecture ' + cpu + ' is going to be') - message('dropped as soon as the QEMU project stops supporting Debian 12') - message('("Bookworm"). Going forward, the QEMU project will not guarantee') - message('that QEMU will compile or work on this host CPU.') + message('Support for 32-bit CPU host architecture ' + cpu + ' is going') + message('to be dropped in a future QEMU release.') endif if not supported_oses.contains(host_os)