diff options
author | Kai Kang <kai.kang@windriver.com> | 2016-06-29 16:08:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-08 09:57:25 +0100 |
commit | e8e8d412e7bafd38bdda7fea03f5db3b5e179baf (patch) | |
tree | bbd959bd2df1bdc28ac68b2e32c2e6d0199847b8 /meta/recipes-kernel/libpfm | |
parent | 23ae622a69d174216461d9570945e21a8aa865ff (diff) | |
download | poky-e8e8d412e7bafd38bdda7fea03f5db3b5e179baf.tar.gz |
libpfm4: fix compile error
It fails to compile libpfm4 with misleading-indentation error:
| syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation]
| for(c=cmin ; c < cmax; c++)
| ^~~
Add clauses to fix it.
(From OE-Core rev: 2857658ff5e477cb436cf2778a78fa9f192caab8)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/libpfm')
-rw-r--r-- | meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch | 38 | ||||
-rw-r--r-- | meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch b/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch new file mode 100644 index 0000000000..25d47ef125 --- /dev/null +++ b/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix compile error: | ||
4 | |||
5 | | syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation] | ||
6 | | for(c=cmin ; c < cmax; c++) | ||
7 | | ^~~ | ||
8 | |||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
10 | --- | ||
11 | diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c | ||
12 | index 0d53078..2dfb9b9 100644 | ||
13 | --- a/perf_examples/syst_count.c | ||
14 | +++ b/perf_examples/syst_count.c | ||
15 | @@ -343,8 +343,9 @@ measure(void) | ||
16 | |||
17 | for (delay = 1 ; delay <= options.delay; delay++) { | ||
18 | |||
19 | - for(c=cmin ; c < cmax; c++) | ||
20 | - start_cpu(c); | ||
21 | + for(c=cmin ; c < cmax; c++) { | ||
22 | + start_cpu(c); | ||
23 | + } | ||
24 | |||
25 | if (0) { | ||
26 | tv.tv_sec = 0; | ||
27 | @@ -353,8 +354,9 @@ measure(void) | ||
28 | } else | ||
29 | sleep(1); | ||
30 | |||
31 | - for(c=cmin ; c < cmax; c++) | ||
32 | - stop_cpu(c); | ||
33 | + for(c=cmin ; c < cmax; c++) { | ||
34 | + stop_cpu(c); | ||
35 | + } | ||
36 | |||
37 | for(c = cmin; c < cmax; c++) { | ||
38 | printf("# %'ds -----\n", delay); | ||
diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb index 0b024ad61d..4136eac81f 100644 --- a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb +++ b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb | |||
@@ -14,6 +14,7 @@ COMPATIBLE_HOST = "powerpc64" | |||
14 | 14 | ||
15 | SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ | 15 | SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ |
16 | file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \ | 16 | file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \ |
17 | file://fix-misleading-indentation-error.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487" | 20 | SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487" |