blob: c4e55ab583f417182862ce15fd3879e9fad7d111 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 602d6a279939ec30fc7f3ae9d10e3640854f77b2 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 18 Aug 2011 07:24:25 -0400
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
|
