From 346c6c9edad2f98533da5876701c1ee1d0a6b818 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Thu, 17 May 2012 12:54:04 -0500 Subject: [PATCH] linux-qoriq-sdk.inc: add patch to fix perf compiler issues Signed-off-by: Matthew McClintock --- ...-before-redefining-__attribute_const.patch | 31 +++++++++++++++++++ .../recipes-kernel/linux/linux-qoriq-sdk.inc | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-ppc/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch diff --git a/meta-fsl-ppc/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/meta-fsl-ppc/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file mode 100644 index 00000000..bf2f6e77 --- /dev/null +++ b/meta-fsl-ppc/recipes-kernel/linux/files/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/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc index f90d8949..dc650c06 100644 --- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc +++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc @@ -1,12 +1,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" PV = "3.0.6" -PR = "r2" +PR = "r3" SRCREV = "1e3e8ed15249d73a066ddfe2e80882935c35dcb7" SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ file://add-no-unused-but-set-variable.patch \ file://add-no-error-array-bounds.patch \ + file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ " KSRC ?= "" -- 2.40.1