diff options
author | Marek Vasut <marex@denx.de> | 2015-09-20 00:43:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-21 23:05:45 +0100 |
commit | a88733677a6d809c2fca8dc5ec14c7cb4a869ea7 (patch) | |
tree | 8392cfdb4d7f20f2d7eb48f5d597c0ed62cd3946 /meta/recipes-graphics | |
parent | 1bd71e740b085d2e012b38ac5c04556d7f8561c4 (diff) | |
download | openembedded-core-contrib-a88733677a6d809c2fca8dc5ec14c7cb4a869ea7.tar.gz |
pixman: Fix missing FE_DIVBYZERO on nios2
The FE_DIVBYZERO is missing on nios2 , add a small patch to pixman
which checks for the presence of FE_DIVBYZERO and disables the test
which depends on it.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch | 65 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb | 1 |
2 files changed, 66 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch new file mode 100644 index 00000000000..a60df5fc08d --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch @@ -0,0 +1,65 @@ +From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Thu, 17 Sep 2015 03:08:36 +0200 +Subject: [PATCH] [v3] 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@free-electrons.com> +Signed-off-by: Marek Vasut <marex@denx.de> +Upstream-Status: Submitted +--- +Changes v1 -> v2: + + * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is + automatically set by AC_CHECK_DECL, to decide whether or not + HAVE_FEDIVBYZERO should be defined. + +Changes v2 -> v3: + + * Use action-if-yes of AC_CHECK_DECL as suggested in + http://lists.freedesktop.org/archives/pixman/2014-February/003176.html +--- + configure.ac | 5 +++++ + test/utils.c | 2 ++ + 2 files changed, 7 insertions(+) + +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 +-- +2.1.4 + diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb index eae59b62d2e..317a568bd6a 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb @@ -31,6 +31,7 @@ SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://mips-export-revert.patch \ file://asm_include.patch \ + file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ " SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" |