diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 10 | ||||
| -rw-r--r-- | linuxthreads/unload.c | 45 |
3 files changed, 58 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 7b3e50e7f6..0a2339948a 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,6 +1,9 @@ 2000-08-25 Ulrich Drepper <drepper@redhat.com> - * pthread.c (pthread_exit_process): Move thread_self us inside `if'. + * Makefile: Add rules to build and run unload. + * unload.c: New file. + + * pthread.c (pthread_exit_process): Move thread_self use inside `if'. * sysdeps/pthread/pthread.h (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP): Defined. diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 9ef66f9247..104a3acda1 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -42,9 +42,15 @@ LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete)) vpath %.c Examples +include ../Makeconfig + librt-tests = ex10 ex11 tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \ - tststack + tststack $(tests-nodelete-$(have-z-nodelete)) + +ifeq (yes,$(build-shared)) +tests-nodelete-yes = unload +endif include ../Rules @@ -53,6 +59,7 @@ CFLAGS-specific.c += -D__NO_WEAK_PTHREAD_ALIASES CFLAGS-pthread.c += -D__NO_WEAK_PTHREAD_ALIASES CFLAGS-ptfork.c += -D__NO_WEAK_PTHREAD_ALIASES CFLAGS-cancel.c += -D__NO_WEAK_PTHREAD_ALIASES +CFLAGS-unload.c += -DPREFIX=\"$(objpfx)\" # Depend on libc.so so a DT_NEEDED is generated in the shared objects. # This ensures they will load libc.so for needed symbols if loaded by @@ -63,6 +70,7 @@ $(objpfx)libpthread.so: $(common-objpfx)libc.so ifeq ($(build-shared),yes) $(addprefix $(objpfx),$(tests)): $(objpfx)libpthread.so $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so +$(objpfx)unload: $(common-objpfx)dlfcn/libdl.so else $(addprefix $(objpfx),$(tests)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a diff --git a/linuxthreads/unload.c b/linuxthreads/unload.c new file mode 100644 index 0000000000..c528df234f --- /dev/null +++ b/linuxthreads/unload.c @@ -0,0 +1,45 @@ +/* Tests for non-unloading of libpthread. + Copyright (C) 2000 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> +#include <gnu/lib-names.h> + +int +main (void) +{ + void *p = dlopen (PREFIX LIBPTHREAD_SO, RTLD_LAZY); + + if (p == NULL) + { + puts ("failed to load " LIBPTHREAD_SO); + exit (1); + } + + if (dlclose (p) != 0) + { + puts ("dlclose (" LIBPTHREAD_SO ") failed"); + exit (1); + } + + puts ("seems to work"); + + exit (0); +} |