Update.

2004-03-09  Richard Henderson  <rth@redhat.com>

	* math/math.h (isgreater, isgreaterequal, isless, islessequal,
	islessgreater, isunordered): Use builtins if available.
	* sysdeps/i386/fpu/bits/mathinline.h: Don't define via builtins.
	* sysdeps/m68k/fpu/bits/mathinline.h: Likewise.
	* sysdeps/powerpc/fpu/bits/mathinline.h: Likewise.
	* sysdeps/sparc/fpu/bits/mathinline.h: Likewise.
	* sysdeps/x86_64/fpu/bits/mathinline.h: Likewise.
	* sysdeps/alpha/fpu/bits/mathinline.h (isgreater, isgreaterequal,
	isless, islessequal, islessgreater): Remove; use default.
	(isunordered): Convert inputs to double.

diff --git a/ChangeLog b/ChangeLog
index bff1807f798ecffb3a38012d25e867896a0b5195..5a4a6fc0088c3f08b780c717e4c53dcc3ca30643 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-09  Richard Henderson  <rth@redhat.com>
+
+       * math/math.h (isgreater, isgreaterequal, isless, islessequal,
+       islessgreater, isunordered): Use builtins if available.
+       * sysdeps/i386/fpu/bits/mathinline.h: Don't define via builtins.
+       * sysdeps/m68k/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/powerpc/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/sparc/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/x86_64/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/alpha/fpu/bits/mathinline.h (isgreater, isgreaterequal,
+       isless, islessequal, islessgreater): Remove; use default.
+       (isunordered): Convert inputs to double.
+
 2004-02-09  Jakub Jelinek  <jakub@redhat.com>
 
        * posix/Makefile (tests): Add tst-vfork2.

diff --git a/math/math.h b/math/math.h
index 7d311462d906001d92b6ab8b6f372bc04393b89a..9161412f984778793c5ffd426e3f478b10aeb80a 100644 (file)
--- a/math/math.h
+++ b/math/math.h
@@ -357,18 +357,28 @@ extern int matherr (struct exception *__exc);
 # define __NO_MATH_INLINES     1
 #endif
 
+#if __USE_ISOC99 && __GNUC_PREREQ(2,97)
+/* ISO C99 defines some macros to compare number while taking care for
+   unordered numbers.  Many FPUs provide special instructions to support
+   these operations.  Generic support in GCC for these as builtins went
+   in before 3.0.0, but not all cpus added their patterns.  We define
+   versions that use the builtins here, and <bits/mathinline.h> will
+   undef/redefine as appropriate for the specific GCC version in use.  */
+# define isgreater(x, y)       __builtin_isgreater(x, y)
+# define isgreaterequal(x, y)  __builtin_isgreaterequal(x, y)
+# define isless(x, y)          __builtin_isless(x, y)
+# define islessequal(x, y)     __builtin_islessequal(x, y)
+# define islessgreater(x, y)   __builtin_islessgreater(x, y)
+# define isunordered(u, v)     __builtin_isunordered(u, v)
+#endif
+
 /* Get machine-dependent inline versions (if there are any).  */
 #ifdef __USE_EXTERN_INLINES
 # include <bits/mathinline.h>
 #endif
 
-
 #if __USE_ISOC99
-/* ISO C99 defines some macros to compare number while taking care
-   for unordered numbers.  Since many FPUs provide special
-   instructions to support these operations and these tests are
-   defined in <bits/mathinline.h>, we define the generic macros at
-   this late point and only if they are not defined yet.  */
+/* If we've still got undefined comparison macros, provide defaults.  */
 
 /* Return nonzero value if X is greater than Y.  */
 # ifndef isgreater

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1ea68cfcc745e08e9c9553f69e19e0b896b59820..650a1662f2faff9b93abc06cd9edd071c8f56059 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-09  Richard Henderson  <rth@redhat.com>
+
+       * math/math.h (isgreater, isgreaterequal, isless, islessequal,
+       islessgreater, isunordered): Use builtins if available.
+       * sysdeps/i386/fpu/bits/mathinline.h: Don't define via builtins.
+       * sysdeps/m68k/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/powerpc/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/sparc/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/x86_64/fpu/bits/mathinline.h: Likewise.
+       * sysdeps/alpha/fpu/bits/mathinline.h (isgreater, isgreaterequal,
+       isless, islessequal, islessgreater): Remove; use default.
+       (isunordered): Convert inputs to double.
+
 2004-02-09  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/vfork.S (SAVE_PID): Negate PID

