From a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Fri, 24 Oct 2014 13:07:17 +0000 Subject: Cleanup feenableexcept to use the same logic as the ARM version. No functional changes. --- ChangeLog | 5 +++++ sysdeps/aarch64/fpu/feenablxcpt.c | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea29be2291..2302d7ef5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-24 Wilco Dijkstra + + * sysdeps/aarch64/fpu/feenablxcpt.c (feenableexcept): + Simplify logic. + 2014-10-24 Wilco Dijkstra * sysdeps/aarch64/fpu/fedisblxcpt.c (fedisableexcept): diff --git a/sysdeps/aarch64/fpu/feenablxcpt.c b/sysdeps/aarch64/fpu/feenablxcpt.c index 70e413c9f6..763248f4e1 100644 --- a/sysdeps/aarch64/fpu/feenablxcpt.c +++ b/sysdeps/aarch64/fpu/feenablxcpt.c @@ -24,14 +24,9 @@ feenableexcept (int excepts) { fpu_control_t fpcr; fpu_control_t fpcr_new; - int original_excepts; _FPU_GETCW (fpcr); - - original_excepts = (fpcr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT; - excepts &= FE_ALL_EXCEPT; - fpcr_new = fpcr | (excepts << FE_EXCEPT_SHIFT); if (fpcr != fpcr_new) @@ -50,5 +45,5 @@ feenableexcept (int excepts) return -1; } - return original_excepts; + return (fpcr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT; } -- cgit 1.4.1