1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-07-16 14:27:48 +00:00

linux-3.0: Fix perf compile failure with eglibc 2.15

There is a conflict with eglibc headers since
new headers added the defines that compiler.h
was redefining without undefining them

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Khem Raj
2012-01-18 19:30:43 -08:00
committed by Koen Kooi
parent 8c36bbe150
commit 3b9c2d238b
3 changed files with 35 additions and 2 deletions
@@ -0,0 +1,31 @@
From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 5 Jan 2012 11:42:35 -0800
Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
This is required to avoid warnings like
util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
tools/perf/util/include/linux/compiler.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
--- a/tools/perf/util/include/linux/compiler.h
+++ b/tools/perf/util/include/linux/compiler.h
@@ -4,9 +4,11 @@
#ifndef __always_inline
#define __always_inline inline
#endif
+#undef __user
#define __user
+#undef __attribute_const__
#define __attribute_const__
-
+#undef __used
#define __used __attribute__((__unused__))
#endif
+1 -1
View File
@@ -13,7 +13,7 @@ git reset --hard ${TAG}
rm export -rf
previous=${TAG}
PATCHSET="pm-wip/voltdm pm-wip/cpufreq beagle madc sakoman sgx ulcd omap4"
PATCHSET="pm-wip/voltdm pm-wip/cpufreq beagle madc sakoman sgx ulcd omap4 misc"
# apply patches
for patchset in ${PATCHSET} ; do