From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbbGaNxs (ORCPT ); Fri, 31 Jul 2015 09:53:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57126 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbbGaNxr (ORCPT ); Fri, 31 Jul 2015 09:53:47 -0400 Date: Fri, 31 Jul 2015 06:53:31 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, dsahern@gmail.com, eranian@google.com, namhyung@kernel.org, jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, fweisbec@gmail.com, bp@suse.de, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de Reply-To: jolsa@redhat.com, namhyung@kernel.org, eranian@google.com, dsahern@gmail.com, adrian.hunter@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@suse.de, fweisbec@gmail.com, acme@redhat.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: Fix mismatched declarations for elf_getphdrnum Git-Commit-ID: f785f2357673d520a0b7b468973cdd197f336494 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f785f2357673d520a0b7b468973cdd197f336494 Gitweb: http://git.kernel.org/tip/f785f2357673d520a0b7b468973cdd197f336494 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 28 Jul 2015 12:01:33 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Jul 2015 10:51:45 -0300 perf symbols: Fix mismatched declarations for elf_getphdrnum When HAVE_ELF_GETPHDRNUM_SUPPORT is false we trip on this problem: CC /tmp/build/perf/util/symbol-elf.o util/symbol-elf.c:41:12: error: static declaration of ‘elf_getphdrnum’ follows non-static declaration static int elf_getphdrnum(Elf *elf, size_t *dst) ^ In file included from util/symbol.h:19:0, from util/symbol-elf.c:8: /usr/include/libelf.h:206:12: note: previous declaration of ‘elf_getphdrnum’ was here extern int elf_getphdrnum (Elf *__elf, size_t *__dst); ^ MKDIR /tmp/build/perf/bench/ /home/git/linux/tools/build/Makefile.build:68: recipe for target '/tmp/build/perf/util/symbol-elf.o' failed make[3]: *** [/tmp/build/perf/util/symbol-elf.o] Error 1 Fix it. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-qcmekyfedmov4sxr0wahcikr@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 65f7e38..b0ad810 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -38,7 +38,7 @@ static inline char *bfd_demangle(void __maybe_unused *v, #endif #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT -static int elf_getphdrnum(Elf *elf, size_t *dst) +int elf_getphdrnum(Elf *elf, size_t *dst) { GElf_Ehdr gehdr; GElf_Ehdr *ehdr;