From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Borislav Petkov <bp@suse.de>, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 05/10] perf symbols: Fix mismatched declarations for elf_getphdrnum
Date: Thu, 30 Jul 2015 13:17:03 -0300 [thread overview]
Message-ID: <1438273028-5191-6-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1438273028-5191-1-git-send-email-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-qcmekyfedmov4sxr0wahcikr@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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 65f7e389ae09..b0ad810f04dd 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;
--
2.1.0
next prev parent reply other threads:[~2015-07-30 16:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 16:16 [GIT PULL 00/10] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-07-30 16:16 ` [PATCH 01/10] perf python: Remove dependency on 'machine' methods Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 02/10] perf python: Add macro to simplify maintainance of the constants array Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 03/10] perf python: Add missing PERF_RECORD_{MMAP2,AUX,etc} Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 04/10] perf python: Make twatch.py use soft dummy event, freq=0 Arnaldo Carvalho de Melo
2015-07-30 16:17 ` Arnaldo Carvalho de Melo [this message]
2015-07-30 16:17 ` [PATCH 06/10] perf session env: Rename exit method Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 07/10] perf tools: Add support for event post configuration Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 08/10] perf tools: Force period term to overload global settings Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 09/10] perf tools: Introduce callgraph_set for callgraph option Arnaldo Carvalho de Melo
2015-07-30 16:17 ` [PATCH 10/10] perf tests: Adding build test for having ending double slash Arnaldo Carvalho de Melo
2015-07-31 8:04 ` [GIT PULL 00/10] perf/core improvements and fixes Ingo Molnar
2015-07-31 13:30 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438273028-5191-6-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=bp@suse.de \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.