Philippe Mathieu-Daudé <phi...@redhat.com> writes:
> From: Philippe Mathieu-Daudé <f4...@amsat.org> > > The previous attempt (commit f77147cd4de) doesn't work as > expected, as we still have CONFIG_TCG=1 when using: > > configure --disable-system --disable-user > > Now than we have removed the use of CONFIG_TCG from target-dependent > files in tests/qtest/, we can remove the unconditional definition of > CONFIG_TCG in config_host. > > This avoid to build a bunch of unrequired objects when building with > --disable-tcg (in particular the softfloat tests): Hmm something else gets broken because I bisected a check-tcg failure to this commit: timeout --foreground 15 /home/alex.bennee/lsrc/qemu.git/builds/bisect/qemu-system-aarch64 -monitor none -display none -chardev file,path=memory-record.out,id=output -icount shift=5,rr=record,rrfile=record.bin -M virt -cpu max -display none -semihosting-config enable=on,target=native,chardev=output -kernel memory qemu-system-aarch64: Please enable icount to use record/replay /home/alex.bennee/lsrc/qemu.git/tests/tcg/aarch64/Makefile.softmmu-target:49: recipe for target 'run-memory-record' failed make[2]: *** [run-memory-record] Error 1 make[2]: Leaving directory '/home/alex.bennee/lsrc/qemu.git/builds/bisect/tests/tcg/aarch64-softmmu' /home/alex.bennee/lsrc/qemu.git/tests/tcg/Makefile.qemu:102: recipe for target 'run-guest-tests' failed make[1]: *** [run-guest-tests] Error 2 make[1]: Leaving directory '/home/alex.bennee/lsrc/qemu.git/builds/bisect' /home/alex.bennee/lsrc/qemu.git/tests/Makefile.include:63: recipe for target 'run-tcg-tests-aarch64-softmmu' failed make: *** [run-tcg-tests-aarch64-softmmu] Error 2 So it looks like it breaks icount somehow. > > Before: > > $ make > [1/812] Generating trace-qom.h with a custom command > ... > > After: > > $ make > [1/349] Generating trace-qom.h with a custom command > ... > > A difference of 463 objects... > > Reported-by: Claudio Fontana <cfont...@suse.de> > Suggested-by: Paolo Bonzini <pbonz...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > v3: Include Paolo's feedback: > https://www.mail-archive.com/qemu-devel@nongnu.org/msg793872.html > therefore o not include Alex's R-b tag. > > Cc: Richard Henderson <richard.hender...@linaro.org> > Cc: Alex Bennée <alex.ben...@linaro.org> > Cc: Emilio G. Cota <c...@braap.org> > --- > meson.build | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meson.build b/meson.build > index c6f4b0cf5e8..623cbe50685 100644 > --- a/meson.build > +++ b/meson.build > @@ -262,7 +262,6 @@ > language: ['c', 'cpp', 'objc']) > > accelerators += 'CONFIG_TCG' > - config_host += { 'CONFIG_TCG': 'y' } > endif > > if 'CONFIG_KVM' not in accelerators and get_option('kvm').enabled() -- Alex Bennée