diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-12-13 09:14:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-14 17:09:12 +0000 |
commit | db9c892eb1697e3ba3c17eabf59b007c0cf3ff33 (patch) | |
tree | 93d9977e8482b44b7e5153e78f28d602cf2fc28d /meta/recipes-kernel/lttng/lttng-tools | |
parent | 7201df413616cab8d7f3257f86dd7a0a5c7719ee (diff) | |
download | openembedded-core-contrib-db9c892eb1697e3ba3c17eabf59b007c0cf3ff33.tar.gz |
lttng-tools: fix compile error for x32
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]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/x32.patch | 28 |
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 @@ 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 |