From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vms173011pub.verizon.net (vms173011pub.verizon.net [206.46.173.11]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 14C44E00599 for ; Wed, 18 Jan 2012 20:05:33 -0800 (PST) Received: from gandalf.denix.org ([unknown] [71.163.124.23]) by vms173011.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LY100HA220TC8V1@vms173011.mailsrvcs.net> for meta-ti@yoctoproject.org; Wed, 18 Jan 2012 22:05:17 -0600 (CST) Received: by gandalf.denix.org (Postfix, from userid 1000) id 05CAD203B3; Wed, 18 Jan 2012 23:05:17 -0500 (EST) Date: Wed, 18 Jan 2012 23:05:16 -0500 From: Denys Dmytriyenko To: Khem Raj Message-id: <20120119040516.GA17552@denix.org> References: <1326943843-13114-1-git-send-email-raj.khem@gmail.com> MIME-version: 1.0 In-reply-to: <1326943843-13114-1-git-send-email-raj.khem@gmail.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: meta-ti@yoctoproject.org Subject: Re: [PATCH V2] linux-3.0: Fix perf compile failure with eglibc 2.15 X-BeenThere: meta-ti@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Mailing list for the meta-ti layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2012 04:05:34 -0000 Content-type: text/plain; charset=us-ascii Content-disposition: inline On Wed, Jan 18, 2012 at 07:30:43PM -0800, Khem Raj wrote: > 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 > --- > ...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 > > 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 0000000..bf2f6e7 > --- /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 885db09..dc19a9e 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 2796304..70ca7cc 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 \ > -- > 1.7.8.3 > > _______________________________________________ > meta-ti mailing list > meta-ti@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-ti >