diff options
| author | Josh Boyer <[email protected]> | 2011-08-18 11:37:21 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2011-08-18 10:24:53 +0000 |
| commit | 195bcbf5078d74c8e00d68f04eb8695196fb31e8 (patch) | |
| tree | 16be79165faf9f56dfa93bcb96ae634c6582db91 | |
| parent | perf tools: Fix error handling of unknown events (diff) | |
| download | kernel-195bcbf5078d74c8e00d68f04eb8695196fb31e8.tar.gz kernel-195bcbf5078d74c8e00d68f04eb8695196fb31e8.zip | |
perf tools: Fix build against newer glibc
Upstream glibc commit 295e904 added a definition for __attribute_const__
to cdefs.h. This causes the following error when building perf:
util/include/linux/compiler.h:8:0: error: "__attribute_const__"
redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
location of the previous definition
Wrap __attribute_const__ in #ifndef as we do for __always_inline.
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Josh Boyer <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
| -rw-r--r-- | tools/perf/util/include/linux/compiler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h index 791f9dd27ebf..547628e97f3d 100644 --- a/tools/perf/util/include/linux/compiler.h +++ b/tools/perf/util/include/linux/compiler.h @@ -5,7 +5,9 @@ #define __always_inline inline #endif #define __user +#ifndef __attribute_const__ #define __attribute_const__ +#endif #define __used __attribute__((__unused__)) |