summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/x32.patch16
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb1
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/x32.patch b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
new file mode 100644
index 0000000000..b1bb8e4930
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
@@ -0,0 +1,16 @@
1Fix build for x32
2
3Upstream-Status: Pending
4Signed-off-by: Christopher Larson <chris_larson@mentor.com>
5
6--- lttng-tools-2.6.0/src/bin/lttng/utils.c~ 2015-01-26 18:17:15.000000000 +0100
7+++ lttng-tools-2.6.0/src/bin/lttng/utils.c 2015-07-30 19:45:25.632045712 +0200
8@@ -130,7 +130,7 @@
9 #define HAS_FLS_U32
10 #endif
11
12-#if defined(__x86_64)
13+#if defined(__x86_64) && !defined(__ILP32__)
14 static inline
15 unsigned int fls_u64(uint64_t x)
16 {
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index 0d2bd005e4..29fd75b217 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -31,6 +31,7 @@ PACKAGECONFIG_remove_libc-musl = "lttng-ust"
31 31
32SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ 32SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
33 file://0001-Fix-error.h-common-error.h.patch \ 33 file://0001-Fix-error.h-common-error.h.patch \
34 file://x32.patch \
34 file://run-ptest" 35 file://run-ptest"
35 36
36S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"