vlc | branch: master | Steve Lhomme <[email protected]> | Wed Mar 11 08:02:18 2020 +0100| [7864c72675756ce05840fe603ad747df1e163085] | committer: Steve Lhomme
contrib: qt: update the mingw32 compiler crash fix on RDRND It didn't apply on 5.12 anymore. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7864c72675756ce05840fe603ad747df1e163085 --- contrib/src/qt/0001-disable-qt_random_cpu.patch | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/contrib/src/qt/0001-disable-qt_random_cpu.patch b/contrib/src/qt/0001-disable-qt_random_cpu.patch index a271da4e9d..feae5ef394 100644 --- a/contrib/src/qt/0001-disable-qt_random_cpu.patch +++ b/contrib/src/qt/0001-disable-qt_random_cpu.patch @@ -1,11 +1,22 @@ ---- qt-5.11.0/src/corelib/global/qrandom.cpp.orig 2018-06-19 11:22:03.011543136 +0200 -+++ qt-5.11.0/src/corelib/global/qrandom.cpp 2018-06-19 11:23:45.231337043 +0200 -@@ -90,7 +90,7 @@ - - QT_BEGIN_NAMESPACE +--- qt/src/corelib/tools/qsimd.cpp.mingw32 2020-01-24 06:54:31.000000000 +0100 ++++ qt/src/corelib/tools/qsimd.cpp 2020-03-11 07:59:52.182784800 +0100 +@@ -621,7 +621,7 @@ void qDumpCPUFeatures() + puts(""); + } -#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) -+#if 0 - static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; ++#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) && 0 // mingw32 32-bits crash # ifdef Q_PROCESSOR_X86_64 + # define _rdrandXX_step _rdrand64_step +--- qt/src/corelib/tools/qsimd_p.h.mingw32 2020-01-24 06:54:31.000000000 +0100 ++++ qt/src/corelib/tools/qsimd_p.h 2020-03-11 07:59:43.086627000 +0100 +@@ -346,7 +346,7 @@ extern Q_CORE_EXPORT QBasicAtomicInteger + #endif + Q_CORE_EXPORT void qDetectCpuFeatures(); + +-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) ++#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) && 0 // mingw32 32-bits crash + Q_CORE_EXPORT qsizetype qRandomCpu(void *, qsizetype) Q_DECL_NOTHROW; + #else + static inline qsizetype qRandomCpu(void *, qsizetype) Q_DECL_NOTHROW _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
