From 00e354910b9ff751acb937e6ca2ef9f66a49bac7 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 30 Nov 2016 19:42:55 -0700 Subject: lttng-tools: fix for x32 (From OE-Core rev: af0203f1543e444d4c9397c6b400ba627baf9574) Signed-off-by: Christopher Larson Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-tools/x32.patch | 16 ++++++++++++++++ meta/recipes-kernel/lttng/lttng-tools_git.bb | 1 + 2 files changed, 17 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-tools/x32.patch (limited to 'meta/recipes-kernel') 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 @@ +Fix build for x32 + +Upstream-Status: Pending +Signed-off-by: Christopher Larson + +--- lttng-tools-2.6.0/src/bin/lttng/utils.c~ 2015-01-26 18:17:15.000000000 +0100 ++++ lttng-tools-2.6.0/src/bin/lttng/utils.c 2015-07-30 19:45:25.632045712 +0200 +@@ -130,7 +130,7 @@ + #define HAS_FLS_U32 + #endif + +-#if defined(__x86_64) ++#if defined(__x86_64) && !defined(__ILP32__) + static inline + unsigned int fls_u64(uint64_t x) + { 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" SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ file://0001-Fix-error.h-common-error.h.patch \ + file://x32.patch \ file://run-ptest" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf