Revert "perf symbols: Fix mismatched declarations for elf_getphdrnum"
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 179f36dde3cec0f9f05a757b68f6a58e4edbcc95 Gitweb: http://git.kernel.org/tip/179f36dde3cec0f9f05a757b68f6a58e4edbcc95 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 17 Sep 2015 11:30:20 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 17 Sep 2015 13:10:05 -0300
Revert "perf symbols: Fix mismatched declarations for elf_getphdrnum"
This reverts commit f785f2357673d520a0b7b468973cdd197f336494.
We have a test to check if elf_getphdrnum() is present, so, if it fails, we'll get:
[acme@rhel5 linux]$ cat /tmp/build/perf/feature/test-libelf-getphdrnum.make.output
cc1: warnings being treated as errors
test-libelf-getphdrnum.c: In function ‘main’:
test-libelf-getphdrnum.c:7: warning: implicit declaration of function ‘elf_getphdrnum’ [acme@rhel5 linux]$
And this block will not be compiled:
#ifndef HAVE_ELF_GETPHDRNUM_SUPPORT static int elf_getphdrnum(Elf *elf, size_t *dst) ... #endif
So, if elf_getphdrnum() is being defined somewhere, there is a problem with the test that is not detecting that function, go fix it.
Reported-by Vinson Lee <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc "Naveen N. Rao" <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Srikar Dronamraju <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Victor Kamensky <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol-elf.c +1 -1
@@ -38,7 +38,7 @@ static inline char *bfd_demangle(void __maybe_unused *v,#endif #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT -int elf_getphdrnum (Elf *elf,size_t *dst) +static int elf_getphdrnum (Elf *elf,size_t *dst) {GElf_Ehdr gehdr;GElf_Ehdr *ehdr;