[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/21] util: Don't link host-utils.o if it's empty
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/21] util: Don't link host-utils.o if it's empty |
Date: |
Fri, 12 Sep 2014 15:58:41 +0200 |
From: Fam Zheng <address@hidden>
Reported-by: Peter Maydell <address@hidden>
Tested-by: Peter Maydell <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
util/Makefile.objs | 3 ++-
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 */
--
2.1.0
- [Qemu-devel] [PULL 00/21] KVM, memory, build, migration changes for 2014-09-11, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 02/21] trace: Only link generated-tracers.o with "simple" backend, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 04/21] util: Don't link host-utils.o if it's empty,
Paolo Bonzini <=
- [Qemu-devel] [PULL 01/21] kvm: do not abort if KVM_RUN fails, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 03/21] util: Move general qemu_getauxval to util/getauxval.c, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 06/21] exec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 08/21] memory: add parameter errp to memory_region_init_rom_device, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 09/21] hostmem-ram: don't exit qemu if size of memory-backend-ram is way too big, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 07/21] memory: add parameter errp to memory_region_init_ram, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 11/21] exec: add parameter errp to gethugepagesize, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 10/21] exec: report error when memory < hpagesize, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 05/21] rules.mak: Fix DSO build by pulling in archive symbols, Paolo Bonzini, 2014/09/12