pixman: Branch 'master'

[Oded Gabbay]

 configure.ac |    5 +++++
 test/utils.c |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit 4297e9058d252cac653723fe0b1bee559fbac3a4
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date:   Thu Sep 17 15:43:27 2015 +0200

    test: add a check for FE_DIVBYZERO
    
    Some architectures, such as Microblaze and Nios2, currently do not
    implement FE_DIVBYZERO, even though they have <fenv.h> and
    feenableexcept(). This commit adds a configure.ac check to verify
    whether FE_DIVBYZERO is defined or not, and if not, disables the
    problematic code in test/utils.c.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
    Signed-off-by: Marek Vasut <marex at denx.de>
    Acked-by: Siarhei Siamashka <siarhei.siamashka at gmail.com>
    Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/configure.ac b/configure.ac
index f93cc30..424bfd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then
    AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()])
 fi
 
+AC_CHECK_DECL([FE_DIVBYZERO],
+	[AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])],
+	[],
+	[[#include <fenv.h>]])
+
 AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no)
 AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no)
 if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then
diff --git a/test/utils.c b/test/utils.c
index 222d4d5..8657966 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void)
 {
 #ifdef HAVE_FENV_H
 #ifdef HAVE_FEENABLEEXCEPT
+#ifdef HAVE_FEDIVBYZERO
     feenableexcept (FE_DIVBYZERO);
 #endif
 #endif
+#endif
 }
 
 void