summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-tools/x32.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/x32.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/x32.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/x32.patch b/meta/recipes-kernel/lttng/lttng-tools/x32.patch
deleted file mode 100644
index 42cebf94ac..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/x32.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Fix build for x32
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4
5Fix build error of src/common/utils.c for x32.
6
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)
29 #define HAS_FLS_U32
30 #endif
31
32-#if defined(__x86_64)
33+#if defined(__x86_64) && !defined(__ILP32__)
34 static inline
35 unsigned int fls_u64(uint64_t x)
36 {