linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Irina Tirdea <irina.tirdea@intel.com>,
	David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@redhat.com>,
	Namhyung Kim <namhyung.kim@lge.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Steven Rostedt <rostedt@goodmis.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/13] perf tools: include basename for non-glibc systems
Date: Fri,  7 Sep 2012 23:07:06 -0300	[thread overview]
Message-ID: <1347070032-4161-8-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1347070032-4161-1-git-send-email-acme@infradead.org>

From: Irina Tirdea <irina.tirdea@intel.com>

perf uses the glibc version of basename(), by defining _GNU_SOURCE,
including string.h and not including libgen.h. The glibc version of
basename is better than the POSIX version since it does not modify its
argument.

Android has only one version of basename which is defined in libgen.h.
This version is the same as the glibc version.

Error on Android:
util/annotate.c: In function 'symbol__annotate_printf':
util/annotate.c:503:3: error: implicit declaration of function 'basename'
[-Werror=implicit-function-declaration]
util/annotate.c:503:3: error: nested extern declaration of 'basename'
[-Werror=nested-externs]
util/annotate.c:503:14: error: assignment makes pointer from integer without
a cast [-Werror]

On Android libgen.h should be included to define basename.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347065004-15306-6-git-send-email-irina.tirdea@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.h |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index fc4b1e6..d3b330c 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -10,6 +10,9 @@
 #include <linux/rbtree.h>
 #include <stdio.h>
 #include <byteswap.h>
+#if defined(__BIONIC__)
+#include <libgen.h>
+#endif
 
 #ifndef NO_LIBELF_SUPPORT
 #include <libelf.h>
-- 
1.7.9.2.358.g22243


  parent reply	other threads:[~2012-09-08  2:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-08  2:06 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 01/13] perf tools: Ignore compiled python binaries Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 02/13] tools lib traceevent: Get rid of die() from pretty_print() Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 03/13] tools lib traceevent: Get rid of die() from pevent_register_event_handler Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 04/13] tools lib traceevent: Get rid of die() from pevent_register_print_function Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 05/13] perf diff: Make diff command work with evsel hists Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 06/13] perf tools: Replace sort's standalone field_sep with symbol_conf.field_sep Arnaldo Carvalho de Melo
2012-09-08  2:07 ` Arnaldo Carvalho de Melo [this message]
2012-09-08  2:07 ` [PATCH 08/13] perf tools: fix missing winsize definition Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 09/13] perf tools: include missing pthread.h header Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 10/13] perf tools: replace mkostemp with mkstemp Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 11/13] tools lib traceevent: replace mempcpy with memcpy Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 12/13] perf tools: add NO_BACKTRACE for application self-debugging Arnaldo Carvalho de Melo
2012-09-08  2:07 ` [PATCH 13/13] perf tools: Fix build for another rbtree.c change Arnaldo Carvalho de Melo
2012-09-08 11:28 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar

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=1347070032-4161-8-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=dsahern@gmail.com \
    --cc=irina.tirdea@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung.kim@lge.com \
    --cc=paulus@samba.org \
    --cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).