summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch47
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb)17
2 files changed, 10 insertions, 54 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch b/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch
deleted file mode 100644
index 2c1756e6ed..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/Fix-alignment-problems-on-targets-not-supporting-una.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 9dc4d3a8dcc7cfb6991e760e78f614afd593bf66 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Fredrik=20Markstr=C3=B6m?= <fredrik.markstrom@gmail.com>
3Date: Tue, 1 Apr 2014 17:46:23 +0200
4Subject: [PATCH v2] Fix: alignment problems on targets not supporting unaligned
5 access.
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Submitted (https://www.mail-archive.com/lttng-dev@lists.lttng.org/msg06012.html)
11
12Accessing floats, doubles and 64 bit int at unaligned addresses is not
13supported on all configurations of arm processors and if it is it's
14emulated and slow. This patch replaces direct assignments with memcpy.
15
16Signed-off-by: Fredrik Markström <fredrik.markstrom@gmail.com>
17Signed-off-by: Roy Li <rongqing.li@windriver.com>
18Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
19---
20 src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c | 4 ++--
21 1 file changed, 2 insertions(+), 2 deletions(-)
22
23diff --git a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
24index 762d604..8c6dc96 100644
25--- a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
26+++ b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
27@@ -222,7 +222,7 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
28 if (!insn)
29 return -ENOMEM;
30 insn->op = FILTER_OP_LOAD_S64;
31- *(int64_t *) insn->data = node->u.load.u.num;
32+ memcpy(insn->data, &node->u.load.u.num, sizeof(int64_t));
33 ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
34 free(insn);
35 return ret;
36@@ -237,7 +237,7 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
37 if (!insn)
38 return -ENOMEM;
39 insn->op = FILTER_OP_LOAD_DOUBLE;
40- *(double *) insn->data = node->u.load.u.flt;
41+ memcpy(insn->data, &node->u.load.u.flt, sizeof(double));
42 ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
43 free(insn);
44 return ret;
45--
461.7.10.4
47
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
index aab9bf6bbf..14e5f9ebf2 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.4.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb
@@ -9,25 +9,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" 10 file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
11 11
12DEPENDS = "liburcu popt lttng-ust" 12DEPENDS = "liburcu popt lttng-ust libxml2"
13RDEPENDS_${PN}-ptest += "make" 13RDEPENDS_${PN}-ptest += "make"
14 14
15SRCREV = "8e3234eea2d81f8a962214c570532f8e096a9a8d" 15SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88"
16PV = "v2.4.0" 16PV = "v2.5.0"
17 17
18SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.4 \ 18SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \
19 file://runtest-2.4.0.patch \ 19 file://runtest-2.4.0.patch \
20 file://run-ptest \ 20 file://run-ptest \
21 file://Fix-alignment-problems-on-targets-not-supporting-una.patch \
22 " 21 "
23 22
24S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
25 24
26inherit autotools-brokensep ptest 25inherit autotools-brokensep ptest pkgconfig
27 26
28export KERNELDIR="${STAGING_KERNEL_DIR}" 27export KERNELDIR="${STAGING_KERNEL_DIR}"
29 28
30FILES_${PN} += "${libdir}/lttng/libexec/*" 29FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng"
31FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug" 30FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
32 31
33# Since files are installed into ${libdir}/lttng/libexec we match 32# Since files are installed into ${libdir}/lttng/libexec we match
@@ -35,6 +34,10 @@ FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug"
35INSANE_SKIP_${PN} = "libexec" 34INSANE_SKIP_${PN} = "libexec"
36INSANE_SKIP_${PN}-dbg = "libexec" 35INSANE_SKIP_${PN}-dbg = "libexec"
37 36
37do_configure_prepend () {
38 # Delete a shipped m4 file that overrides our patched one
39 rm -f ${S}/config/libxml.m4
40}
38 41
39do_install_ptest () { 42do_install_ptest () {
40 chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh 43 chmod +x ${D}/${libdir}/${PN}/ptest/tests/utils/utils.sh