blob: 9a7e3666253d32bd1314cb4d0efd7ddfe473483c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 7e9d89afc13815f9a203e75c2a64abc075310a3d Mon Sep 17 00:00:00 2001
From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
Date: Tue, 26 Mar 2019 14:16:02 +0300
Subject: [PATCH] Disable fenv.h for ARC with glibc
Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
---
src/corelib/tools/qlocale_tools.cpp | 2 +-
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +-
tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp
index 4d969a4723..130340e516 100644
--- a/src/corelib/tools/qlocale_tools.cpp
+++ b/src/corelib/tools/qlocale_tools.cpp
@@ -53,7 +53,7 @@
#include <stdlib.h>
#include <time.h>
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) && !defined(__arc__)
# include <fenv.h>
#endif
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index f6e6545948..48b6180c7b 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -46,7 +46,7 @@
#include <private/qlocale_tools_p.h>
#include <qnumeric.h>
-#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+#if defined(Q_OS_LINUX) && defined(__GLIBC__) && !defined(__arc__)
# define QT_USE_FENV
#endif
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 181c609c6e..a5c86ec845 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -2828,7 +2828,7 @@ void tst_QPainter::monoImages()
}
}
-#if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
+#if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) && !defined(__arc__)
#include <fenv.h>
static const QString fpeExceptionString(int exception)
--
2.16.2
|
