sysprof: update to 3.22.2

Drop 0001-Forward-port-mips-arm-memory-barrier-patches.patch; upstream
is using standard C11 facilities for this now.

Drop 0001-callgraph-Use-U64_TO_POINTER.patch; it has been merged upstream.

(From OE-Core rev: 9425992b59afa887fbbb1d3b3598f08757de4765)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2016-11-28 15:34:13 +02:00 committed by Richard Purdie
parent 3c01e48bb4
commit 0724f40962
3 changed files with 3 additions and 76 deletions

View File

@ -1,38 +0,0 @@
From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Sat, 11 Jun 2016 22:45:37 +0300
Subject: [PATCH] Forward port mips & arm memory barrier patches
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
lib/util/util.h | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/lib/util/util.h b/lib/util/util.h
index 591722d..0768056 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -29,4 +29,19 @@
#define read_barrier() asm volatile("" ::: "memory")
#endif
+#ifdef __arm__
+/*
+ * Use the __kuser_memory_barrier helper in the CPU helper page. See
+ * arch/arm/kernel/entry-armv.S in the kernel source for details.
+ */
+#define read_barrier() ((void(*)(void))0xffff0fa0)()
+#endif
+
+#ifdef __mips__
+#define read_barrier() asm volatile(".set mips2\n\t" \
+ "sync\n\t" \
+ ".set mips0" ::: "memory")
+#endif
+
+
#endif /* SP_UTIL_H */
--
2.1.4

View File

@ -1,29 +0,0 @@
From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Fri, 10 Jun 2016 14:01:54 +0300
Subject: [PATCH] callgraph: Use U64_TO_POINTER
This fixes a "cast to pointer from integer of different size" on i586.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Upstream-Status: Pending
---
lib/sp-callgraph-view.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c
index 02cc17b..58315b0 100644
--- a/lib/sp-callgraph-view.c
+++ b/lib/sp-callgraph-view.c
@@ -135,7 +135,7 @@ build_functions_store (StackNode *node,
gtk_list_store_append (state->store, &iter);
gtk_list_store_set (state->store, &iter,
- COLUMN_NAME, (const gchar *)node->data,
+ COLUMN_NAME, U64_TO_POINTER(node->data),
COLUMN_SELF, 100.0 * size / state->profile_size,
COLUMN_TOTAL, 100.0 * total / state->profile_size,
COLUMN_POINTER, node,
--
2.1.4

View File

@ -7,20 +7,14 @@ inherit gnomebase gettext systemd
DEPENDS = "glib-2.0"
S = "${WORKDIR}/git"
SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068"
PV = "3.20.0+git${SRCPV}"
SRC_URI = "git://git.gnome.org/sysprof \
SRC_URI += " \
file://define-NT_GNU_BUILD_ID.patch \
file://0001-configure-Add-option-to-enable-disable-polkit.patch \
file://0001-Disable-check-for-polkit-for-UI.patch \
file://0001-Avoid-building-docs.patch \
file://0001-callgraph-Use-U64_TO_POINTER.patch \
file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \
"
SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9"
SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5"
SRC_URI[archive.md5sum] = "2634bf35f5592e5e4520ccaba87e909e"
SRC_URI[archive.sha256sum] = "d57fb19a3e5d4ad37d5fb554dc93d9a03f332779c3bffd9c2aa8f176e85269d7"
AUTOTOOLS_AUXDIR = "${S}/build-aux"