mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 18:49:33 +02:00
e66a9c7506
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>
37 lines
962 B
Diff
37 lines
962 B
Diff
Fix build for x32
|
|
|
|
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
|
|
|
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
|
|
|
|
-#if defined(__x86_64)
|
|
+#if defined(__x86_64) && !defined(__ILP32__)
|
|
static inline
|
|
unsigned int fls_u64(uint64_t x)
|
|
{
|