From f6e08302989ad215977faba96fbf6028e9b3c87a Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 3 Sep 2014 11:44:55 +0800 Subject: util: Move general qemu_getauxval to util/getauxval.c So that we won't have an empty getauxval.o which is disliked by ranlib. Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- util/getauxval.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'util') diff --git a/util/getauxval.c b/util/getauxval.c index 25f48e5..1732ace 100644 --- a/util/getauxval.c +++ b/util/getauxval.c @@ -98,4 +98,12 @@ unsigned long qemu_getauxval(unsigned long type) return 0; } + +#else + +unsigned long qemu_getauxval(unsigned long type) +{ + return 0; +} + #endif -- cgit v1.1 From 2ceee4b0521241eb8595a5501b54bb3534ebb99a Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 3 Sep 2014 11:44:56 +0800 Subject: util: Don't link host-utils.o if it's empty Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Fam Zheng Signed-off-by: Paolo Bonzini --- util/Makefile.objs | 3 ++- util/host-utils.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'util') 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 */ -- cgit v1.1