SH: Use fpu_control_t for the temporary FPU control word.

13 files changed, 34 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d1bc8f892..9a5cd02dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-05-27  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/sh/sh4/fpu/fclrexcpt.c (feclearexcept): Use fpu_control_t for
+	the temporary FPU control word.
+	* sysdeps/sh/sh4/fpu/fedisblxcpt.c (fedisableexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/feenablxcpt.c (feenableexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetenv.c (fegetenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetexcept.c (fegetexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fegetround.c (fegetround): Likewise.
+	* sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fesetround.c (fesetround): Likewise.
+	* sysdeps/sh/sh4/fpu/feupdateenv.c (feupdateenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fsetexcptflg.c (fesetexceptflag): Likewise.
+	* sysdeps/sh/sh4/fpu/ftestexcept.c (fetestexcept): Likewise.
+
 2012-05-27  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Restore fpscr flag
diff --git a/sysdeps/sh/sh4/fpu/fclrexcpt.c b/sysdeps/sh/sh4/fpu/fclrexcpt.c
index c2df162fe2..b4b2ead02c 100644
--- a/sysdeps/sh/sh4/fpu/fclrexcpt.c
+++ b/sysdeps/sh/sh4/fpu/fclrexcpt.c
@@ -1,5 +1,5 @@
 /* Clear given exceptions in current floating-point environment.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1998.
 
@@ -23,7 +23,7 @@
 int
 feclearexcept (int excepts)
 {
-  int cw;
+  fpu_control_t cw;
 
   /* Mask out unsupported bits/exceptions.  */
   excepts &= FE_ALL_EXCEPT;
diff --git a/sysdeps/sh/sh4/fpu/fedisblxcpt.c b/sysdeps/sh/sh4/fpu/fedisblxcpt.c
index 029fcc386a..b2938bae6f 100644
--- a/sysdeps/sh/sh4/fpu/fedisblxcpt.c
+++ b/sysdeps/sh/sh4/fpu/fedisblxcpt.c
@@ -23,7 +23,7 @@
 int
 fedisableexcept (int excepts)
 {
-  unsigned int temp, old_exc;
+  fpu_control_t temp, old_exc;
 
   /* Get the current control register contents.  */
   _FPU_GETCW (temp);
diff --git a/sysdeps/sh/sh4/fpu/feenablxcpt.c b/sysdeps/sh/sh4/fpu/feenablxcpt.c
index 93fa7498e5..6d92c12bfd 100644
--- a/sysdeps/sh/sh4/fpu/feenablxcpt.c
+++ b/sysdeps/sh/sh4/fpu/feenablxcpt.c
@@ -23,7 +23,7 @@
 int
 feenableexcept (int excepts)
 {
-  unsigned int temp, old_flag;
+  fpu_control_t temp, old_flag;
 
   /* Get current exceptions.  */
   _FPU_GETCW (temp);
diff --git a/sysdeps/sh/sh4/fpu/fegetenv.c b/sysdeps/sh/sh4/fpu/fegetenv.c
index 3103316e34..ca7de16285 100644
--- a/sysdeps/sh/sh4/fpu/fegetenv.c
+++ b/sysdeps/sh/sh4/fpu/fegetenv.c
@@ -22,7 +22,7 @@
 int
 fegetenv (fenv_t *envp)
 {
-  unsigned long int temp;
+  fpu_control_t temp;
   _FPU_GETCW (temp);
   /* When read fpscr, this was initialized.
      We need to rewrite value of temp. */
diff --git a/sysdeps/sh/sh4/fpu/fegetexcept.c b/sysdeps/sh/sh4/fpu/fegetexcept.c
index a849a17756..a2faaac332 100644
--- a/sysdeps/sh/sh4/fpu/fegetexcept.c
+++ b/sysdeps/sh/sh4/fpu/fegetexcept.c
@@ -23,7 +23,7 @@
 int
 fegetexcept (void)
 {
-  unsigned int temp;
+  fpu_control_t temp;
 
   /* Get current exceptions.  */
   _FPU_GETCW (temp);
diff --git a/sysdeps/sh/sh4/fpu/fegetround.c b/sysdeps/sh/sh4/fpu/fegetround.c
index 9108e97445..7368383114 100644
--- a/sysdeps/sh/sh4/fpu/fegetround.c
+++ b/sysdeps/sh/sh4/fpu/fegetround.c
@@ -1,5 +1,5 @@
 /* Return current rounding direction.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1998.
 
@@ -23,7 +23,7 @@
 int
 fegetround (void)
 {
-  int cw;
+  fpu_control_t cw;
 
   /* Get control word.  */
   _FPU_GETCW (cw);
diff --git a/sysdeps/sh/sh4/fpu/feholdexcpt.c b/sysdeps/sh/sh4/fpu/feholdexcpt.c
index 2b6b9bdc83..40a58e1288 100644
--- a/sysdeps/sh/sh4/fpu/feholdexcpt.c
+++ b/sysdeps/sh/sh4/fpu/feholdexcpt.c
@@ -1,6 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 1997, 1998, 1999, 2000, 2005, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -23,7 +22,7 @@
 int
 feholdexcept (fenv_t *envp)
 {
-  unsigned long int temp;
+  fpu_control_t temp;
 
   /* Store the environment.  */
   _FPU_GETCW (temp);
diff --git a/sysdeps/sh/sh4/fpu/fesetenv.c b/sysdeps/sh/sh4/fpu/fesetenv.c
index 34d3461fc7..55fd1f66b1 100644
--- a/sysdeps/sh/sh4/fpu/fesetenv.c
+++ b/sysdeps/sh/sh4/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -26,7 +26,7 @@ fesetenv (const fenv_t *envp)
       _FPU_SETCW (_FPU_DEFAULT);
   else
     {
-      unsigned long int temp = envp->__fpscr;
+      fpu_control_t temp = envp->__fpscr;
       _FPU_SETCW (temp);
     }
   return 0;
diff --git a/sysdeps/sh/sh4/fpu/fesetround.c b/sysdeps/sh/sh4/fpu/fesetround.c
index 3269199ea9..4edf9c5d88 100644
--- a/sysdeps/sh/sh4/fpu/fesetround.c
+++ b/sysdeps/sh/sh4/fpu/fesetround.c
@@ -23,7 +23,7 @@
 int
 fesetround (int round)
 {
-  unsigned int cw;
+  fpu_control_t cw;
 
   if ((round & ~0x3) != 0)
     /* ROUND is no valid rounding mode.  */
diff --git a/sysdeps/sh/sh4/fpu/feupdateenv.c b/sysdeps/sh/sh4/fpu/feupdateenv.c
index 96a6979141..41fb8a5063 100644
--- a/sysdeps/sh/sh4/fpu/feupdateenv.c
+++ b/sysdeps/sh/sh4/fpu/feupdateenv.c
@@ -23,7 +23,7 @@
 int
 feupdateenv (const fenv_t *envp)
 {
-  unsigned int temp;
+  fpu_control_t temp;
 
   _FPU_GETCW (temp);
   temp = (temp & FE_ALL_EXCEPT);
diff --git a/sysdeps/sh/sh4/fpu/fsetexcptflg.c b/sysdeps/sh/sh4/fpu/fsetexcptflg.c
index 40cd5ea38e..ffed4b16c7 100644
--- a/sysdeps/sh/sh4/fpu/fsetexcptflg.c
+++ b/sysdeps/sh/sh4/fpu/fsetexcptflg.c
@@ -1,5 +1,5 @@
 /* Set floating-point environment exception handling.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -23,7 +23,7 @@
 int
 fesetexceptflag (const fexcept_t *flagp, int excepts)
 {
-  fexcept_t temp;
+  fpu_control_t temp;
 
   /* Get the current environment.  */
   _FPU_GETCW (temp);
diff --git a/sysdeps/sh/sh4/fpu/ftestexcept.c b/sysdeps/sh/sh4/fpu/ftestexcept.c
index c2e1772a91..c61af4ce0a 100644
--- a/sysdeps/sh/sh4/fpu/ftestexcept.c
+++ b/sysdeps/sh/sh4/fpu/ftestexcept.c
@@ -1,5 +1,5 @@
 /* Test exception in current environment.
-   Copyright (C) 1997, 1998, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -22,7 +22,7 @@
 int
 fetestexcept (int excepts)
 {
-  fexcept_t temp;
+  fpu_control_t temp;
 
   /* Get current exceptions.  */
   _FPU_GETCW (temp);