summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/x32.patch28
1 files changed, 24 insertions, 4 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/x32.patch b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
index b1bb8e4930..42cebf94ac 100644
--- a/meta/recipes-kernel/lttng/lttng-tools/x32.patch
+++ b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
@@ -1,11 +1,31 @@
1Fix build for x32 1Fix build for x32
2 2
3Upstream-Status: Pending
4Signed-off-by: Christopher Larson <chris_larson@mentor.com> 3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
5 4
6--- lttng-tools-2.6.0/src/bin/lttng/utils.c~ 2015-01-26 18:17:15.000000000 +0100 5Fix build error of src/common/utils.c for x32.
7+++ lttng-tools-2.6.0/src/bin/lttng/utils.c 2015-07-30 19:45:25.632045712 +0200 6
8@@ -130,7 +130,7 @@ 7Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/150]
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
10
11diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
12index 0e96ef0c..5c79c8c7 100644
13--- a/src/bin/lttng/utils.c
14+++ b/src/bin/lttng/utils.c
15@@ -158,7 +158,7 @@ unsigned int fls_u32(uint32_t x)
16 #define HAS_FLS_U32
17 #endif
18
19-#if defined(__x86_64)
20+#if defined(__x86_64) && !defined(__ILP32__)
21 static inline
22 unsigned int fls_u64(uint64_t x)
23 {
24diff --git a/src/common/utils.c b/src/common/utils.c
25index 08139e5e..3c389981 100644
26--- a/src/common/utils.c
27+++ b/src/common/utils.c
28@@ -1223,7 +1223,7 @@ static inline unsigned int fls_u32(uint32_t x)
9 #define HAS_FLS_U32 29 #define HAS_FLS_U32
10 #endif 30 #endif
11 31