aboutsummaryrefslogtreecommitdiff
path: root/elf/origtest.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-05-05 23:29:18 +0000
committerUlrich Drepper <drepper@redhat.com>1999-05-05 23:29:18 +0000
commitdc5efe83c0252ad45337ab98eff6c26fdb29b0a9 (patch)
treed7045a782818d82ee49fc8503df674026e1b0588 /elf/origtest.c
parent4f8dbcb126883c92d33d49c86365a1fb1e54696a (diff)
downloadglibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.zip
glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.gz
glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.bz2
Update.
* Versions.def (ld.so): Add GLIBC_2.1.1. * elf/Makefile (routines): Add dl-origin. (tests): Add origtest. Add dependencies for the program. * elf/Versions (ld.so) [GLIBC_2.1.1]: Add _dl_origin_path, _dl_platformlen, _dl_dst_count and _dl_dst_substitute. * elf/dl-deps.c (expand_dst): New macro. Expand DSTs in filename. (_dl_map_object_deps): Use expand_dst to expand DSTs in DT_NEEDED, DT_AUXILIARY, and DT_FILTER filenames. * elf/dl-load.c (expand_dynamic_string_token): Explode into two functions and three macros. (_dl_dst_count, _dl_dst_substitute): New functions. * elf/dl-dst.h: New file. * elf/dl-open.c (_dl_open): Take extra parameter with address of caller. Pass address in args structure. (dl_open_worker): Recognize and expand DSTs in filename. * elf/ldsodefs.h (_dl_open): Adapt prototype. * elf/dlopen.c (dlopen_doit): Pass caller address to _dl_open. (__dlopen_check): Pass caller address to dlopen_doit in args. * elf/dlopendoit.c: Likewise. * iconv/gconv_dl.c: Adapt call of _dl_open. * nss/nsswitch.c: Likewise. * elf/origtest.c: New file. * sysdeps/generic/dl-origin.h: Moved to... * sysdeps/generic/dl-origin.c: ...here. * sysdeps/unix/sysv/linux/dl-origin.h: Moved to... * sysdeps/unix/sysv/linux/dl-origin.c: ...here.
Diffstat (limited to 'elf/origtest.c')
-rw-r--r--elf/origtest.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/elf/origtest.c b/elf/origtest.c
new file mode 100644
index 0000000..11bd0f7
--- /dev/null
+++ b/elf/origtest.c
@@ -0,0 +1,38 @@
+#include <dlfcn.h>
+#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+ void *h;
+ int (*fp) (int);
+ int res;
+
+ h = dlopen ("${ORIGIN}/testobj1.so", RTLD_LAZY);
+ if (h == NULL)
+ error (EXIT_FAILURE, 0, "while loading `%s': %s", "testobj1.so",
+ dlerror ());
+
+ fp = dlsym (h, "obj1func1");
+ if (fp == NULL)
+ error (EXIT_FAILURE, 0, "getting `obj1func1' in `%s': %s",
+ "testobj1.so", dlerror ());
+
+ res = fp (10);
+ printf ("fp(10) = %d\n", res);
+
+ if (dlclose (h) != 0)
+ error (EXIT_FAILURE, 0, "while close `%s': %s",
+ "testobj1.so", dlerror ());
+
+ return res != 42;
+}
+
+
+int
+foo (int a)
+{
+ return a + 10;
+}