summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2016-06-29 16:08:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:55:40 +0100
commit2857658ff5e477cb436cf2778a78fa9f192caab8 (patch)
tree8f7c35f3768ed3eea2143f7cc0101763eb0e497f
parenta7133bf6bb650b944d29d01129f36a56282acd2b (diff)
downloadopenembedded-core-contrib-2857658ff5e477cb436cf2778a78fa9f192caab8.tar.gz
openembedded-core-contrib-2857658ff5e477cb436cf2778a78fa9f192caab8.tar.bz2
openembedded-core-contrib-2857658ff5e477cb436cf2778a78fa9f192caab8.zip
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. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch38
-rw-r--r--meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb1
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 @@
+Upstream-Status: Pending
+
+Fix compile error:
+
+| syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation]
+| for(c=cmin ; c < cmax; c++)
+| ^~~
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c
+index 0d53078..2dfb9b9 100644
+--- a/perf_examples/syst_count.c
++++ b/perf_examples/syst_count.c
+@@ -343,8 +343,9 @@ measure(void)
+
+ for (delay = 1 ; delay <= options.delay; delay++) {
+
+- for(c=cmin ; c < cmax; c++)
+- start_cpu(c);
++ for(c=cmin ; c < cmax; c++) {
++ start_cpu(c);
++ }
+
+ if (0) {
+ tv.tv_sec = 0;
+@@ -353,8 +354,9 @@ measure(void)
+ } else
+ sleep(1);
+
+- for(c=cmin ; c < cmax; c++)
+- stop_cpu(c);
++ for(c=cmin ; c < cmax; c++) {
++ stop_cpu(c);
++ }
+
+ for(c = cmin; c < cmax; c++) {
+ 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"
SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \
file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \
+ file://fix-misleading-indentation-error.patch \
"
SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487"