3857bccca5
CVE-2021-38593 fixes originally missed a usecase that was covered by the
to-be-removed patch. However, this patch was incorrect and added some
issues on its own, which was then fixed by now-removed
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch.
Unfortunately for us, the to-be-removed patch (fixed by
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch) can actually
be applied (with fuzz; by `patch` only) on top of the now-removed patch.
When the move to KDE Qt fork was made, some patches were removed as they
were already part of the new git fork. However, the to-be-removed patch
was not. This means the
0012-Refix-for-avoiding-huge-number-of-tiny-dashes.patch was actually
undone when Buildroot patched qt5base.
Let's remove this patch to fix this oversight.
As a reference:
e7ea2ed27c Improve fix for avoiding huge number of tiny dashes
fixed by
65b3aa6a1c Refix for avoiding huge number of tiny dashes
in the git repo.
Fixes: 5770a645a3 "package/qt5: bump packages to latest kde submodule versions"
Cc: Quentin Schulz <foss+buildroot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
[Arnout: renumber patches 0007 and 0008]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 27 Aug 2021 16:28:32 +0200
|
|
Subject: 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
|
|
|
|
Pick-to: 6.1 6.2
|
|
Fixes: QTBUG-96067
|
|
Change-Id: Ib6a9bcc496f37e69ac39362cb0a021fccaf311f5
|
|
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
[Retrieved from:
|
|
https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
src/corelib/thread/qfutex_p.h | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
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; }
|
|
--
|
|
cgit v1.2.1
|
|
|