diff options
| author | Paolo Bonzini | 2019-07-12 19:34:35 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-07-15 11:20:43 +0200 |
| commit | e9ed92bd8d608722d05b4e6076355314dfd8c26c (patch) | |
| tree | 3d603041dae3f3be4358cc88d202ef6db6d815dd /util/Makefile.objs | |
| parent | Fix broken build with WHPX enabled (diff) | |
| download | qemu-e9ed92bd8d608722d05b4e6076355314dfd8c26c.tar.gz qemu-e9ed92bd8d608722d05b4e6076355314dfd8c26c.tar.xz qemu-e9ed92bd8d608722d05b4e6076355314dfd8c26c.zip | |
util: merge main-loop.c and iohandler.c
main-loop.c has a dependency on iohandler.c, and everything breaks
if that dependency is instead satisfied by stubs/iohandler.c.
Just put everything in the same file to avoid strange dependencies
on the order of files in util-obj-y.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1562952875-53702-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util/Makefile.objs')
| -rw-r--r-- | util/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/Makefile.objs b/util/Makefile.objs index 68af3cd5e9..41bf59d127 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -2,7 +2,7 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o util-obj-y += bufferiszero.o util-obj-y += lockcnt.o util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o iohandler.o +util-obj-y += main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o util-obj-$(CONFIG_POSIX) += aio-posix.o util-obj-$(CONFIG_POSIX) += compatfd.o |