diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-05-13 22:55:52 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2010-05-13 22:55:52 +0000 |
| commit | c66d6ac2f76d90ddbbf04653963798f18ec2d96d (patch) | |
| tree | 9640d3adc1d4aa1f97eff64f421bcc3cd37cd199 /libc | |
| parent | 8788ce3787ac33ece2f77ee530b7858b2bc202f3 (diff) | |
Merge changes between r10438 and r10452 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10453 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog | 5 | ||||
| -rw-r--r-- | libc/sysdeps/sh/sh4/fpu/feholdexcpt.c | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index 952952ab6..c8b7c0afe 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,8 @@ +2010-05-12 Andrew Stubbs <ams@codesourcery.com> + + * sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Really disable all + exceptions. Return 0. + 2010-05-07 Roland McGrath <roland@redhat.com> * elf/ldconfig.c (main): Add a const. diff --git a/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c b/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c index 7aac5a0d3..87d642089 100644 --- a/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c +++ b/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c @@ -1,5 +1,6 @@ /* Store current floating-point environment and clear exceptions. - Copyright (C) 1997, 1998, 1999, 2000, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2005, 2010 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,10 +30,15 @@ feholdexcept (fenv_t *envp) _FPU_GETCW (temp); envp->__fpscr = temp; - /* Now set all exceptions to non-stop. */ + /* Clear the status flags. */ temp &= ~FE_ALL_EXCEPT; + + /* Now set all exceptions to non-stop. */ + temp &= ~(FE_ALL_EXCEPT << 5); + _FPU_SETCW (temp); - return 1; + /* Success. */ + return 0; } libm_hidden_def (feholdexcept) |