00db10
commit 0b4366bc9bca9be8a2208455545c138bcd1e826c
00db10
Author: Wilco <wdijkstr@arm.com>
00db10
Date:   Tue Jun 3 08:08:36 2014 +0000
00db10
00db10
    [AArch64] Cleanup declarations in math_private.h.
00db10
00db10
diff --git a/ports/sysdeps/aarch64/fpu/math_private.h b/ports/sysdeps/aarch64/fpu/math_private.h
00db10
index 7424952..a3f466b 100644
00db10
--- a/ports/sysdeps/aarch64/fpu/math_private.h
00db10
+++ b/ports/sysdeps/aarch64/fpu/math_private.h
00db10
@@ -25,7 +25,10 @@
00db10
 static __always_inline void
00db10
 libc_feholdexcept_aarch64 (fenv_t *envp)
00db10
 {
00db10
-  fpu_control_t fpcr, new_fpcr, fpsr, new_fpsr;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_control_t new_fpcr;
00db10
+  fpu_fpsr_t fpsr;
00db10
+  fpu_fpsr_t new_fpsr;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
   _FPU_GETFPSR (fpsr);
00db10
@@ -69,7 +72,10 @@ libc_fesetround_aarch64 (int round)
00db10
 static __always_inline void
00db10
 libc_feholdexcept_setround_aarch64 (fenv_t *envp, int round)
00db10
 {
00db10
-  fpu_control_t fpcr, new_fpcr, fpsr, new_fpsr;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_control_t new_fpcr;
00db10
+  fpu_fpsr_t fpsr;
00db10
+  fpu_fpsr_t new_fpsr;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
   _FPU_GETFPSR (fpsr);
00db10
@@ -96,7 +102,7 @@ libc_feholdexcept_setround_aarch64 (fenv_t *envp, int round)
00db10
 static __always_inline int
00db10
 libc_fetestexcept_aarch64 (int ex)
00db10
 {
00db10
-  fpu_control_t fpsr;
00db10
+  fpu_fpsr_t fpsr;
00db10
 
00db10
   _FPU_GETFPSR (fpsr);
00db10
   return fpsr & ex & FE_ALL_EXCEPT;
00db10
@@ -109,7 +115,8 @@ libc_fetestexcept_aarch64 (int ex)
00db10
 static __always_inline void
00db10
 libc_fesetenv_aarch64 (const fenv_t *envp)
00db10
 {
00db10
-  fpu_control_t fpcr, new_fpcr;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_control_t new_fpcr;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
   new_fpcr = envp->__fpcr;
00db10
@@ -130,7 +137,10 @@ libc_fesetenv_aarch64 (const fenv_t *envp)
00db10
 static __always_inline int
00db10
 libc_feupdateenv_test_aarch64 (const fenv_t *envp, int ex)
00db10
 {
00db10
-  fpu_control_t fpcr, new_fpcr, fpsr, new_fpsr;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_control_t new_fpcr;
00db10
+  fpu_fpsr_t fpsr;
00db10
+  fpu_fpsr_t new_fpsr;
00db10
   int excepts;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
@@ -171,7 +181,8 @@ libc_feupdateenv_aarch64 (const fenv_t *envp)
00db10
 static __always_inline void
00db10
 libc_feholdsetround_aarch64 (fenv_t *envp, int round)
00db10
 {
00db10
-  fpu_control_t fpcr, fpsr;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_fpsr_t fpsr;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
   _FPU_GETFPSR (fpsr);
00db10
@@ -193,7 +204,8 @@ libc_feholdsetround_aarch64 (fenv_t *envp, int round)
00db10
 static __always_inline void
00db10
 libc_feresetround_aarch64 (fenv_t *envp)
00db10
 {
00db10
-  fpu_control_t fpcr, round;
00db10
+  fpu_control_t fpcr;
00db10
+  int round;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
 
00db10
@@ -215,7 +227,9 @@ libc_feresetround_aarch64 (fenv_t *envp)
00db10
 static __always_inline void
00db10
 libc_feholdsetround_aarch64_ctx (struct rm_ctx *ctx, int r)
00db10
 {
00db10
-  fpu_control_t fpcr, fpsr, round;
00db10
+  fpu_control_t fpcr;
00db10
+  fpu_fpsr_t fpsr;
00db10
+  int round;
00db10
 
00db10
   _FPU_GETCW (fpcr);
00db10
   _FPU_GETFPSR (fpsr);