diff options
| author | Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com> | 2017-01-10 00:10:08 -0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-01-31 10:10:14 +1100 |
| commit | 6758c192b063515b5c7bd2b0086217825c5b6d00 (patch) | |
| tree | e46bb7b1efe8e3e0f84244334d254ef07c1a7f8a | |
| parent | 5d51eaea84899d88cb161fab3f089168e3812e9e (diff) | |
host-utils: Move 128-bit guard macro to .c file
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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | util/Makefile.objs | 2 | ||||
| -rw-r--r-- | util/host-utils.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/util/Makefile.objs b/util/Makefile.objs index c1f247d675..56c8c23c7d 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -12,7 +12,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 b166e57586..3495262233 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 |