FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PR libgfortran/78314] Fix ieee_support_halting

Browse source 
ieee_support_halting only checked the availability of status
flags, not trapping support.  On some targets the later can
only be checked at runtime: feenableexcept reports if
enabling traps failed.

So check trapping support by enabling/disabling it.

Updated the test that enabled trapping to check if it is
supported.

gcc/testsuite/

	PR libgfortran/78314
	* gfortran.dg/ieee/ieee_6.f90: Use ieee_support_halting.

libgfortran/

	PR libgfortran/78314
	* config/fpu-glibc.h (support_fpu_trap): Use feenableexcept.

From-SVN: r242505
This commit is contained in:
Szabolcs Nagy 2016-11-16 17:27:04 +00:00 • committed by Szabolcs Nagy
parent e38f65725b
commit 0af3095468
4 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2016-11-16 Szabolcs Nagy <szabolcs.nagy@arm.com>
PR libgfortran/78314
* gfortran.dg/ieee/ieee_6.f90: Use ieee_support_halting.
2016-11-16 Bin Cheng <bin.cheng@arm.com>
* gcc.target/arm/ivopts-orig_biv-inc.c: Adjust test string

9
gcc/testsuite/gfortran.dg/ieee/ieee_6.f90
View file

@ -9,7 +9,7 @@
implicit none
type(ieee_status_type) :: s1, s2
logical :: flags(5), halt(5)
logical :: flags(5), halt(5), haltworks
type(ieee_round_type) :: mode
real :: x
@ -18,6 +18,7 @@
call ieee_set_flag(ieee_all, .false.)
call ieee_set_rounding_mode(ieee_down)
call ieee_set_halting_mode(ieee_all, .false.)
haltworks = ieee_support_halting(ieee_overflow)
call ieee_get_status(s1)
call ieee_set_status(s1)
@ -46,7 +47,7 @@
call ieee_get_rounding_mode(mode)
if (mode /= ieee_to_zero) call abort
call ieee_get_halting_mode(ieee_all, halt)
if ((.not. halt(1)) .or. any(halt(2:))) call abort
if ((haltworks .and. .not. halt(1)) .or. any(halt(2:))) call abort
call ieee_set_status(s2)
@ -58,7 +59,7 @@
call ieee_get_rounding_mode(mode)
if (mode /= ieee_to_zero) call abort
call ieee_get_halting_mode(ieee_all, halt)
if ((.not. halt(1)) .or. any(halt(2:))) call abort
if ((haltworks .and. .not. halt(1)) .or. any(halt(2:))) call abort
call ieee_set_status(s1)
@ -79,6 +80,6 @@
call ieee_get_rounding_mode(mode)
if (mode /= ieee_to_zero) call abort
call ieee_get_halting_mode(ieee_all, halt)
if ((.not. halt(1)) .or. any(halt(2:))) call abort
if ((haltworks .and. .not. halt(1)) .or. any(halt(2:))) call abort
end

5
libgfortran/ChangeLog
View file

@ -1,3 +1,8 @@
2016-11-16 Szabolcs Nagy <szabolcs.nagy@arm.com>
PR libgfortran/78314
* config/fpu-glibc.h (support_fpu_trap): Use feenableexcept.
2016-11-15 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Thomas Koenig <tkoenig@gcc.gnu.org>

36
libgfortran/config/fpu-glibc.h
View file

@ -121,7 +121,41 @@ get_fpu_trap_exceptions (void)
int
support_fpu_trap (int flag)
{
return support_fpu_flag (flag);
int exceptions = 0;
int old;
if (!support_fpu_flag (flag))
return 0;
#ifdef FE_INVALID
if (flag & GFC_FPE_INVALID) exceptions |= FE_INVALID;
#endif
#ifdef FE_DIVBYZERO
if (flag & GFC_FPE_ZERO) exceptions |= FE_DIVBYZERO;
#endif
#ifdef FE_OVERFLOW
if (flag & GFC_FPE_OVERFLOW) exceptions |= FE_OVERFLOW;
#endif
#ifdef FE_UNDERFLOW
if (flag & GFC_FPE_UNDERFLOW) exceptions |= FE_UNDERFLOW;
#endif
#ifdef FE_DENORMAL
if (flag & GFC_FPE_DENORMAL) exceptions |= FE_DENORMAL;
#endif
#ifdef FE_INEXACT
if (flag & GFC_FPE_INEXACT) exceptions |= FE_INEXACT;
#endif
old = feenableexcept (exceptions);
if (old == -1)
return 0;
fedisableexcept (exceptions & ~old);
return 1;
}