diff options
| author | Martchus | 2018-05-28 21:50:43 +0200 |
|---|---|---|
| committer | Martchus | 2018-05-28 21:50:43 +0200 |
| commit | 1de5b17c1169b308c3a014303dc8217228b90cca (patch) | |
| tree | d2cdeb79f6dc53b2c55cbfbc84e191ca59508b7b /0033-Disable-hardware-randomizer-for-32-bit.patch | |
| parent | 5522f822fc1124b7feaa9b9ed1e958a5f8897a9c (diff) | |
| download | aur-1de5b17c1169b308c3a014303dc8217228b90cca.tar.gz | |
Update to 5.11.0
Diffstat (limited to '0033-Disable-hardware-randomizer-for-32-bit.patch')
| -rw-r--r-- | 0033-Disable-hardware-randomizer-for-32-bit.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/0033-Disable-hardware-randomizer-for-32-bit.patch b/0033-Disable-hardware-randomizer-for-32-bit.patch new file mode 100644 index 000000000000..d7cf9b4b1e89 --- /dev/null +++ b/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -0,0 +1,49 @@ +From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sat, 26 May 2018 03:47:14 +0200 +Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise it fails to compile src/corelib/global/qrandom.cpp: +``` +during RTL pass: ira +/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp: In function ‘qsizetype qt_random_cpu(void*, qsizetype)’: +/build/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.11.0/src/corelib/global/qrandom.cpp:121:1: internal compiler error: in ix86_compute_frame_layout, at config/i386/i386.c:11693 + } +``` +--- + src/corelib/global/qrandom.cpp | 2 +- + src/corelib/global/qrandom_p.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp +index ebf9864b15..2fb04ab12a 100644 +--- a/src/corelib/global/qrandom.cpp ++++ b/src/corelib/global/qrandom.cpp +@@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando + + QT_BEGIN_NAMESPACE + +-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) ++#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND) + static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; + + # ifdef Q_PROCESSOR_X86_64 +diff --git a/src/corelib/global/qrandom_p.h b/src/corelib/global/qrandom_p.h +index 917a91098e..c770a3e19b 100644 +--- a/src/corelib/global/qrandom_p.h ++++ b/src/corelib/global/qrandom_p.h +@@ -81,7 +81,7 @@ enum { qt_randomdevice_control = 0 }; + + inline bool qt_has_hwrng() + { +-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) ++#if defined(Q_PROCESSOR_X86_64) && QT_COMPILER_SUPPORTS_HERE(RDRND) + return qCpuHasFeature(RDRND); + #else + return false; +-- +2.17.0 + |