From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNl-0005fS-I3 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSRNf-0000da-Vo for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:25 -0400 Received: from mail-qg0-x22a.google.com ([2607:f8b0:400d:c04::22a]:62673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNf-0000cz-SF for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:19 -0400 Received: by mail-qg0-f42.google.com with SMTP id q107so769576qgd.29 for ; Fri, 12 Sep 2014 06:59:19 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 12 Sep 2014 15:58:41 +0200 Message-Id: <1410530338-17615-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> References: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 04/21] util: Don't link host-utils.o if it's empty List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng 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(-) 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