Glibc nptl "make check" failed on i686

[H. J. Lu]

On Sat, May 10, 2003 at 08:21:07AM -0700, H. J. Lu wrote:
> With the latest binutils from CVS, I got
> 
> make[4]: *** [/export/build/gnu/glibc-nptl/build-i686-linux/elf/tst-tls2-static.out] Error 1
> make[4]: *** [/export/build/gnu/glibc-nptl/build-i686-linux/elf/tst-tls1-static.out] Error 1
> make[3]: *** [elf/xtests] Error 2
> make[2]: *** [xcheck] Error 2
> make[1]: *** [check] Error 2
> make: *** [one] Error 2
> 
> in my nptl build on i686. The only difference between the last good
> one and the current bad one is
> 
> +2003-05-09  Ulrich Drepper  <drepper@redhat.com>
> +
> +       * sysdeps/unix/sysv/linux/x86_64/get_clockfreq.c: New file.
> +
> +2003-05-08  Ulrich Drepper  <drepper@redhat.com>
> +
> +       * malloc/thread-m.h: Remove special handling of thread_atfork if
> +       HAVE_register_atfork_malloc is defined.
> +
> 

Ulrich, I have verified that your patch enclosed here caused the
"make check" failure on glibc + nptl. Has it been fixed?


H.J.
-------------- next part --------------
2003-05-08  Ulrich Drepper  <drepper@redhat.com>

	* malloc/thread-m.h: Remove special handling of thread_atfork if
	HAVE_register_atfork_malloc is defined.

diff -upr -x CVS libc/malloc/thread-m.h libc.bad/malloc/thread-m.h
--- libc/malloc/thread-m.h	2003-05-09 09:20:27.000000000 -0700
+++ libc.bad/malloc/thread-m.h	2003-05-09 08:22:25.000000000 -0700
@@ -77,24 +77,13 @@ extern void *__dso_handle __attribute__ 
 
 #include <fork.h>
 
-#ifdef HAVE_register_atfork_malloc
-# ifdef SHARED
-#  define thread_atfork(prepare, parent, child) \
-   __register_atfork_malloc (prepare, parent, child, __dso_handle)
-# else
-#  define thread_atfork(prepare, parent, child) \
-   __register_atfork_malloc (prepare, parent, child,			      \
-			     &__dso_handle == NULL ? NULL : __dso_handle)
-# endif
-#else
-# ifdef SHARED
-#  define thread_atfork(prepare, parent, child) \
+#ifdef SHARED
+# define thread_atfork(prepare, parent, child) \
    __register_atfork (prepare, parent, child, __dso_handle)
-# else
-#  define thread_atfork(prepare, parent, child) \
+#else
+# define thread_atfork(prepare, parent, child) \
    __register_atfork (prepare, parent, child,				      \
 		      &__dso_handle == NULL ? NULL : __dso_handle)
-# endif
 #endif
 
 #elif defined(MUTEX_INITIALIZER)