diff --git a/nptl/tst-cancel20.c b/nptl/tst-cancel20.c
index 8155c0e9fadef2dd0197b442f0a7f2ea938855ca..d88cb9caf85323fa491a74dd4e471d1f40103b33 100644 (file)
--- a/nptl/tst-cancel20.c
+++ b/nptl/tst-cancel20.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -105,6 +105,7 @@ tf (void *arg)
 static int
 do_one_test (void)
 {
+  in_sh_body = 0;
   cleanups = 0;
   if (pipe (fd) != 0 || pipe (fd + 2) != 0)
     {

diff --git a/nptl/tst-cancel21.c b/nptl/tst-cancel21.c
index c40d87b84bdf564ed5155c5c14d6b0e763fcacb0..cc00cc1683207e3e383119e660a618a26f77110a 100644 (file)
--- a/nptl/tst-cancel21.c
+++ b/nptl/tst-cancel21.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
@@ -162,6 +162,8 @@ tf (void *arg)
 static int
 do_one_test (void)
 {
+  in_sh_body = 0;
+
   pid_t pid = fork ();
 
   if (pid == -1)

diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 8141485b47c2060864d31211dfed8b4a3101d0f4..0ba79f989554c02584f94242a738cd9c71e080f1 100644 (file)
--- a/sysdeps/alpha/fpu/bits/mathinline.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
@@ -28,34 +28,19 @@
 # define __MATH_INLINE extern __inline
 #endif
 
-#ifdef __USE_ISOC99
-# define isunordered(x, y)                             \
+#if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0)
+# undef isgreater
+# undef isgreaterequal
+# undef isless
+# undef islessequal
+# undef islessgreater
+# undef isunordered
+# define isunordered(u, v)                             \
   (__extension__                                       \
-   ({ double __r;                                      \
+   ({ double __r, __u = (u), __v = (v);                        \
       __asm ("cmptun/su %1,%2,%0\n\ttrapb"             \
-            : "=&f" (__r) : "f" (x), "f"(y));          \
+            : "=&f" (__r) : "f" (__u), "f"(__v));      \
       __r != 0; }))
-
-# define isgreater(x, y)                               \
-  (__extension__                                       \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);        \
-      !isunordered(__x, __y) && __x > __y; }))
-# define isgreaterequal(x, y)                          \
-  (__extension__                                       \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);        \
-      !isunordered(__x, __y) && __x >= __y; }))
-# define isless(x, y)                                  \
-  (__extension__                                       \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);        \
-      !isunordered(__x, __y) && __x < __y; }))
-# define islessequal(x, y)                             \
-  (__extension__                                       \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);        \
-      !isunordered(__x, __y) && __x <= __y; }))
-# define islessgreater(x, y)                           \
-  (__extension__                                       \
-   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);        \
-      !isunordered(__x, __y) && __x != __y; }))
 #endif /* ISO C99 */
 
 #if (!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \

diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index ab3b54def5368841f0519745e0cbdda29e94973e..85d48a5c90b4672729274e2a3e6ce4af10fb37a4 100644 (file)
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -30,19 +30,18 @@
 
 
 #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2
-# if __GNUC_PREREQ (2,97)
 /* GCC 2.97 and up have builtins that actually can be used.  */
-#  define isgreater(x, y) __builtin_isgreater (x, y)
-#  define isgreaterequal(x, y) __builtin_isgreaterequal (x, y)
-#  define isless(x, y) __builtin_isless (x, y)
-#  define islessequal(x, y) __builtin_islessequal (x, y)
-#  define islessgreater(x, y) __builtin_islessgreater (x, y)
-#  define isunordered(x, y) __builtin_isunordered (x, y)
-# else
+# if !__GNUC_PREREQ (2,97)
 /* ISO C99 defines some macros to perform unordered comparisons.  The
    ix87 FPU supports this with special opcodes and we should use them.
    These must not be inline functions since we have to be able to handle
    all floating-point types.  */
+#  undef isgreater
+#  undef isgreaterequal
+#  undef isless
+#  undef islessequal
+#  undef islessgreater
+#  undef isunordered
 #  ifdef __i686__
 /* For the PentiumPro and more recent processors we can provide
    better code.  */

diff --git a/sysdeps/m68k/fpu/bits/mathinline.h b/sysdeps/m68k/fpu/bits/mathinline.h
index ec00b4b71147551862d8ef1e316de66fd8df978a..1e43e43047009cee6c8fa2f08de4df4eab51101a 100644 (file)
--- a/sysdeps/m68k/fpu/bits/mathinline.h
+++ b/sysdeps/m68k/fpu/bits/mathinline.h
@@ -21,20 +21,18 @@
 #ifdef __GNUC__
 
 #ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ (3,1)
 /* GCC 3.1 and up have builtins that actually can be used.  */
