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 <[email protected]>
Tested-by: Peter Maydell <[email protected]>
Signed-off-by: Fam Zheng <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 9dd43fc2db7cecb194475a2643d6177acb57feb6..1565404f7e7502cd40434a2960965bfa7c214358 100644 (file)
--- 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 25f48e5456baa159359d9eed50061cb8ba34629b..1732ace2b178fb147abab3ddceb7254f2cff04c6 100644 (file)
--- 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