On Sun, Sep 20, 2015 at 2:22 AM, Siarhei Siamashka
<[email protected]> wrote:
> On Thu, 17 Sep 2015 15:43:27 +0200
> Marek Vasut <[email protected]> wrote:
>
>> From: Thomas Petazzoni <[email protected]>
>>
>> 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 <[email protected]>
>> Signed-off-by: Marek Vasut <[email protected]>
>>
>> ---
>> 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
>
> Thanks for the patch:
> Acked-by: Siarhei Siamashka <[email protected]>
Pushed to master:
8189fad..4297e90 master -> master
Oded
_______________________________________________
Pixman mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pixman
