diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2021-08-27 16:28:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-02 09:59:44 +0000 |
| commit | 047eeddf1658ea5bb58d3bb01f93a7a7544852db (patch) | |
| tree | 8e1dd8861967d86428ea430cf07c92c36e1f5fe3 | |
| parent | 8ec406b2296abdbdc8606fa955a2f8feb5254b1f (diff) | |
Fix build on riscv32
riscv32 fails to build because __NR_futex is not defined on this
architecture:
In file included from thread/qmutex_linux.cpp:45,
from thread/qmutex.cpp:804:
thread/qfutex_p.h: In function 'int QtLinuxFutex::_q_futex(int*, int, int, quintptr, int*, int)':
thread/qfutex_p.h:116:30: error: '__NR_futex' was not declared in this scope; did you mean '_q_futex'?
116 | int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3);
| ^~~~~~~~~~
| _q_futex
Fixes: QTBUG-96067
Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 035dc537bee26e3b63a211b2835d8560439e161f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/thread/qfutex_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h index 40482b6fc1..037207a5c0 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h @@ -103,6 +103,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 +// RISC-V does not supply __NR_futex +# ifndef __NR_futex +# define __NR_futex __NR_futex_time64 +# endif + QT_BEGIN_NAMESPACE namespace QtLinuxFutex { constexpr inline bool futexAvailable() { return true; } |