qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
	kvm@vger.kernel.org, "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	alex.bennee@linaro.org, richard.henderson@linaro.org,
	anjo@rev.ng, "Pierrick Bouvier" <pierrick.bouvier@linaro.org>
Subject: [PATCH v2 12/12] target/arm/cpu32-stubs.c: compile file twice (user, system)
Date: Wed, 30 Apr 2025 07:58:37 -0700	[thread overview]
Message-ID: <20250430145838.1790471-13-pierrick.bouvier@linaro.org> (raw)
In-Reply-To: <20250430145838.1790471-1-pierrick.bouvier@linaro.org>

It could be squashed with commit introducing it, but I would prefer to
introduce target/arm/cpu.c first.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 target/arm/meson.build | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 89e305eb56a..de214fe5d56 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -11,13 +11,9 @@ arm_ss.add(zlib)
 arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c'))
 arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
 
-arm_ss.add(when: 'TARGET_AARCH64',
-  if_true: files(
-    'cpu64.c',
-    'gdbstub64.c'),
-  if_false: files(
-    'cpu32-stubs.c'),
-)
+arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
+  'cpu64.c',
+  'gdbstub64.c'))
 
 arm_system_ss = ss.source_set()
 arm_common_system_ss = ss.source_set()
@@ -32,8 +28,12 @@ arm_system_ss.add(files(
 
 arm_user_ss = ss.source_set()
 arm_user_ss.add(files('cpu.c'))
+arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files(
+  'cpu32-stubs.c'))
 
 arm_common_system_ss.add(files('cpu.c'), capstone)
+arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files(
+  'cpu32-stubs.c'))
 
 subdir('hvf')
 
-- 
2.47.2



  parent reply	other threads:[~2025-04-30 15:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-30 14:58 [PATCH v2 00/12] single-binary: compile target/arm twice Pierrick Bouvier
2025-04-30 14:58 ` [PATCH v2 01/12] target/arm: Replace target_ulong -> uint64_t for HWBreakpoint Pierrick Bouvier
2025-04-30 14:58 ` [PATCH v2 02/12] include/system/hvf: missing vaddr include Pierrick Bouvier
2025-04-30 18:28   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 03/12] meson: add common libs for target and target_system Pierrick Bouvier
2025-04-30 18:36   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 04/12] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Pierrick Bouvier
2025-04-30 18:38   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 05/12] target/arm/kvm-stub: add kvm_arm_reset_vcpu stub Pierrick Bouvier
2025-04-30 18:39   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 06/12] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Pierrick Bouvier
2025-04-30 18:41   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 07/12] accel/hvf: add hvf_enabled() for common code Pierrick Bouvier
2025-04-30 18:43   ` Richard Henderson
2025-04-30 19:06     ` Pierrick Bouvier
2025-04-30 14:58 ` [PATCH v2 08/12] target/arm/cpu: remove TARGET_BIG_ENDIAN dependency Pierrick Bouvier
2025-04-30 18:44   ` Richard Henderson
2025-04-30 23:49   ` Anton Johansson via
2025-04-30 14:58 ` [PATCH v2 09/12] target/arm/cpu: remove TARGET_AARCH64 around aarch64_cpu_dump_state common Pierrick Bouvier
2025-04-30 18:45   ` Richard Henderson
2025-04-30 14:58 ` [PATCH v2 10/12] target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features Pierrick Bouvier
2025-04-30 18:47   ` Richard Henderson
2025-04-30 19:06     ` Pierrick Bouvier
2025-04-30 14:58 ` [PATCH v2 11/12] target/arm/cpu: compile file twice (user, system) only Pierrick Bouvier
2025-04-30 18:50   ` Richard Henderson
2025-04-30 19:06     ` Pierrick Bouvier
2025-04-30 14:58 ` Pierrick Bouvier [this message]
2025-04-30 18:51   ` [PATCH v2 12/12] target/arm/cpu32-stubs.c: compile file twice (user, system) Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250430145838.1790471-13-pierrick.bouvier@linaro.org \
    --to=pierrick.bouvier@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=anjo@rev.ng \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).