Skip to content

Commit

Permalink
perf tools: Fix build against newer glibc
Browse files Browse the repository at this point in the history
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 <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
jwboyer authored and Mahesh Mahadevan committed Sep 14, 2012
1 parent 8efdd6a commit 16d9d1e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/perf/util/include/linux/compiler.h
Expand Up @@ -5,7 +5,9 @@
#define __always_inline inline
#endif
#define __user
#ifndef __attribute_const__
#define __attribute_const__
#endif

#define __used __attribute__((__unused__))

Expand Down

0 comments on commit 16d9d1e

Please sign in to comment.