Make fenv.h FE_* macros usable in #if (bug 3439).

git-mirror · Nov 3, 2012 · fbeafed · fbeafed
1 parent 0244426
commit fbeafed
Show file tree

Hide file tree

Showing 23 changed files with 535 additions and 247 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,61 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/powerpc/bits/fenv.h (FE_INEXACT): Define macro to
+	integer constant usable in #if and use that to give value to enum
+	constant.
+	(FE_DIVBYZERO): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_INVALID_SNAN): Likewise.
+	(FE_INVALID_ISI): Likewise.
+	(FE_INVALID_IDI): Likewise.
+	(FE_INVALID_ZDZ): Likewise.
+	(FE_INVALID_IMZ): Likewise.
+	(FE_INVALID_COMPARE): Likewise.
+	(FE_INVALID_SOFTWARE): Likewise.
+	(FE_INVALID_SQRT): Likewise.
+	(FE_INVALID_INTEGER_CONVERSION): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+	* sysdeps/s390/fpu/bits/fenv.h (FE_INVALID): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_INEXACT): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	* sysdeps/sh/sh4/fpu/bits/fenv.h (FE_INEXACT): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	* sysdeps/sparc/fpu/bits/fenv.h (FE_INVALID): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_INEXACT): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+	* sysdeps/x86/fpu/bits/fenv.h (FE_INVALID): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_INEXACT): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_TOWARDZERO): Likewise.
+
 2012-11-02  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* elf/elf.h (R_TILEGX_IMM16_X[01]_HW[012]_(|LAST_)PLT_PCREL): Add.

diff --git a/NEWS b/NEWS
@@ -9,15 +9,16 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014, 10038,
-  10631, 11438, 11607, 12140, 13412, 13542, 13601, 13629, 13679, 13696,
-  13717, 13741, 13939, 13966, 14042, 14047, 14090, 14150, 14151, 14152,
-  14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252, 14283, 14298,
-  14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14376, 14417,
-  14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14530, 14532,
-  14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583,
-  14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660,
-  14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785.
+  1349, 3439, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014,
+  10038, 10631, 11438, 11607, 12140, 13412, 13542, 13601, 13629, 13679,
+  13696, 13717, 13741, 13939, 13966, 14042, 14047, 14090, 14150, 14151,
+  14152, 14154, 14157, 14166, 14173, 14195, 14237, 14251, 14252, 14283,
+  14298, 14303, 14307, 14328, 14331, 14336, 14337, 14347, 14349, 14376,
+  14417, 14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14530,
+  14532, 14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579,
+  14583, 14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652,
+  14660, 14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14784,
+  14785.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
@@ -1,3 +1,20 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/alpha/fpu/bits/fenv.h (FE_DENORMAL): Define macro to
+	integer constant usable in #if and use that to give value to enum
+	constant.
+	(FE_INEXACT): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_ALL_EXCEPT): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_UPWARD): Likewise.
+
 2012-11-01  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Remove all

diff --git a/ports/ChangeLog.am33 b/ports/ChangeLog.am33
@@ -1,3 +1,15 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/am33/fpu/bits/fenv.h (FE_INEXACT): Define macro to
+	integer constant usable in #if and use that to give value to enum
+	constant.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_TONEAREST): Likewise.
+
 2012-10-30  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14047]

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
@@ -1,3 +1,18 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/arm/bits/fenv.h (FE_INVALID): Define macro to integer
+	constant usable in #if and use that to give value to enum
+	constant.
+	(FE_DIVBYZERO): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_INEXACT): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_TOWARDZERO): Likewise.
+
 2012-10-22  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/unix/sysv/linux/arm/nptl/libc.abilist

diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
@@ -1,3 +1,18 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/hppa/fpu/bits/fenv.h (FE_INVALID): Define macro to
+	integer constant usable in #if and use that to give value to enum
+	constant.
+	(FE_DIVBYZERO): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_INEXACT): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+
 2012-10-30  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14047]

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
@@ -1,3 +1,20 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/ia64/bits/fenv.h (FE_INEXACT): Define macro to integer
+	constant usable in #if and use that to give value to enum
+	constant.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_UNNORMAL): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_ALL_EXCEPT): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_TONEAREST): Likewise.
+
 2012-10-30  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14047]

diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
@@ -1,3 +1,18 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/m68k/fpu/bits/fenv.h (FE_INEXACT): Define macro to
+	integer constant usable in #if and use that to give value to enum
+	constant.
+	(FE_DIVBYZERO): Likewise.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_DOWNWARD): Likewise.
+	(FE_UPWARD): Likewise.
+
 2012-10-25  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Remove all

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
@@ -1,3 +1,18 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/mips/bits/fenv.h (FE_INEXACT): Define macro to integer
+	constant usable in #if and use that to give value to enum
+	constant.
+	(FE_UNDERFLOW): Likewise.
+	(FE_OVERFLOW): Likewise.
+	(FE_DIVBYZERO): Likewise.
+	(FE_INVALID): Likewise.
+	(FE_TONEAREST): Likewise.
+	(FE_TOWARDZERO): Likewise.
+	(FE_UPWARD): Likewise.
+	(FE_DOWNWARD): Likewise.
+
 2012-11-01  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/mips/configure: Regenerate.

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
@@ -1,3 +1,10 @@
+2012-11-03  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #3439]
+	* sysdeps/tile/bits/fenv.h (FE_TONEAREST): Define macro to integer
+	constant usable in #if and use that to give value to enum
+	constant.
+
 2012-11-03  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* sysdeps/tile/libm-test-ulps: Account for new tests.

