summaryrefslogtreecommitdiff
path: root/comphelper/source
diff options
context:
space:
mode:
Diffstat (limited to 'comphelper/source')
-rw-r--r--comphelper/source/misc/random.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/comphelper/source/misc/random.cxx b/comphelper/source/misc/random.cxx
index 280e6e20fd00..bfb4de15aee5 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -17,6 +17,9 @@
#include <time.h>
#include <random>
#include <stdexcept>
+#if defined HAVE_VALGRIND_HEADERS
+#include <valgrind/memcheck.h>
+#endif
// this is nothing but a simple wrapper around
// the std::random generators
@@ -40,6 +43,12 @@ struct RandomNumberGenerator
RandomNumberGenerator()
{
bool bRepeatable = (getenv("SAL_RAND_REPEATABLE") != nullptr);
+ // valgrind on some platforms (e.g.Ubuntu16.04) does not support the new Intel RDRAND instructions,
+ // which leads to "Illegal Opcode" errors, so just turn off randomness.
+#if defined HAVE_VALGRIND_HEADERS
+ if (RUNNING_ON_VALGRIND)
+ bRepeatable = true;
+#endif
if (bRepeatable)
{
global_rng.seed(42);