mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-08 15:29:50 +00:00
Code Issues Projects Releases Wiki Activity

lttng-tools: fix compile error for x32

Browse Source 
Fix build error of src/common/utils.c for x32:

| .../src/common/utils.c: Assembler messages:
| .../src/common/utils.c:1026: Error: register type mismatch for `bsr'
| .../src/common/utils.c:1028: Error: operand type mismatch for `movq'
| make[3]: *** [utils.lo] Error 1

[YOCTO #13081]

(From OE-Core rev: db9c892eb1697e3ba3c17eabf59b007c0cf3ff33)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2018-12-13 09:14:11 -05:00
committed by Richard Purdie
parent 53d8896c5b
commit e66a9c7506
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-kernel/lttng/lttng-tools/x32.patch
+24 -4
View File
@@ -1,11 +1,31 @@
Fix build for x32
Upstream-Status: Pending
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
--- 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 @@
Fix build error of src/common/utils.c for x32.
Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/150]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index 0e96ef0c..5c79c8c7 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -158,7 +158,7 @@ unsigned int fls_u32(uint32_t x)
#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/src/common/utils.c b/src/common/utils.c
index 08139e5e..3c389981 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1223,7 +1223,7 @@ static inline unsigned int fls_u32(uint32_t x)
#define HAS_FLS_U32
#endif