Fix: compile fails for x32 arch

LTTng-Tools fails to compile for the x32 ABI:

| .../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'

Add a macro to only use the x86_64 inline assembly version of fls_u64()
when the LP64 ABI is used.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index fa2d3c9da626542fc9a0d1bb78bdf017197eedd1..81e93952ad139ad9466a9723099a7884d0911c5c 100644 (file)
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -159,7 +159,7 @@ unsigned int fls_u32(uint32_t x)
 #define HAS_FLS_U32
 #endif
 
 #define HAS_FLS_U32
 #endif
 

-#if defined(__x86_64)
+#if defined(__x86_64) && defined(__LP64__)

 static inline
 unsigned int fls_u64(uint64_t x)
 {
 static inline
 unsigned int fls_u64(uint64_t x)
 {

diff --git a/src/common/utils.c b/src/common/utils.c
index 17a313ee16f66efe8c574ddfddc8f94f156b9e11..3cdb6b76063caf4545761a93b52523dd2c39b14c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1014,7 +1014,7 @@ static inline unsigned int fls_u32(uint32_t x)
 #define HAS_FLS_U32
 #endif
 
 #define HAS_FLS_U32
 #endif
 

-#if defined(__x86_64)
+#if defined(__x86_64) && defined(__LP64__)

 static inline
 unsigned int fls_u64(uint64_t x)
 {
 static inline
 unsigned int fls_u64(uint64_t x)
 {