2002-08-21 Roland McGrath <roland@redhat.com>

* dlfcn/bug-dlsym1.c: New file.
	* dlfcn/bug-dlsym1-lib1.c, dlfcn/bug-dlsym1-lib2.c: New files.
	* dlfcn/Makefile (distribute): Add them.
	(tests): Add bug-dlsym1 here.
	(modules-names): Add bug-dlsym1-lib1 and bug-dlsym1-lib2 here.
	($(objpfx)bug-dlsym1, $(objpfx)bug-dlsym1.out): New targets.
	($(objpfx)bug-dlsym1-lib1.so, $(objpfx)bug-dlsym1-lib2.so): Likewise.
This commit is contained in:
Roland McGrath 2002-08-21 23:03:46 +00:00
parent 01d8e36dd9
commit c3fd12a239
4 changed files with 59 additions and 3 deletions

View File

@ -22,7 +22,8 @@ extra-libs := libdl
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr eval libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr eval
distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \ distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \
defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \ defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \
modcxaatexit.c modstatic.c modcxaatexit.c modstatic.c \
bug-dlsym1-lib1.c bug-dlsym1-lib2.c
extra-libs-others := libdl extra-libs-others := libdl
@ -35,13 +36,15 @@ endif
libdl-shared-only-routines += eval libdl-shared-only-routines += eval
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit bug-dlopen1 tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
bug-dlopen1 bug-dlsym1
ifeq (yes,$(have-protected)) ifeq (yes,$(have-protected))
tests += tstatexit tests += tstatexit
endif endif
endif endif
modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \ modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \
errmsg1mod modatexit modcxaatexit errmsg1mod modatexit modcxaatexit \
bug-dlsym1-lib1 bug-dlsym1-lib2
ifeq (yesyesyes,$(build-static)$(build-shared)$(elf)) ifeq (yesyesyes,$(build-static)$(build-shared)$(elf))
tests += tststatic tests += tststatic
@ -96,6 +99,17 @@ $(objpfx)modstatic.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
$(objpfx)bug-dlopen1: $(libdl) $(objpfx)bug-dlopen1: $(libdl)
$(objpfx)bug-dlsym1: $(libdl) $(objpfx)bug-dlsym1-lib2.so
$(objpfx)bug-dlsym1.out: $(objpfx)bug-dlsym1-lib1.so \
$(objpfx)bug-dlsym1-lib2.so
$(objpfx)bug-dlsym1-lib1.so: $(objpfx)bug-dlsym1-lib2.so \
$(common-objpfx)libc.so \
$(common-objpfx)libc_nonshared.a
$(objpfx)bug-dlsym1-lib2.so: $(common-objpfx)libc.so \
$(common-objpfx)libc_nonshared.a
# Depend on libc.so so a DT_NEEDED is generated in the shared objects. # 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 # This ensures they will load libc.so for needed symbols if loaded by
# a statically-linked program that hasn't already loaded it. # a statically-linked program that hasn't already loaded it.

9
dlfcn/bug-dlsym1-lib1.c Normal file
View File

@ -0,0 +1,9 @@
/* Test module for bug-dlsym1.c test case. */
extern int dlopen_test_variable;
/* here to get the unresolved symbol in our .so */
char foo()
{
return dlopen_test_variable;
}

3
dlfcn/bug-dlsym1-lib2.c Normal file
View File

@ -0,0 +1,3 @@
/* Test module for bug-dlsym1.c test case. */
char dlopen_test_variable;

30
dlfcn/bug-dlsym1.c Normal file
View File

@ -0,0 +1,30 @@
/* Test case for bug in dlsym accessing dependency objects' symbols. */
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <dlfcn.h>
int main(void)
{
void *handle;
char *c;
setenv ("LD_LIBRARY_PATH", "/home/roland/build/tls-libc/dlfcn", 1);
/* open lib1.so, which has the unresolved test symbol and a DT_NEEDED
on lib2.so, which provides the symbol */
if ((handle = dlopen("bug-dlsym1-lib1.so", RTLD_NOW)) == NULL) {
printf("dlopen(\"bug-dlsym1-lib1.so\"): %s\n", dlerror());
abort();
}
if ((c = dlsym(handle, "dlopen_test_variable")) == NULL) {
printf("dlsym(handle, \"dlopen_test_variable\"): %s\n", dlerror());
abort();
}
(void) dlclose(handle);
return 0;
}