lkml.org 
[lkml]   [2011]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Fix perf 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.

Signed-off-by: Josh Boyer <jwboyer@redhat.com>
---
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 791f9dd..547628e 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__))

--
1.7.6


\
 
 \ /
  Last update: 2011-08-18 13:39    [W:0.043 / U:0.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site