From: Irina Tirdea <irina.tirdea@gmail.com>
To: mingo@redhat.com, acme@ghostprotocols.net,
a.p.zijlstra@chello.nl, rostedt@goodmis.org
Cc: paulus@samba.org, dsahern@gmail.com, namhyung.kim@lge.com,
linux-kernel@vger.kernel.org,
Irina Tirdea <irina.tirdea@intel.com>
Subject: [PATCH v2 03/12] perf tools: include __WORDSIZE definition
Date: Sat, 8 Sep 2012 03:43:15 +0300 [thread overview]
Message-ID: <1347065004-15306-4-git-send-email-irina.tirdea@intel.com> (raw)
In-Reply-To: <1347065004-15306-1-git-send-email-irina.tirdea@intel.com>
From: Irina Tirdea <irina.tirdea@intel.com>
__WORDSIZE is GLibC-specific and is not defined on all systems or glibc
versions (e.g. Android's bionic does not define it).
In file included from util/include/linux/bitmap.h:5:0,
from util/header.h:10,
from util/session.h:6,
from util/build-id.h:4,
from util/annotate.c:11:
util/include/linux/bitops.h: In function 'set_bit':
util/include/linux/bitops.h:25:12: error:
'__WORDSIZE' undeclared (first use in this function)
util/include/linux/bitops.h:25:12: note:
each undeclared identifier is reported only once for each function it appears in
util/include/linux/bitops.h:23:51: error:
parameter 'addr' set but not used [-Werror=unused-but-set-parameter]
util/include/linux/bitops.h: In function 'clear_bit':
util/include/linux/bitops.h:30:12: error:
'__WORDSIZE' undeclared (first use in this function)
util/include/linux/bitops.h:28:53: error:
parameter 'addr' set but not used [-Werror=unused-but-set-parameter]
In file included from util/header.h:10:0,
from util/session.h:6,
from util/build-id.h:4,
from util/annotate.c:11:
util/include/linux/bitmap.h: In function 'bitmap_zero':
util/include/linux/bitmap.h:22:6: error:
'__WORDSIZE' undeclared (first use in this function)
Defining __WORDSIZE in perf's headers if it is not already defined.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
---
tools/perf/util/include/linux/bitops.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h
index 587a230..91779ec 100644
--- a/tools/perf/util/include/linux/bitops.h
+++ b/tools/perf/util/include/linux/bitops.h
@@ -5,6 +5,15 @@
#include <linux/compiler.h>
#include <asm/hweight.h>
+#ifndef __WORDSIZE
+#if defined(__x86_64__)
+# define __WORDSIZE 64
+#endif
+#if defined(__i386__) || defined(__arm__)
+# define __WORDSIZE 32
+#endif
+#endif
+
#define BITS_PER_LONG __WORDSIZE
#define BITS_PER_BYTE 8
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
--
1.7.9.5
next prev parent reply other threads:[~2012-09-08 0:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-08 0:43 [PATCH v2 00/12] Porting perf to Android Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 01/12] perf tools: include wrapper for magic.h Irina Tirdea
2012-09-08 9:13 ` Pekka Enberg
2012-09-08 22:39 ` Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 02/12] perf tools: update types definitions for Android Irina Tirdea
2012-09-08 0:43 ` Irina Tirdea [this message]
2012-09-08 9:07 ` [PATCH v2 03/12] perf tools: include __WORDSIZE definition Pekka Enberg
2012-09-08 22:19 ` Irina Tirdea
2012-09-10 14:44 ` Peter Zijlstra
2012-09-10 21:42 ` Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 04/12] perf tools: fix ALIGN redefinition in system headers Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 05/12] perf tools: include basename for non-glibc systems Irina Tirdea
2012-09-08 9:09 ` Pekka Enberg
2012-09-08 14:33 ` David Ahern
2012-09-08 11:43 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 06/12] perf tools: fix missing winsize definition Irina Tirdea
2012-09-08 11:44 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 07/12] perf tools: include missing pthread.h header Irina Tirdea
2012-09-08 11:45 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 08/12] perf tools: fix no return in non-void function Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 09/12] perf tools: replace mkostemp with mkstemp Irina Tirdea
2012-09-08 11:46 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 10/12] tools lib traceevent: replace mempcpy with memcpy Irina Tirdea
2012-09-08 11:47 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 11/12] perf tools: add NO_BACKTRACE for application self-debugging Irina Tirdea
2012-09-08 11:48 ` [tip:perf/core] " tip-bot for Irina Tirdea
2012-09-08 0:43 ` [PATCH v2 12/12] perf tools: Use __maybe_used for unused variables Irina Tirdea
2012-09-08 1:14 ` [PATCH v2 00/12] Porting perf to Android 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=1347065004-15306-4-git-send-email-irina.tirdea@intel.com \
--to=irina.tirdea@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=dsahern@gmail.com \
--cc=irina.tirdea@intel.com \
--cc=linux-kernel@vger.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
Powered by JetHome