summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-10 22:35:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 17:14:25 +0100
commit64a47c3d0afa14a4fb34695d9e84e530921791d5 (patch)
tree63e0f362f596e34d3d6246962fd10394c08fa733 /meta/recipes-kernel
parentda4795cf540632e2a4fa87579bd1c49c7d7a8be2 (diff)
downloadpoky-64a47c3d0afa14a4fb34695d9e84e530921791d5.tar.gz
dtc: fix compilation with gcc 4.6.0
(From OE-Core rev: e5cb0d5101f4bbfb516236fa95a1b50e27a2d21c) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch51
-rw-r--r--meta/recipes-kernel/dtc/dtc_git.inc5
2 files changed, 54 insertions, 2 deletions
diff --git a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch b/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
new file mode 100644
index 0000000000..b34894d926
--- /dev/null
+++ b/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
@@ -0,0 +1,51 @@
1Upstream-Status: Pending
2
3Fix following compilation errors with gcc 4.6.0
4| dtc.c: In function 'main':
5| dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable]
6| cc1: all warnings being treated as errors
7|
8| make: *** [dtc.o] Error 1
9| make: *** Waiting for unfinished jobs....
10| flattree.c: In function 'flat_read_mem_reserve':
11| flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable]
12| cc1: all warnings being treated as errors
13|
14| make: *** [flattree.o] Error 1
15| ERROR: oe_runmake failed
16
17Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10
18
19Index: git/dtc.c
20===================================================================
21--- git.orig/dtc.c
22+++ git/dtc.c
23@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
24 const char *inform = "dts";
25 const char *outform = "dts";
26 const char *outname = "-";
27- int force = 0, check = 0;
28+ int force = 0, __attribute__((__unused__)) check = 0;
29 const char *arg;
30 int opt;
31 FILE *outf = NULL;
32Index: git/flattree.c
33===================================================================
34--- git.orig/flattree.c
35+++ git/flattree.c
36@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me
37 {
38 struct reserve_info *reservelist = NULL;
39 struct reserve_info *new;
40- const char *p;
41 struct fdt_reserve_entry re;
42
43 /*
44@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me
45 *
46 * First pass, count entries.
47 */
48- p = inb->ptr;
49 while (1) {
50 flat_read_chunk(inb, &re, sizeof(re));
51 re.address = fdt64_to_cpu(re.address);
diff --git a/meta/recipes-kernel/dtc/dtc_git.inc b/meta/recipes-kernel/dtc/dtc_git.inc
index 6b7acd53ba..2400cfe52f 100644
--- a/meta/recipes-kernel/dtc/dtc_git.inc
+++ b/meta/recipes-kernel/dtc/dtc_git.inc
@@ -1,7 +1,8 @@
1SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git" 1SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
2 file://fix_for_compilation_with_gcc_4.6.0.patch"
2 3
3SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" 4SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
4PV = "1.2.0+git${SRCPV}" 5PV = "1.2.0+git${SRCPV}"
5PR = "r2" 6PR = "r3"
6 7
7S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"