summaryrefslogtreecommitdiff
path: root/libexec/ld.so/library.c
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2011-11-28 20:59:04 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2011-11-28 20:59:04 +0000
commit12153d2c7b20ffb704a75582c22d13633e38b361 (patch)
tree482aeaf3ab1dbf80bcd453d6cc53ec2471ac7f27 /libexec/ld.so/library.c
parent782ca313c57ce6984dfddd8a2dacb70b1ba66f40 (diff)
Add support for getting some flags from DT_FLAGS_1: new flags
DF_1_NODELETE and DF_1_INITFIRST, as well as DF_1_NOW and DF_1_GLOBAL. Committing for kurt@ who worked out the final version; ok guenther@ drahn@
Diffstat (limited to 'libexec/ld.so/library.c')
-rw-r--r--libexec/ld.so/library.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c
index 9f6f7027240..e932382de6c 100644
--- a/libexec/ld.so/library.c
+++ b/libexec/ld.so/library.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: library.c,v 1.62 2011/05/10 04:50:35 otto Exp $ */
+/* $OpenBSD: library.c,v 1.63 2011/11/28 20:59:03 guenther Exp $ */
/*
* Copyright (c) 2002 Dale Rahn
@@ -107,7 +107,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags)
for (object = _dl_objects; object != NULL; object = object->next) {
if (object->dev == sb.st_dev &&
object->inode == sb.st_ino) {
- object->obj_flags |= flags & RTLD_GLOBAL;
+ object->obj_flags |= flags & DF_1_GLOBAL;
_dl_close(libfile);
if (_dl_loading_object == NULL)
_dl_loading_object = object;