50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
|
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
|
|||
|
|