about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-12-04 22:07:03 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-12-04 22:07:03 +0000
commit0993dd9b0c61965d426287ca66b57cd2c6301bc0 (patch)
tree23dd885af3b2df8c0093aa72230ce462e582cf11
parent9003570a4999e2cb35e69144356af4a59b9821e0 (diff)
downloadglibc-0993dd9b0c61965d426287ca66b57cd2c6301bc0.tar.gz
glibc-0993dd9b0c61965d426287ca66b57cd2c6301bc0.tar.xz
glibc-0993dd9b0c61965d426287ca66b57cd2c6301bc0.zip
Fix warnings from MIPS soft-float _FPU_GETCW.
-rw-r--r--ports/ChangeLog.mips7
-rw-r--r--ports/sysdeps/mips/fpu_control.h7
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index b996ea6a1c..d4d19eadfc 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,10 @@
+2012-12-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/mips/fpu_control.h [__mips_soft_float] (_FPU_GETCW):
+	Define to set cw to 0, now just to plain "0" as a statement.
+	[__mips_soft_float] (_FPU_SETCW): Define to (void) (cw), rather
+	than doing nothing with cw.
+
 2012-11-30  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/mips/mips32/libm-test-ulps: Update.
diff --git a/ports/sysdeps/mips/fpu_control.h b/ports/sysdeps/mips/fpu_control.h
index 7307d030ea..acf794cb9e 100644
--- a/ports/sysdeps/mips/fpu_control.h
+++ b/ports/sysdeps/mips/fpu_control.h
@@ -1,6 +1,5 @@
 /* FPU control word bits.  Mips version.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2006, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Olaf Flebbe and Ralf Baechle.
 
@@ -63,8 +62,8 @@
 #define _FPU_RESERVED 0xffffffff
 #define _FPU_DEFAULT  0x00000000
 typedef unsigned int fpu_control_t;
-#define _FPU_GETCW(cw) 0
-#define _FPU_SETCW(cw) do { } while (0)
+#define _FPU_GETCW(cw) (cw) = 0
+#define _FPU_SETCW(cw) (void) (cw)
 extern fpu_control_t __fpu_control;
 
 #else /* __mips_soft_float */