diff options
| author | Fam Zheng <famz@redhat.com> | 2014-09-03 11:44:55 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-09 13:13:05 +0200 |
| commit | f6e08302989ad215977faba96fbf6028e9b3c87a (patch) | |
| tree | 4e1f40df2d95170801c689884d7aa872894fa53b | |
| parent | ddbc41de380c24de823aa55cd46237be84ee0498 (diff) | |
| download | qemu-f6e08302989ad215977faba96fbf6028e9b3c87a.tar.gz | |
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 <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/qemu/osdep.h | 4 | ||||
| -rw-r--r-- | 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 |