| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | Fix build for x32 |
| 2 | |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 3 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
| 4 | |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | Fix build error of src/common/utils.c for x32. |
| 6 | |
| 7 | Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/150] |
| 8 | |
| 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 10 | |
| 11 | diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c |
| 12 | index 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 | { |
| 24 | diff --git a/src/common/utils.c b/src/common/utils.c |
| 25 | index 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) |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 | { |