diff options
| author | Marcus Shawcroft <marcus.shawcroft@arm.com> | 2014-05-19 09:08:59 +0100 |
|---|---|---|
| committer | Marcus Shawcroft <marcus.shawcroft@arm.com> | 2014-05-19 09:08:59 +0100 |
| commit | 18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4 (patch) | |
| tree | 92b5d3167160de1067a52ba0fec81393f8e196cf /sysdeps/arm/feholdexcpt.c | |
| parent | 834caf06f33d79be54cff63c274fba2845513593 (diff) | |
| download | glibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.tar.gz glibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.tar.xz glibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.zip | |
Revert "ARM: Improve fenv implementation"
This reverts commit c0c08d02c82275353f5c556f935a1a01714d9d7f.
Diffstat (limited to 'sysdeps/arm/feholdexcpt.c')
| -rw-r--r-- | sysdeps/arm/feholdexcpt.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sysdeps/arm/feholdexcpt.c b/sysdeps/arm/feholdexcpt.c index 2d79e0c46d..258ba6637f 100644 --- a/sysdeps/arm/feholdexcpt.c +++ b/sysdeps/arm/feholdexcpt.c @@ -16,18 +16,30 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -#include <fenv_private.h> +#include <fenv.h> +#include <fpu_control.h> #include <arm-features.h> int feholdexcept (fenv_t *envp) { + fpu_control_t fpscr; + /* Fail if a VFP unit isn't present. */ if (!ARM_HAVE_VFP) return 1; - libc_feholdexcept_vfp (envp); + _FPU_GETCW (fpscr); + envp->__cw = fpscr; + + /* Now set all exceptions to non-stop. */ + fpscr &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT); + + /* And clear all exception flags. */ + fpscr &= ~FE_ALL_EXCEPT; + + _FPU_SETCW (fpscr); return 0; } |