From: Denys Dmytriyenko <denis@denix.org>
To: Khem Raj <raj.khem@gmail.com>
Cc: meta-ti@yoctoproject.org
Subject: Re: [PATCH V2] linux-3.0: Fix perf compile failure with eglibc 2.15
Date: Wed, 18 Jan 2012 23:05:16 -0500 [thread overview]
Message-ID: <20120119040516.GA17552@denix.org> (raw)
In-Reply-To: <1326943843-13114-1-git-send-email-raj.khem@gmail.com>
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 <raj.khem@gmail.com>
Acked-by: Denys Dmytriyenko <denys@ti.com>
> ---
> ...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 <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
> 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
>
prev parent reply other threads:[~2012-01-19 4:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-19 3:30 [PATCH V2] linux-3.0: Fix perf compile failure with eglibc 2.15 Khem Raj
2012-01-19 4:05 ` Denys Dmytriyenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120119040516.GA17552@denix.org \
--to=denis@denix.org \
--cc=meta-ti@yoctoproject.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.