From f6e08302989ad215977faba96fbf6028e9b3c87a Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 3 Sep 2014 11:44:55 +0800 Subject: [PATCH] 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 --- include/qemu/osdep.h | 4 ---- util/getauxval.c | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 9dd43fc2db..1565404f7e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -246,11 +246,7 @@ char *qemu_get_exec_dir(void); * Search the auxiliary vector for @type, returning the value * or 0 if @type is not present. */ -#if defined(CONFIG_GETAUXVAL) || defined(__linux__) unsigned long qemu_getauxval(unsigned long type); -#else -static inline unsigned long qemu_getauxval(unsigned long type) { return 0; } -#endif void qemu_set_tty_echo(int fd, bool echo); diff --git a/util/getauxval.c b/util/getauxval.c index 25f48e5456..1732ace2b1 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 -- 2.30.2