diff options
| author | Fam Zheng <famz@redhat.com> | 2014-09-03 11:44:56 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-09 13:13:05 +0200 |
| commit | 2ceee4b0521241eb8595a5501b54bb3534ebb99a (patch) | |
| tree | f11345d78457570c997371abfd89df75be5fdc23 | |
| parent | f6e08302989ad215977faba96fbf6028e9b3c87a (diff) | |
| download | qemu-2ceee4b0521241eb8595a5501b54bb3534ebb99a.zip qemu-2ceee4b0521241eb8595a5501b54bb3534ebb99a.tar.gz qemu-2ceee4b0521241eb8595a5501b54bb3534ebb99a.tar.bz2 | |
util: Don't link host-utils.o if it's empty
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | util/Makefile.objs | 3 | ||||
| -rw-r--r-- | util/host-utils.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/util/Makefile.objs b/util/Makefile.objs index 6b3c83b..cb8862b 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -1,7 +1,8 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o event_notifier-win32.o util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o event_notifier-posix.o qemu-openpty.o -util-obj-y += envlist.o path.o host-utils.o module.o +util-obj-y += envlist.o path.o module.o +util-obj-$(call lnot,$(CONFIG_INT128)) += host-utils.o util-obj-y += bitmap.o bitops.o hbitmap.o util-obj-y += fifo8.o util-obj-y += acl.o diff --git a/util/host-utils.c b/util/host-utils.c index ee57ef5..102e5bf 100644 --- a/util/host-utils.c +++ b/util/host-utils.c @@ -28,7 +28,6 @@ #include "qemu/host-utils.h" /* Long integer helpers */ -#ifndef CONFIG_INT128 static inline void mul64(uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b) { @@ -161,4 +160,3 @@ int divs128(int64_t *plow, int64_t *phigh, int64_t divisor) return overflow; } -#endif /* !CONFIG_INT128 */ |