diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 3 | ||||
| -rw-r--r-- | linuxthreads/unload.c | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 71b00fa..6b185a0 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2002-10-17 Roland McGrath <roland@redhat.com> + + * Makefile (unload): Don't link in libpthread.so. + ($(objpfx)unload.out): Do depend on it. + * unload.c (main): Improve error reporting. + 2002-10-09 Roland McGrath <roland@redhat.com> * sysdeps/pthread/bits/libc-lock.h (__libc_maybe_call): New macro. diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 230c75f..772c691 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -98,10 +98,11 @@ $(objpfx)libpthread.so: $(common-objpfx)libc.so \ # Make sure we link with the thread library. ifeq ($(build-shared),yes) $(addprefix $(objpfx), \ - $(filter-out $(tests-static), \ + $(filter-out $(tests-static) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so +$(objpfx)unload.out: $(objpfx)libpthread.so else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a diff --git a/linuxthreads/unload.c b/linuxthreads/unload.c index ca94919..234d27f 100644 --- a/linuxthreads/unload.c +++ b/linuxthreads/unload.c @@ -1,5 +1,5 @@ /* Tests for non-unloading of libpthread. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. The GNU C Library is free software; you can redistribute it and/or @@ -29,13 +29,13 @@ main (void) if (p == NULL) { - puts ("failed to load " LIBPTHREAD_SO); + printf ("failed to load %s: %s\n", LIBPTHREAD_SO, dlerror ()); exit (1); } if (dlclose (p) != 0) { - puts ("dlclose (" LIBPTHREAD_SO ") failed"); + printf ("dlclose (%s) failed: %s\n", LIBPTHREAD_SO, dlerror ()); exit (1); } |