From 3b9c2d238b95f0f6e9da1036dc19daccdd152ad6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Jan 2012 19:30:43 -0800 Subject: 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 Acked-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- ...Undef-before-redefining-__attribute_const.patch | 31 ++++++++++++++++++++++ recipes-kernel/linux/linux-3.0/patch.sh | 2 +- recipes-kernel/linux/linux_3.0.bb | 4 ++- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 recipes-kernel/linux/linux-3.0/misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-3.0/misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/linux-3.0/misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file mode 100644 index 00000000..bf2f6e77 --- /dev/null +++ b/recipes-kernel/linux/linux-3.0/misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch @@ -0,0 +1,31 @@ +From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 + +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 diff --git a/recipes-kernel/linux/linux-3.0/patch.sh b/recipes-kernel/linux/linux-3.0/patch.sh index 885db093..dc19a9e5 100755 --- a/recipes-kernel/linux/linux-3.0/patch.sh +++ b/recipes-kernel/linux/linux-3.0/patch.sh @@ -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 diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 27963048..70ca7cc9 100644 --- a/recipes-kernel/linux/linux_3.0.bb +++ b/recipes-kernel/linux/linux_3.0.bb @@ -10,7 +10,7 @@ PV = "3.0.17" SRCREV_pn-${PN} = "e9d23be2708477feeaec78e707c80441520c1ef6" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" @@ -221,6 +221,8 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi \ file://omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch \ \ + file://misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ + \ file://defconfig" SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ -- cgit v1.2.3-54-g00ecf