summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-05-17 12:54:04 -0500
committerMatthew McClintock <msm@freescale.com>2012-05-17 12:54:04 -0500
commit47e877189c77994e620756a448ccc8d17e42ceff (patch)
treef0e2d712d4c88d07d94dbaed65d6818f5827e4e8
parent5d4267f1cee246fda7d9a641f8f7ab171c3cb71d (diff)
downloadmeta-fsl-ppc-47e877189c77994e620756a448ccc8d17e42ceff.tar.gz
linux-qoriq-sdk.inc: add patch to fix perf compiler issues
Signed-off-by: Matthew McClintock <msm@freescale.com>
-rw-r--r--recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch31
-rw-r--r--recipes-kernel/linux/linux-qoriq-sdk.inc3
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
new file mode 100644
index 0000000..bf2f6e7
--- /dev/null
+++ b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch
@@ -0,0 +1,31 @@
1From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 5 Jan 2012 11:42:35 -0800
4Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__
5
6This is required to avoid warnings like
7util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12
13---
14 tools/perf/util/include/linux/compiler.h | 4 +++-
15 1 files changed, 3 insertions(+), 1 deletions(-)
16
17--- a/tools/perf/util/include/linux/compiler.h
18+++ b/tools/perf/util/include/linux/compiler.h
19@@ -4,9 +4,11 @@
20 #ifndef __always_inline
21 #define __always_inline inline
22 #endif
23+#undef __user
24 #define __user
25+#undef __attribute_const__
26 #define __attribute_const__
27-
28+#undef __used
29 #define __used __attribute__((__unused__))
30
31 #endif
diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc
index f90d894..dc650c0 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -1,12 +1,13 @@
1LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 1LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
2 2
3PV = "3.0.6" 3PV = "3.0.6"
4PR = "r2" 4PR = "r3"
5 5
6SRCREV = "1e3e8ed15249d73a066ddfe2e80882935c35dcb7" 6SRCREV = "1e3e8ed15249d73a066ddfe2e80882935c35dcb7"
7SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ 7SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \
8 file://add-no-unused-but-set-variable.patch \ 8 file://add-no-unused-but-set-variable.patch \
9 file://add-no-error-array-bounds.patch \ 9 file://add-no-error-array-bounds.patch \
10 file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \
10 " 11 "
11 12
12KSRC ?= "" 13KSRC ?= ""