-#  define isgreater(x, y) __builtin_isgreater (x, y)
-#  define isgreaterequal(x, y) __builtin_isgreaterequal (x, y)
-#  define isless(x, y) __builtin_isless (x, y)
-#  define islessequal(x, y) __builtin_islessequal (x, y)
-#  define islessgreater(x, y) __builtin_islessgreater (x, y)
-#  define isunordered(x, y) __builtin_isunordered (x, y)
-# else
+# if !__GNUC_PREREQ (3,1)
 /* ISO C99 defines some macros to perform unordered comparisons.  The
    m68k FPU supports this with special opcodes and we should use them.
    These must not be inline functions since we have to be able to handle
    all floating-point types.  */
+#  undef isgreater
+#  undef isgreaterequal
+#  undef isless
+#  undef islessequal
+#  undef islessgreater
+#  undef isunordered
 #  define isgreater(x, y)                                      \
    __extension__                                       \
    ({ char __result;                                   \

diff --git a/sysdeps/powerpc/fpu/bits/mathinline.h b/sysdeps/powerpc/fpu/bits/mathinline.h
index dcd506d49e61d77d7eb2867259a894495344739c..01956d9ee8068cbe1b677c80d3f754be9d39737b 100644 (file)
--- a/sysdeps/powerpc/fpu/bits/mathinline.h
+++ b/sysdeps/powerpc/fpu/bits/mathinline.h
@@ -21,17 +21,7 @@
 #if defined __GNUC__ && !defined _SOFT_FLOAT
 
 #ifdef __USE_ISOC99
-# if __GNUC_PREREQ (2,96)
-
-#  define isgreater(x, y) __builtin_isgreater (x, y)
-#  define isgreaterequal(x, y) __builtin_isgreaterequal (x, y)
-#  define isless(x, y) __builtin_isless (x, y)
-#  define islessequal(x, y) __builtin_islessequal (x, y)
-#  define islessgreater(x, y) __builtin_islessgreater (x, y)
-#  define isunordered(x, y) __builtin_isunordered (x, y)
-
-# else
-
+# if !__GNUC_PREREQ (2,97)
 #  define __unordered_cmp(x, y) \
   (__extension__                                                             \
    ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);                              \
@@ -40,6 +30,13 @@
               : "cr7");  \
       __r; }))
 
+#  undef isgreater
+#  undef isgreaterequal
+#  undef isless
+#  undef islessequal
+#  undef islessgreater
+#  undef isunordered
+
 #  define isgreater(x, y) (__unordered_cmp (x, y) >> 2 & 1)
 #  define isgreaterequal(x, y) ((__unordered_cmp (x, y) & 6) != 0)
 #  define isless(x, y) (__unordered_cmp (x, y) >> 3 & 1)

diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h
index 81c2539b6bffdaf788ee8fbc192bf7ba04ad1076..734ff0590d11c06a04999f704307adbbf7b1aaa6 100644 (file)
--- a/sysdeps/sparc/fpu/bits/mathinline.h
+++ b/sysdeps/sparc/fpu/bits/mathinline.h
@@ -24,9 +24,13 @@
 
 #include <bits/wordsize.h>
 
-#ifdef __GNUC__
-
-#ifdef __USE_ISOC99
+#if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0)
+# undef isgreater
+# undef isgreaterequal
+# undef isless
+# undef islessequal
+# undef islessgreater
+# undef isunordered
 
 # if __WORDSIZE == 32
 

diff --git a/sysdeps/x86_64/fpu/bits/mathinline.h b/sysdeps/x86_64/fpu/bits/mathinline.h
index c77412d28d680ab1d9d0d8d55d9882efd6cd8cba..3f61ff5e928d940c25a3cfd4c15392b7fa1ae7e5 100644 (file)
--- a/sysdeps/x86_64/fpu/bits/mathinline.h
+++ b/sysdeps/x86_64/fpu/bits/mathinline.h
@@ -30,14 +30,6 @@
 
 
 #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2
-/* GCC has builtins that can be used.  */
-# define isgreater(x, y) __builtin_isgreater (x, y)
-# define isgreaterequal(x, y) __builtin_isgreaterequal (x, y)
-# define isless(x, y) __builtin_isless (x, y)
-# define islessequal(x, y) __builtin_islessequal (x, y)
-# define islessgreater(x, y) __builtin_islessgreater (x, y)
-# define isunordered(x, y) __builtin_isunordered (x, y)
-
 
 /* Test for negative number.  Used in the signbit() macro.  */
 __MATH_INLINE int