diff options
Diffstat (limited to 'dlfcn')
| -rw-r--r-- | dlfcn/Makefile | 15 | ||||
| -rw-r--r-- | dlfcn/modstatic.c | 5 | ||||
| -rw-r--r-- | dlfcn/tststatic.c | 35 |
3 files changed, 54 insertions, 1 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile index b3b554ea0b..e8d9ccb35d 100644 --- a/dlfcn/Makefile +++ b/dlfcn/Makefile @@ -22,7 +22,7 @@ extra-libs := libdl libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr eval distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \ defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \ - modcxaatexit.c + modcxaatexit.c modstatic.c extra-libs-others := libdl @@ -42,6 +42,14 @@ endif endif modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \ errmsg1mod modatexit modcxaatexit + +ifeq (yesyesyes,$(build-static)$(build-shared)$(elf)) +tests += tststatic +tests-static += tststatic +modules-names += modstatic +tststatic-ENV = LD_LIBRARY_PATH=$(objpfx) +endif + extra-objs += $(modules-names:=.os) eval.os generated := $(modules-names:=.so) @@ -80,6 +88,11 @@ $(objpfx)tstcxaatexit.out: $(objpfx)tstcxaatexit $(objpfx)modcxaatexit.so $(objpfx)modatexit.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a +$(objpfx)tststatic: $(objpfx)libdl.a +$(objpfx)tststatic.out: $(objpfx)tststatic $(objpfx)modstatic.so + +$(objpfx)modstatic.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a + # 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 # a statically-linked program that hasn't already loaded it. diff --git a/dlfcn/modstatic.c b/dlfcn/modstatic.c new file mode 100644 index 0000000000..e00a0becee --- /dev/null +++ b/dlfcn/modstatic.c @@ -0,0 +1,5 @@ +int +test (int a) +{ + return a + a; +} diff --git a/dlfcn/tststatic.c b/dlfcn/tststatic.c new file mode 100644 index 0000000000..00695be7b1 --- /dev/null +++ b/dlfcn/tststatic.c @@ -0,0 +1,35 @@ +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> + +int +main (void) +{ + void *handle; + int (*test) (int); + int res; + + handle = dlopen ("modstatic.so", RTLD_LAZY); + if (handle == NULL) + { + printf ("%s\n", dlerror ()); + exit(1); + } + + test = dlsym (handle, "test"); + if (test == NULL) + { + printf ("%s\n", dlerror ()); + exit(1); + } + + res = test (2); + if (res != 4) + { + printf ("Got %i, expected 4\n", res); + exit (1); + } + + dlclose (handle); + return 0; +} |