From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNl-0005fJ-Eb for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSRNe-0000az-Pf for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:25 -0400 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:41113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSRNe-0000a4-L6 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:59:18 -0400 Received: by mail-qg0-f47.google.com with SMTP id i50so735741qgf.20 for ; Fri, 12 Sep 2014 06:59:15 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 12 Sep 2014 15:58:40 +0200 Message-Id: <1410530338-17615-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> References: <1410530338-17615-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 03/21] util: Move general qemu_getauxval to util/getauxval.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng From: Fam Zheng 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 9dd43fc..1565404 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 25f48e5..1732ace 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.1.0