blob: 6b7c1e62a22ddf6f7d4a6e31d49c70ca34f441f8 [file] [log] [blame]
Patrick Williamsf1e5d692016-03-30 15:21:19 -05001From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Thu, 17 Sep 2015 03:08:36 +0200
4Subject: [PATCH] [v3] test: add a check for FE_DIVBYZERO
5
6Some architectures, such as Microblaze and Nios2, currently do not
7implement FE_DIVBYZERO, even though they have <fenv.h> and
8feenableexcept(). This commit adds a configure.ac check to verify
9whether FE_DIVBYZERO is defined or not, and if not, disables the
10problematic code in test/utils.c.
11
12Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13Signed-off-by: Marek Vasut <marex@denx.de>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050014Upstream-Status: Backport [commit 4297e9058]
Patrick Williamsf1e5d692016-03-30 15:21:19 -050015---
16Changes v1 -> v2:
17
18 * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is
19 automatically set by AC_CHECK_DECL, to decide whether or not
20 HAVE_FEDIVBYZERO should be defined.
21
22Changes v2 -> v3:
23
24 * Use action-if-yes of AC_CHECK_DECL as suggested in
25 http://lists.freedesktop.org/archives/pixman/2014-February/003176.html
26---
27 configure.ac | 5 +++++
28 test/utils.c | 2 ++
29 2 files changed, 7 insertions(+)
30
31diff --git a/configure.ac b/configure.ac
32index f93cc30..424bfd3 100644
33--- a/configure.ac
34+++ b/configure.ac
35@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then
36 AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()])
37 fi
38
39+AC_CHECK_DECL([FE_DIVBYZERO],
40+ [AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])],
41+ [],
42+ [[#include <fenv.h>]])
43+
44 AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no)
45 AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no)
46 if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then
47diff --git a/test/utils.c b/test/utils.c
48index 222d4d5..8657966 100644
49--- a/test/utils.c
50+++ b/test/utils.c
51@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void)
52 {
53 #ifdef HAVE_FENV_H
54 #ifdef HAVE_FEENABLEEXCEPT
55+#ifdef HAVE_FEDIVBYZERO
56 feenableexcept (FE_DIVBYZERO);
57+#endif
58 #endif
59 #endif
60 }
61
62 void
63--
642.1.4
65