From nobody Sat May 10 04:07:01 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738552810; cv=none;
d=zohomail.com; s=zohoarc;
b=dW2q9LspWG7ditYoY0Bcw1ytL4dlhSR45jxx1c40IEI1OgnD0TW0zrm2NHQv8h3/oe1FTQ/H1TqRmUHtKvWTiV0bY3An4+sG7VKcwzqA5DXL2oBsFtuFPgv1CAx7JQo1LTY1Xw7kOSP7aR3Q+1m9VuG2tgujAsLMG4JoRs5wiDk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738552810;
h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=C6BKUQ6lWt0wf4CgfZ0i4ebGJ7t+iM6Zy9ttJiWbmWA=;
b=c04NVpDu6xQQ1T66oqnwsc6Q5P1QnOEukQaPAuulyh52ky0UrEKBqOF1nNLG8DeyiYcDbVJdjDk5As/p54wmuXkq93IunmHHuBB536/UY6eXJ4vT+XSi8QS64OIc0yX9O7H1yTnc5JcULLCr43tcvslPryj5yHruZSKB0UQwCy8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<richard.henderson@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738552810503197.8465514128428;
Sun, 2 Feb 2025 19:20:10 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1temys-00086H-0Z; Sun, 02 Feb 2025 22:18: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 <richard.henderson@linaro.org>)
id 1temyq-00084Z-Fr
for qemu-devel@nongnu.org; Sun, 02 Feb 2025 22:18:36 -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 <richard.henderson@linaro.org>)
id 1temyn-0002gS-1F
for qemu-devel@nongnu.org; Sun, 02 Feb 2025 22:18:36 -0500
Received: by mail-pl1-x62d.google.com with SMTP id
d9443c01a7336-2166f1e589cso97458575ad.3
for <qemu-devel@nongnu.org>; Sun, 02 Feb 2025 19:18: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-21de32eb419sm65698135ad.145.2025.02.02.19.18.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Feb 2025 19:18:30 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738552711; x=1739157511; 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=C6BKUQ6lWt0wf4CgfZ0i4ebGJ7t+iM6Zy9ttJiWbmWA=;
b=PiCtx89gmNGyMuHBiseCpnQXW8+Z/4DgFZD3noGKdJE0YgelsGF228tXbGcQyDCTXf
pOoVuQtH/fnHLbpDDve+qVPi74HsIy7UkI1KbEtiX2+urdfhWwQE37/3vkoNKRs3OtYS
4K8W/Kdx3T10qJyWAurFOjcokoAh7/p75LZ2B/y9EHNUv5bzvgEgH+Vu9/MmpXukjMNt
mI0BMqoB0gPLFQrpeLwHt38BJZskHnaACf2Z5eK7lwYZsWzrRnEi8ro2SusPDgB4e4U9
jDp6RgTNc8C3z+JH88m3rm45jCNAjSbP8jQz5GzMBacZ0m/z5MR5EcoSyDz4pYVrWs/F
CkOw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738552711; x=1739157511;
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=C6BKUQ6lWt0wf4CgfZ0i4ebGJ7t+iM6Zy9ttJiWbmWA=;
b=vpdcMcr3uLne3Z3nEhV0PVzy5LkYs1mVDwwRnvPfPf+N0FSwy4nTGobL1r/9Ou0IaR
znRaukctYkBEeusdY9WatObJ3qIOM1MkFpsQxDE1DCMzpitL1XVmjw1TzqQyaWSU+n/P
rxri7N4rE+8c+OFtT5zw98mMBkP7PAQxJix8q4nlCcXZCA9Vlo6TWBIDRHltjR9LkCGy
YkxIZs+3YAkC0AQh+XPjbZl6EU/anKhWOm04jh1bkBIo2Ks3Hk/UFQSmsxyaPHEegRS1
VUd4PjNCtBgS27BRL4ObbWn6g2QZhg9T/r9mNZu4Oc4X35rIjWvlRorCn5QylxpHdif/
lNmw==
X-Gm-Message-State: AOJu0Yz7ZcwzEphxqTunsO65WvASgmGtxks+egwOw+kg4g+4AC2XRAbp
PbBWyngAvkqLZr3dmZvepBhNcD9N9cB33YIkdW/4i1OW/y14/u/fRTMPeRh1+VwigLw4cWwLPgl
Z
X-Gm-Gg: ASbGncvaM9Auw0835Yz0/gsOm3yFlWDfeIwy+FPzQXBcNwhMql3nWuTX+6JGccnjSXu
7FToR1FQlCtmCvqpSVswEXf07dmfy4iJITB7Qc2MrXJ+JdDKCdmfl45TruHu2GiGZS/bj6FA7Pu
hkUoHEY3TrdWtn0MFYxAXr27cd5k3AOI+JB6iBKTR5sQuM7Qw7MwvNPwsYWYfE+S2TV4Mca6lFH
pg6jBJXYomEoZ88hGUOzNdjcDcdk/i30fjRAD5/wWUbH289WfAmOHIsFX88zqMAIaZyUAEKXSru
2scHAn+pGEPIji/inQwRmZfs2pz+AOl4JcBSqJaBfgf8Ojs=
X-Google-Smtp-Source:
AGHT+IHyO/0DrFPKnzzzeofNRTEH8WrQlkGBL6NR4Mm09Dk7SIz0efejcOFn7yy5q6hc26drR9oG7w==
X-Received: by 2002:a17:903:244f:b0:216:1cfa:2bda with SMTP id
d9443c01a7336-21dd7de1d37mr305137715ad.43.1738552711329;
Sun, 02 Feb 2025 19:18:31 -0800 (PST)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, berrange@redhat.com,
philmd@linaro.org, thuth@redhat.com
Subject: [PATCH v2 10/14] configure: Define TARGET_LONG_BITS in
configs/targets/*.mak
Date: Sun, 2 Feb 2025 19:18:17 -0800
Message-ID: <20250203031821.741477-11-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20250203031821.741477-1-richard.henderson@linaro.org>
References: <20250203031821.741477-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738552812676019000
Content-Type: text/plain; charset="utf-8"
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 [-We=
rror]
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 pre=
vious definition
32 | #define TARGET_LONG_BITS 32
|
cc1: all warnings being treated as errors
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
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=3Daarch64
TARGET_BASE_ARCH=3Darm
TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x=
ml/aarch64-pauth.xml
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/aarch64-linux-user.mak b/configs/targets/aarch=
64-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=3Dy
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy
TARGET_SYSTBL_ABI=3Dcommon,64,renameat,rlimit,memfd_secret
TARGET_SYSTBL=3Dsyscall_64.tbl
+TARGET_LONG_BITS=3D64
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=3Dy
TARGET_XML_FILES=3D gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-x=
ml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sy=
sregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-prof=
ile-mve.xml gdb-xml/aarch64-pauth.xml
# needed by boot.c
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aa=
rch64_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=3Dy
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy
TARGET_SYSTBL_ABI=3Dcommon,64,renameat,rlimit,memfd_secret
TARGET_SYSTBL=3Dsyscall_64.tbl
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/alpha-linux-user.mak b/configs/targets/alpha-l=
inux-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=3Dalpha
TARGET_SYSTBL_ABI=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/alpha-softmmu.mak b/configs/targets/alpha-soft=
mmu.mak
index 9dbe160740..89f3517aca 100644
--- a/configs/targets/alpha-softmmu.mak
+++ b/configs/targets/alpha-softmmu.mak
@@ -1,2 +1,3 @@
TARGET_ARCH=3Dalpha
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/arm-bsd-user.mak b/configs/targets/arm-bsd-use=
r.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=3Darm
TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v=
fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof=
ile.xml gdb-xml/arm-m-profile-mve.xml
+TARGET_LONG_BITS=3D32
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=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xm=
l gdb-xml/arm-vfp3.xml
TARGET_HAS_BFLT=3Dy
CONFIG_SEMIHOSTING=3Dy
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy
+TARGET_LONG_BITS=3D32
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=3Dy
TARGET_XML_FILES=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-v=
fp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-prof=
ile.xml gdb-xml/arm-m-profile-mve.xml
# needed by boot.c
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-l=
inux-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=3D gdb-xml/arm-core.xml gdb-xml/arm-vfp.xm=
l gdb-xml/arm-vfp3.xml
TARGET_HAS_BFLT=3Dy
CONFIG_SEMIHOSTING=3Dy
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=3Dy
+TARGET_LONG_BITS=3D32
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=3Davr
TARGET_XML_FILES=3D gdb-xml/avr-cpu.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/hexagon-linux-user.mak b/configs/targets/hexag=
on-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=3Dhexagon
TARGET_XML_FILES=3Dgdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_SYSTBL_ABI=3Dcommon,32,hexagon,time32,stat64,rlimit,renameat
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/hppa-linux-user.mak b/configs/targets/hppa-lin=
ux-user.mak
index 8e0a80492f..4295cf384e 100644
--- a/configs/targets/hppa-linux-user.mak
+++ b/configs/targets/hppa-linux-user.mak
@@ -3,3 +3,5 @@ TARGET_ABI32=3Dy
TARGET_SYSTBL_ABI=3Dcommon,32
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
+# Compromise to ease maintainence vs system mode
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/hppa-softmmu.mak b/configs/targets/hppa-softmm=
u.mak
index a41662aa99..63ca74ed5e 100644
--- a/configs/targets/hppa-softmmu.mak
+++ b/configs/targets/hppa-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dhppa
TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/i386-bsd-user.mak b/configs/targets/i386-bsd-u=
ser.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=3Di386
TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/i386-linux-user.mak b/configs/targets/i386-lin=
ux-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=3Di386
TARGET_SYSTBL_ABI=3Di386
TARGET_SYSTBL=3Dsyscall_32.tbl
TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml gdb-xml/i386-32bit-linux.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmm=
u.mak
index 2eb0e86250..5dd8921756 100644
--- a/configs/targets/i386-softmmu.mak
+++ b/configs/targets/i386-softmmu.mak
@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=3Dy
TARGET_KVM_HAVE_GUEST_DEBUG=3Dy
TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy
TARGET_XML_FILES=3D gdb-xml/i386-32bit.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/loongarch64-linux-user.mak b/configs/targets/l=
oongarch64-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=3Dloongarch
TARGET_XML_FILES=3Dgdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml =
gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-lasx.xml
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_SYSTBL_ABI=3Dcommon,64
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loon=
garch64-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=3Dy
TARGET_XML_FILES=3D gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.=
xml gdb-xml/loongarch-fpu.xml gdb-xml/loongarch-lsx.xml gdb-xml/loongarch-l=
asx.xml
# all boards require libfdt
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-lin=
ux-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=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor=
e.xml gdb-xml/m68k-fp.xml
TARGET_HAS_BFLT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmm=
u.mak
index bbcd0bada6..bacc52e96a 100644
--- a/configs/targets/m68k-softmmu.mak
+++ b/configs/targets/m68k-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dm68k
TARGET_BIG_ENDIAN=3Dy
TARGET_XML_FILES=3D gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-cor=
e.xml gdb-xml/m68k-fp.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/mi=
croblaze-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=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_HAS_BFLT=3Dy
TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr=
otect.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/micro=
blaze-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=3Dy
# needed by boot.c
TARGET_NEED_FDT=3Dy
TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr=
otect.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=3D64
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=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_HAS_BFLT=3Dy
TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr=
otect.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/mic=
roblazeel-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=3Dy
# needed by boot.c
TARGET_NEED_FDT=3Dy
TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr=
otect.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=3D64
diff --git a/configs/targets/mips-linux-user.mak b/configs/targets/mips-lin=
ux-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=3Dy
TARGET_SYSTBL_ABI=3Do32
TARGET_SYSTBL=3Dsyscall_o32.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmm=
u.mak
index d34b4083fc..b62a088249 100644
--- a/configs/targets/mips-softmmu.mak
+++ b/configs/targets/mips-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dmips
TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D32
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=3Dmips
TARGET_SYSTBL_ABI=3Dn64
TARGET_SYSTBL=3Dsyscall_n64.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-so=
ftmmu.mak
index 12d9483bf0..7202655fca 100644
--- a/configs/targets/mips64-softmmu.mak
+++ b/configs/targets/mips64-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dmips64
TARGET_BASE_ARCH=3Dmips
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/mips64el-linux-user.mak b/configs/targets/mips=
64el-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=3Dy
TARGET_BASE_ARCH=3Dmips
TARGET_SYSTBL_ABI=3Dn64
TARGET_SYSTBL=3Dsyscall_n64.tbl
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/mips64el-softmmu.mak b/configs/targets/mips64e=
l-softmmu.mak
index 3864daa736..3ebeadb29e 100644
--- a/configs/targets/mips64el-softmmu.mak
+++ b/configs/targets/mips64el-softmmu.mak
@@ -1,2 +1,3 @@
TARGET_ARCH=3Dmips64
TARGET_BASE_ARCH=3Dmips
+TARGET_LONG_BITS=3D64
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=3Dmips
TARGET_ABI_MIPSO32=3Dy
TARGET_SYSTBL_ABI=3Do32
TARGET_SYSTBL=3Dsyscall_o32.tbl
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/mipsel-softmmu.mak b/configs/targets/mipsel-so=
ftmmu.mak
index 0829659fc2..620ec68178 100644
--- a/configs/targets/mipsel-softmmu.mak
+++ b/configs/targets/mipsel-softmmu.mak
@@ -1,2 +1,3 @@
TARGET_ARCH=3Dmips
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/mipsn32-linux-user.mak b/configs/targets/mipsn=
32-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=3Dmips
TARGET_SYSTBL_ABI=3Dn32
TARGET_SYSTBL=3Dsyscall_n32.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/mipsn32el-linux-user.mak b/configs/targets/mip=
sn32el-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=3Dy
TARGET_BASE_ARCH=3Dmips
TARGET_SYSTBL_ABI=3Dn32
TARGET_SYSTBL=3Dsyscall_n32.tbl
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-lin=
ux-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=3Dopenrisc
TARGET_BIG_ENDIAN=3Dy
TARGET_SYSTBL_ABI=3Dcommon,32,or1k,time32,stat64,rlimit,renameat
TARGET_SYSTBL=3Dsyscall.tbl
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmm=
u.mak
index 0341cb2a6b..adfddb1a8a 100644
--- a/configs/targets/or1k-softmmu.mak
+++ b/configs/targets/or1k-softmmu.mak
@@ -3,3 +3,4 @@ TARGET_SUPPORTS_MTTCG=3Dy
TARGET_BIG_ENDIAN=3Dy
# needed by boot.c and all boards
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D32
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=3Dcommon,nospu,32
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p=
ower-altivec.xml gdb-xml/power-spe.xml
+TARGET_LONG_BITS=3D32
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=3Dppc
TARGET_BIG_ENDIAN=3Dy
TARGET_KVM_HAVE_GUEST_DEBUG=3Dy
TARGET_XML_FILES=3D gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/p=
ower-altivec.xml gdb-xml/power-spe.xml
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-l=
inux-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=3Dcommon,nospu,64
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_XML_FILES=3D 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=3D64
diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-soft=
mmu.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=3Dy
TARGET_XML_FILES=3D 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=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/ppc64le-linux-user.mak b/configs/targets/ppc64=
le-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=3Dppc
TARGET_SYSTBL_ABI=3Dcommon,nospu,64
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_XML_FILES=3D 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=3D64
diff --git a/configs/targets/riscv32-linux-user.mak b/configs/targets/riscv=
32-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=3Dy
TARGET_SYSTBL_ABI=3D32
TARGET_SYSTBL_ABI=3Dcommon,32,riscv,memfd_secret
TARGET_SYSTBL=3Dsyscall.tbl
+TARGET_LONG_BITS=3D32
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=3Dy
TARGET_XML_FILES=3D gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm=
l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
# needed by boot.c
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D32
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=3Driscv64
TARGET_BASE_ARCH=3Driscv
TARGET_ABI_DIR=3Driscv
TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm=
l gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/riscv64-linux-user.mak b/configs/targets/riscv=
64-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=3Dy
TARGET_SYSTBL_ABI=3D64
TARGET_SYSTBL_ABI=3Dcommon,64,riscv,rlimit,memfd_secret
TARGET_SYSTBL=3Dsyscall.tbl
+TARGET_LONG_BITS=3D64
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=3Dy
TARGET_XML_FILES=3D gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xm=
l 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=3Dy
+TARGET_LONG_BITS=3D64
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=3Drx
TARGET_XML_FILES=3D gdb-xml/rx-core.xml
# all boards require libfdt
TARGET_NEED_FDT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-l=
inux-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=3Dcommon,64
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_XML_FILES=3D 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=3D64
diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-soft=
mmu.mak
index b22218aacc..5242ebe7c2 100644
--- a/configs/targets/s390x-softmmu.mak
+++ b/configs/targets/s390x-softmmu.mak
@@ -3,3 +3,4 @@ TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
TARGET_KVM_HAVE_GUEST_DEBUG=3Dy
TARGET_XML_FILES=3D 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=3D64
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=3Dsh4
TARGET_SYSTBL_ABI=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_HAS_BFLT=3Dy
+TARGET_LONG_BITS=3D32
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=3Dsh4
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/sh4eb-linux-user.mak b/configs/targets/sh4eb-l=
inux-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=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_HAS_BFLT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-soft=
mmu.mak
index 226b1fc698..cdea2c61c5 100644
--- a/configs/targets/sh4eb-softmmu.mak
+++ b/configs/targets/sh4eb-softmmu.mak
@@ -1,2 +1,3 @@
TARGET_ARCH=3Dsh4
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-l=
inux-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=3Dsparc
TARGET_SYSTBL_ABI=3Dcommon,32
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-soft=
mmu.mak
index a5d9200382..78c2e25bd1 100644
--- a/configs/targets/sparc-softmmu.mak
+++ b/configs/targets/sparc-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dsparc
TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/s=
parc32plus-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=3Dsparc
TARGET_SYSTBL_ABI=3Dcommon,32
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc=
64-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=3Dsparc
TARGET_SYSTBL_ABI=3Dcommon,64
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
+TARGET_LONG_BITS=3D64
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=3Dsparc64
TARGET_BASE_ARCH=3Dsparc
TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D64
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=3Dtricore
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/x86_64-bsd-user.mak b/configs/targets/x86_64-b=
sd-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=3Dx86_64
TARGET_BASE_ARCH=3Di386
TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml
+TARGET_LONG_BITS=3D64
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=3Di386
TARGET_SYSTBL_ABI=3Dcommon,64
TARGET_SYSTBL=3Dsyscall_64.tbl
TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml gdb-xml/i386-64bit-linux.xml
+TARGET_LONG_BITS=3D64
diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-so=
ftmmu.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=3Dy
TARGET_KVM_HAVE_GUEST_DEBUG=3Dy
TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy
TARGET_XML_FILES=3D gdb-xml/i386-64bit.xml
+TARGET_LONG_BITS=3D64
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=3Dxtensa
TARGET_SYSTBL_ABI=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_HAS_BFLT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/xtensa-softmmu.mak b/configs/targets/xtensa-so=
ftmmu.mak
index f075557bfa..65845df4ff 100644
--- a/configs/targets/xtensa-softmmu.mak
+++ b/configs/targets/xtensa-softmmu.mak
@@ -1,2 +1,3 @@
TARGET_ARCH=3Dxtensa
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/xtensaeb-linux-user.mak b/configs/targets/xten=
saeb-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=3Dcommon
TARGET_SYSTBL=3Dsyscall.tbl
TARGET_BIG_ENDIAN=3Dy
TARGET_HAS_BFLT=3Dy
+TARGET_LONG_BITS=3D32
diff --git a/configs/targets/xtensaeb-softmmu.mak b/configs/targets/xtensae=
b-softmmu.mak
index b02e11b820..f1f789d697 100644
--- a/configs/targets/xtensaeb-softmmu.mak
+++ b/configs/targets/xtensaeb-softmmu.mak
@@ -1,3 +1,4 @@
TARGET_ARCH=3Dxtensa
TARGET_BIG_ENDIAN=3Dy
TARGET_SUPPORTS_MTTCG=3Dy
+TARGET_LONG_BITS=3D32
--=20
2.43.0