On 4/4/25 15:35, Philippe Mathieu-Daudé wrote:
diff --git a/target/arm/meson.build b/target/arm/meson.build index 3065081d241..503d106b588 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -3,6 +3,7 @@ arm_ss.add(files( 'cpu.c', 'debug_helper.c', 'gdbstub.c', + 'gdbstub64.c', 'helper.c', 'vfp_fpscr.c', )) @@ -13,7 +14,6 @@ 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', ))
This doesn't do what you say is does. The object file is still in arm_ss, though unconditionally instead of conditionally. Which causes all of the other follow-on problems you saw.
I'm not fond of either this or the previous patch. I'm surprised that you're touching anything wrt CONFIG_USER_ONLY.
r~
