| Message ID | 1484014214-32533-2-git-send-email-joserz@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 01/09/2017 08:10 PM, Jose Ricardo Ziviani wrote: > It is not possible to implement functions in host-utils.c for > architectures with quadwords because the guard is implemented in the > Makefile. This patch move the guard out of the Makefile to the s/move/moves/ > implementation file. > > Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> > --- > util/Makefile.objs | 2 +- > util/host-utils.c | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/util/Makefile.objs b/util/Makefile.objs index ad0f9c7..39ae26e 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -11,7 +11,7 @@ util-obj-$(CONFIG_POSIX) += memfd.o util-obj-$(CONFIG_WIN32) += oslib-win32.o util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o util-obj-y += envlist.o path.o module.o -util-obj-$(call lnot,$(CONFIG_INT128)) += host-utils.o +util-obj-y += 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 b166e57..3495262 100644 --- a/util/host-utils.c +++ b/util/host-utils.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" +#ifndef CONFIG_INT128 /* Long integer helpers */ static inline void mul64(uint64_t *plow, uint64_t *phigh, uint64_t a, uint64_t b) @@ -158,4 +159,5 @@ int divs128(int64_t *plow, int64_t *phigh, int64_t divisor) return overflow; } +#endif
It is not possible to implement functions in host-utils.c for architectures with quadwords because the guard is implemented in the Makefile. This patch move the guard out of the Makefile to the implementation file. Signed-off-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> --- util/Makefile.objs | 2 +- util/host-utils.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)