picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update. 

2000-08-25  Ulrich Drepper  <drepper@redhat.com>

	* elf/Makefile (LDFLAGS-nodelete): Add -rdynamic.
	* elf/nodelete.c (fini_ran): New global variable.
	(do_test): Before every dlclose call clear fini_ran and test
	afterwards that it is not set by the destructors.
	* elf/nodelmod1.c: Add destructor which sets fini_ran.
	* elf/nodelmod2.c: Likewise.
	* elf/nodelmod4.c: Likewise.
This commit is contained in:
Ulrich Drepper 2000-08-25 19:33:19 +00:00
parent bb8d0fd5b1
commit ad7534c8f0
9 changed files with 114 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2000-08-25 Ulrich Drepper <drepper@redhat.com>
* elf/Makefile (LDFLAGS-nodelete): Add -rdynamic.
* elf/nodelete.c (fini_ran): New global variable.
(do_test): Before every dlclose call clear fini_ran and test
afterwards that it is not set by the destructors.
* elf/nodelmod1.c: Add destructor which sets fini_ran.
* elf/nodelmod2.c: Likewise.
* elf/nodelmod4.c: Likewise.
2000-08-21 Jes Sorensen <jes@linuxcare.com>
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Add getrlimit and

1
elf/Makefile
View File

@ -302,6 +302,7 @@ $(objpfx)noload: $(objpfx)testobj1.so
LDFLAGS-noload = -rdynamic
$(objpfx)noload.out: $(objpfx)testobj5.so
LDFLAGS-nodelete = -rdynamic
LDFLAGS-nodelmod1.so = -Wl,--enable-new-dtags,-z,nodelete
LDFLAGS-nodelmod4.so = -Wl,--enable-new-dtags,-z,nodelete
$(objpfx)nodelete: $(libdl)

21
elf/nodelete.c
View File

@ -7,6 +7,9 @@
static sigjmp_buf jmpbuf;
int fini_ran;
static void
handler (int sig)
{
@ -60,6 +63,7 @@ do_test (void)
*varp = 20000720;
/* Now close the object. */
fini_ran = 0;
if (dlclose (p) != 0)
{
puts ("failed to close \"nodelmod1.so\"");
@ -73,6 +77,11 @@ do_test (void)
puts ("\"var1\" value not correct");
result = 1;
}
else if (fini_ran != 0)
{
puts ("destructor of \"nodelmod1.so\" ran");
result = 1;
}
else
puts ("-z nodelete test succeeded");
}
@ -108,6 +117,7 @@ do_test (void)
*varp = 42;
/* Now close the object. */
fini_ran = 0;
if (dlclose (p) != 0)
{
puts ("failed to close \"nodelmod2.so\"");
@ -121,6 +131,11 @@ do_test (void)
puts ("\"var2\" value not correct");
result = 1;
}
else if (fini_ran != 0)
{
puts ("destructor of \"nodelmod2.so\" ran");
result = 1;
}
else
puts ("RTLD_NODELETE test succeeded");
}
@ -158,6 +173,7 @@ do_test (void)
*varp = -1;
/* Now close the object. */
fini_ran = 0;
if (dlclose (p) != 0)
{
puts ("failed to close \"nodelmod3.so\"");
@ -171,6 +187,11 @@ do_test (void)
puts ("\"var_in_mod4\" value not correct");
result = 1;
}
else if (fini_ran != 0)
{
puts ("destructor of \"nodelmod4.so\" ran");
result = 1;
}
else
puts ("-z nodelete in dependency succeeded");
}

8
elf/nodelmod1.c
View File

@ -1 +1,9 @@
int var1 = 42;
static void
__attribute__ ((__destructor__))
destr (void)
{
extern int fini_ran;
fini_ran = 1;
}

8
elf/nodelmod2.c
View File

@ -1 +1,9 @@
int var2 = 100;
static void
__attribute__ ((__destructor__))
destr (void)
{
extern int fini_ran;
fini_ran = 1;
}

8
elf/nodelmod4.c
View File

@ -1 +1,9 @@
int var_in_mod4 = 99;
static void
__attribute__ ((__destructor__))
destr (void)
{
extern int fini_ran;
fini_ran = 1;
}

5
linuxthreads/ChangeLog
View File

@ -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.

10
linuxthreads/Makefile
View File

@ -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

45
linuxthreads/unload.c Normal file
View File

@ -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);
}