aboutsummaryrefslogtreecommitdiff
path: root/elf/noload.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-20 22:53:54 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-20 22:53:54 +0000
commitbf8b3e74bfdc50935445c324f8dc03025a6f2419 (patch)
tree0f45dcac18a219c2743bd0b5e99d3e7b25f6131c /elf/noload.c
parent5e61ef88485aad8392c15956d6097285db3f2955 (diff)
downloadglibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.tar
glibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.tar.gz
glibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.tar.bz2
glibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.zip
Update.
* elf/elf.h: Add various DF_1_*, DTF_1_*, and DF_P1_* entries. * elf/dl-close.c (_dl_close): Don't close an object if it is marked with nodelete. * elf/dl-open.c (dl_open_worker): Pass RTLD_NOLOAD as new parameter to _dl_map_object. Return immediately if no object loaded. Set DF_1_NODELETE bit in l_flags_1 if RTLD_NODELETE was passed. * elf/dynamic-link.h (elf_get_dynamic_info): Copy DT_FLAGS_1 entry if it exists into l_flags_1 word. * elf/dl-load.c (_dl_map_object_from_fd): Take no parameter and use it to determine whether loading is wanted or not. (_dl_map_object): Likewise. Call _dl_map_object_from_fd with new parameter. * sysdeps/generic/ldsodefs.h: Update prototype. * elf/dl-deps.c: Add new parameter to _dl_map_object calls. * elf/rtld.c: Likewise. * elf/Makefile (tests): Add noload. Add rules to generate noload. * elf/noload.c: New file. * include/link.h (struct link_map): Add l_feature_1 and l_flags_1. * sysdeps/generic/bits/dlfcn.h: Define RTLD_NOLOAD and RTLD_NODELETE. * sysdeps/mips/bits/dlfcn.h: Likewise.
Diffstat (limited to 'elf/noload.c')
-rw-r--r--elf/noload.c70
1 files changed, 70 insertions, 0 deletions
diff --git a/elf/noload.c b/elf/noload.c
new file mode 100644
index 0000000000..826427f4bd
--- /dev/null
+++ b/elf/noload.c
@@ -0,0 +1,70 @@
+#include <dlfcn.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+ int result = 0;
+
+ /* First try to load an object which is a dependency. This should
+ succeed. */
+ if (dlopen ("testobj1.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
+ {
+ printf ("cannot open \"testobj1.so\": %s\n", dlerror ());
+ result = 1;
+ }
+ else
+ puts ("loading \"testobj1.so\" succeeded, OK");
+
+ /* Now try loading an object which is not already loaded. */
+ if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) != NULL)
+ {
+ puts ("succeeded in loading \"testobj5.so\"");
+ result = 1;
+ }
+ else
+ {
+ /* Load the object and run the same test again. */
+ void *p;
+
+ puts ("\"testobj5.so\" wasn't loaded and RTLD_NOLOAD prevented it, OK");
+
+ p = dlopen ("testobj5.so", RTLD_LAZY);
+
+ if (p == NULL)
+ {
+ printf ("cannot open \"testobj5.so\" without RTLD_NOLOAD: %s\n",
+ dlerror ());
+ result = 1;
+ }
+ else
+ {
+ puts ("loading \"testobj5.so\" succeeded, OK");
+
+ if (dlopen ("testobj5.so", RTLD_LAZY | RTLD_NOLOAD) == NULL)
+ {
+ printf ("cannot open \"testobj5.so\": %s\n", dlerror ());
+ result = 1;
+ }
+ else
+ puts ("loading \"testobj5.so\" with RTLD_NOLOAD succeeded, OK");
+
+ if (dlclose (p) != 0)
+ {
+ printf ("cannot close \"testobj5.so\": %s\n", dlerror ());
+ result = 1;
+ }
+ else
+ puts ("closing \"testobj5.so\" succeeded, OK");
+ }
+ }
+
+ return result;
+}
+
+
+int
+foo (int a)
+{
+ return 42 + a;
+}