diff --git a/ports/sysdeps/alpha/fpu/bits/fenv.h b/ports/sysdeps/alpha/fpu/bits/fenv.h
@@ -36,27 +36,34 @@
 enum
   {
 #ifdef __USE_GNU
-    FE_DENORMAL =	1UL << 22,
-#define FE_DENORMAL	FE_DENORMAL
+    FE_DENORMAL =
+#define FE_DENORMAL	(1 << 22)
+      FE_DENORMAL,
 #endif
 
-    FE_INEXACT =	1UL << 21,
-#define FE_INEXACT	FE_INEXACT
+    FE_INEXACT =
+#define FE_INEXACT	(1 << 21)
+      FE_INEXACT,
 
-    FE_UNDERFLOW =	1UL << 20,
-#define FE_UNDERFLOW	FE_UNDERFLOW
+    FE_UNDERFLOW =
+#define FE_UNDERFLOW	(1 << 20)
+      FE_UNDERFLOW,
 
-    FE_OVERFLOW =	1UL << 19,
-#define FE_OVERFLOW	FE_OVERFLOW
+    FE_OVERFLOW =
+#define FE_OVERFLOW	(1 << 19)
+      FE_OVERFLOW,
 
-    FE_DIVBYZERO =	1UL << 18,
-#define FE_DIVBYZERO	FE_DIVBYZERO
+    FE_DIVBYZERO =
+#define FE_DIVBYZERO	(1 << 18)
+      FE_DIVBYZERO,
 
-    FE_INVALID =	1UL << 17,
-#define FE_INVALID	FE_INVALID
+    FE_INVALID =
+#define FE_INVALID	(1 << 17)
+      FE_INVALID,
 
-    FE_ALL_EXCEPT =	0x3f << 17
-#define FE_ALL_EXCEPT	FE_ALL_EXCEPT
+    FE_ALL_EXCEPT =
+#define FE_ALL_EXCEPT	(0x3f << 17)
+      FE_ALL_EXCEPT
   };
 
 /* Alpha chips support all four defined rouding modes.
@@ -70,17 +77,21 @@ enum
 
 enum
   {
-    FE_TOWARDZERO =	0,
-#define FE_TOWARDZERO	FE_TOWARDZERO
+    FE_TOWARDZERO =
+#define FE_TOWARDZERO	0
+      FE_TOWARDZERO,
 
-    FE_DOWNWARD = 	1,
-#define FE_DOWNWARD	FE_DOWNWARD
+    FE_DOWNWARD =
+#define FE_DOWNWARD	1
+      FE_DOWNWARD,
 
-    FE_TONEAREST =	2,
-#define FE_TONEAREST	FE_TONEAREST
+    FE_TONEAREST =
+#define FE_TONEAREST	2
+      FE_TONEAREST,
 
-    FE_UPWARD =		3,
-#define FE_UPWARD	FE_UPWARD
+    FE_UPWARD =
+#define FE_UPWARD	3
+      FE_UPWARD,
   };
 
 #ifdef __USE_GNU

diff --git a/ports/sysdeps/am33/fpu/bits/fenv.h b/ports/sysdeps/am33/fpu/bits/fenv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Alexandre Oliva <aoliva@redhat.com>
    based on the corresponding file in the mips port.
@@ -26,16 +26,21 @@
    positions of the appropriate bits in the FPCR register.  */
 enum
   {
-    FE_INEXACT = 0x01,
-#define FE_INEXACT	FE_INEXACT
-    FE_UNDERFLOW = 0x02,
-#define FE_UNDERFLOW	FE_UNDERFLOW
-    FE_OVERFLOW = 0x04,
-#define FE_OVERFLOW	FE_OVERFLOW
-    FE_DIVBYZERO = 0x08,
-#define FE_DIVBYZERO	FE_DIVBYZERO
-    FE_INVALID = 0x10,
-#define FE_INVALID	FE_INVALID
+    FE_INEXACT =
+#define FE_INEXACT	0x01
+      FE_INEXACT,
+    FE_UNDERFLOW =
+#define FE_UNDERFLOW	0x02
+      FE_UNDERFLOW,
+    FE_OVERFLOW =
+#define FE_OVERFLOW	0x04
+      FE_OVERFLOW,
+    FE_DIVBYZERO =
+#define FE_DIVBYZERO	0x08
+      FE_DIVBYZERO,
+    FE_INVALID =
+#define FE_INVALID	0x10
+      FE_INVALID,
   };
 
 #define FE_ALL_EXCEPT \
@@ -45,8 +50,9 @@ enum
    reserved to represent other rounding modes.  */
 enum
   {
-    FE_TONEAREST = 0x00000,
-#define FE_TONEAREST	FE_TONEAREST
+    FE_TONEAREST =
+#define FE_TONEAREST	0x00000
+      FE_TONEAREST,
   };